Skip to content

GitLab

T
tangled
Commit 788e2d49 authored by timloh@chromium.org's avatar timloh@chromium.org
Browse files
Options

Move parser-related files in core/css to core/css/parser 

The files CSSGrammar.y, CSSParserMode.{h,cpp}, CSSTokenizer{.h,-in.cpp},
CSSParserValues{.h,.cpp,Test.cpp} are all primarily for the parser so
should live in core/css/parser (making a lexing vs parsing distinction
here doesn't seem very useful).

BUG=330389

Review URL: https://codereview.chromium.org/469183002

git-svn-id: svn://svn.chromium.org/blink/trunk@180293 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent f403d4c4
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 35 deletions
third_party/WebKit/Source/build/scripts/make_css_property_names.py
View file @ 788e2d49
......@@ -14,7 +14,7 @@ HEADER_TEMPLATE = """
#ifndef %(class_name)s_h
#define %(class_name)s_h
#include "core/css/CSSParserMode.h"
#include "core/css/parser/CSSParserMode.h"
#include "wtf/HashFunctions.h"
#include "wtf/HashTraits.h"
#include <string.h>
......
third_party/WebKit/Source/build/scripts/make_css_value_keywords.py
View file @ 788e2d49
......@@ -16,7 +16,7 @@ HEADER_TEMPLATE = """
#ifndef %(class_name)s_h
#define %(class_name)s_h
#include "core/css/CSSParserMode.h"
#include "core/css/parser/CSSParserMode.h"
#include <string.h>
namespace blink {
......
third_party/WebKit/Source/core/BUILD.gn
View file @ 788e2d49
......@@ -907,7 +907,7 @@ make_qualified_names("make_core_generated_xml_names") {
# "MakeTokenMatcher" in make_core_generated from GYP.
make_token_matcher("make_core_generated_make_token_matcher") {
input_file = "css/CSSTokenizer-in.cpp"
input_file = "css/parser/CSSTokenizer-in.cpp"
output_file = "$blink_core_output_dir/CSSTokenizer.cpp"
}
......@@ -1068,7 +1068,7 @@ action("make_core_generated_html_element_lookup_trie") {
action_foreach("make_core_generated_bison") {
script = "../build/scripts/rule_bison.py"
sources = [
"css/CSSGrammar.y",
"css/parser/CSSGrammar.y",
"xml/XPathGrammar.y",
]
outputs = [
......
third_party/WebKit/Source/core/core.gypi
View file @ 788e2d49
......@@ -790,9 +790,6 @@
'css/CSSOMUtils.h',
'css/CSSPageRule.cpp',
'css/CSSPageRule.h',
'css/CSSParserMode.cpp',
'css/CSSParserMode.h',
'css/CSSParserValues.cpp',
'css/CSSPrimitiveValue.cpp',
'css/CSSPrimitiveValueMappings.h',
'css/CSSProperty.cpp',
......@@ -822,7 +819,6 @@
'css/CSSTimingFunctionValue.h',
'css/CSSToLengthConversionData.cpp',
'css/CSSToLengthConversionData.h',
'css/CSSTokenizer.h',
'css/CSSTransformValue.cpp',
'css/CSSUnicodeRangeValue.cpp',
'css/CSSUnicodeRangeValue.h',
......@@ -926,8 +922,12 @@
'css/invalidation/StyleSheetInvalidationAnalysis.cpp',
'css/invalidation/StyleSheetInvalidationAnalysis.h',
'css/parser/BisonCSSParser.h',
'css/parser/CSSParserMode.cpp',
'css/parser/CSSParserMode.h',
'css/parser/CSSParserValues.cpp',
'css/parser/CSSPropertyParser.cpp',
'css/parser/CSSPropertyParser.h',
'css/parser/CSSTokenizer.h',
'css/parser/MediaQueryBlockWatcher.cpp',
'css/parser/MediaQueryInputStream.cpp',
'css/parser/MediaQueryParser.cpp',
......@@ -3407,7 +3407,6 @@
'css/AffectedByFocusTest.cpp',
'css/CSSCalculationValueTest.cpp',
'css/CSSFontFaceTest.cpp',
'css/CSSParserValuesTest.cpp',
'css/CSSSelectorTest.cpp',
'css/CSSTestHelper.cpp',
'css/CSSTestHelper.h',
......@@ -3421,6 +3420,7 @@
'css/RuleSetTest.cpp',
'css/invalidation/DescendantInvalidationSetTest.cpp',
'css/parser/BisonCSSParserTest.cpp',
'css/parser/CSSParserValuesTest.cpp',
'css/parser/SizesCalcParserTest.cpp',
'css/parser/MediaQueryTokenizerTest.cpp',
'css/parser/SizesAttributeParserTest.cpp',
......
third_party/WebKit/Source/core/core_generated.gyp
View file @ 788e2d49
......@@ -139,7 +139,7 @@
],
'sources': [
# bison rule
'css/CSSGrammar.y',
'css/parser/CSSGrammar.y',
'xml/XPathGrammar.y',
],
'actions': [
......@@ -748,7 +748,7 @@
'inputs': [
'<@(scripts_for_in_files)',
'../build/scripts/make_token_matcher.py',
'../core/css/CSSTokenizer-in.cpp',
'../core/css/parser/CSSTokenizer-in.cpp',
],
'outputs': [
'<(blink_core_output_dir)/CSSTokenizer.cpp',
......@@ -756,7 +756,7 @@
'action': [
'python',
'../build/scripts/make_token_matcher.py',
'../core/css/CSSTokenizer-in.cpp',
'../core/css/parser/CSSTokenizer-in.cpp',
'<(blink_core_output_dir)/CSSTokenizer.cpp',
],
},
......
third_party/WebKit/Source/core/css/CSSCalculationValue.h
View file @ 788e2d49
......@@ -31,9 +31,9 @@
#ifndef CSSCalculationValue_h
#define CSSCalculationValue_h
#include "core/css/CSSParserValues.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/CSSValue.h"
#include "core/css/parser/CSSParserValues.h"
#include "platform/CalculationValue.h"
#include "wtf/PassOwnPtr.h"
#include "wtf/RefCounted.h"
......
third_party/WebKit/Source/core/css/CSSFunctionValue.cpp
View file @ 788e2d49
......@@ -26,8 +26,8 @@
#include "config.h"
#include "core/css/CSSFunctionValue.h"
#include "core/css/CSSParserValues.h"
#include "core/css/CSSValueList.h"
#include "core/css/parser/CSSParserValues.h"
#include "wtf/text/StringBuilder.h"
namespace blink {
......
third_party/WebKit/Source/core/css/CSSSelectorList.cpp
View file @ 788e2d49
......@@ -27,7 +27,7 @@
#include "config.h"
#include "core/css/CSSSelectorList.h"
#include "core/css/CSSParserValues.h"
#include "core/css/parser/CSSParserValues.h"
#include "wtf/text/StringBuilder.h"
namespace blink {
......
third_party/WebKit/Source/core/css/CSSValueList.cpp
View file @ 788e2d49
......@@ -21,7 +21,7 @@
#include "config.h"
#include "core/css/CSSValueList.h"
#include "core/css/CSSParserValues.h"
#include "core/css/parser/CSSParserValues.h"
#include "wtf/text/StringBuilder.h"
namespace blink {
......
third_party/WebKit/Source/core/css/MediaQueryExp.cpp
View file @ 788e2d49
......@@ -31,8 +31,8 @@
#include "core/css/MediaQueryExp.h"
#include "core/css/CSSAspectRatioValue.h"
#include "core/css/CSSParserValues.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/parser/CSSParserValues.h"
#include "core/html/parser/HTMLParserIdioms.h"
#include "platform/Decimal.h"
#include "platform/RuntimeEnabledFeatures.h"
......
third_party/WebKit/Source/core/css/StylePropertySet.h
View file @ 788e2d49
......@@ -22,10 +22,10 @@
#define StylePropertySet_h
#include "core/CSSPropertyNames.h"
#include "core/css/CSSParserMode.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/CSSProperty.h"
#include "core/css/PropertySetCSSStyleDeclaration.h"
#include "core/css/parser/CSSParserMode.h"
#include "wtf/ListHashSet.h"
#include "wtf/Vector.h"
#include "wtf/text/WTFString.h"
......
third_party/WebKit/Source/core/css/StyleSheet.h
View file @ 788e2d49
......@@ -22,7 +22,7 @@
#define StyleSheet_h
#include "bindings/core/v8/ScriptWrappable.h"
#include "core/css/CSSParserMode.h"
#include "core/css/parser/CSSParserMode.h"
#include "platform/heap/Handle.h"
#include "wtf/Forward.h"
#include "wtf/RefCounted.h"
......
third_party/WebKit/Source/core/css/StyleSheetContents.h
View file @ 788e2d49
......@@ -21,7 +21,6 @@
#ifndef StyleSheetContents_h
#define StyleSheetContents_h
#include "core/css/CSSParserMode.h"
#include "core/css/RuleSet.h"
#include "platform/heap/Handle.h"
#include "platform/weborigin/KURL.h"
......
third_party/WebKit/Source/core/css/parser/BisonCSSParser.h
View file @ 788e2d49
......@@ -28,16 +28,16 @@
#include "core/css/CSSCalculationValue.h"
#include "core/css/CSSFilterValue.h"
#include "core/css/CSSGradientValue.h"
#include "core/css/CSSParserMode.h"
#include "core/css/CSSParserValues.h"
#include "core/css/CSSProperty.h"
#include "core/css/CSSPropertySourceData.h"
#include "core/css/CSSSelector.h"
#include "core/css/CSSTokenizer.h"
#include "core/css/MediaQuery.h"
#include "core/css/StylePropertySet.h"
#include "core/css/parser/CSSParserMode.h"
#include "core/css/parser/CSSParserObserver.h"
#include "core/css/parser/CSSParserValues.h"
#include "core/css/parser/CSSPropertyParser.h"
#include "core/css/parser/CSSTokenizer.h"
#include "platform/graphics/Color.h"
#include "wtf/HashSet.h"
#include "wtf/OwnPtr.h"
......
third_party/WebKit/Source/core/css/CSSGrammar.y → third_party/WebKit/Source/core/css/parser/CSSGrammar.y
View file @ 788e2d49
......@@ -30,7 +30,7 @@
#include "core/css/CSSKeyframeRule.h"
#include "core/css/CSSKeyframesRule.h"
#include "core/css/parser/BisonCSSParser.h"
#include "core/css/CSSParserMode.h"
#include "core/css/parser/CSSParserMode.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/CSSSelector.h"
#include "core/css/CSSSelectorList.h"
......
third_party/WebKit/Source/core/css/CSSParserMode.cpp → third_party/WebKit/Source/core/css/parser/CSSParserMode.cpp
View file @ 788e2d49
......@@ -25,7 +25,7 @@
*/
#include "config.h"
#include "core/css/CSSParserMode.h"
#include "core/css/parser/CSSParserMode.h"
#include "core/dom/Document.h"
#include "core/frame/Settings.h"
......
third_party/WebKit/Source/core/css/CSSParserValues.cpp → third_party/WebKit/Source/core/css/parser/CSSParserValues.cpp
View file @ 788e2d49
......@@ -19,7 +19,7 @@
*/
#include "config.h"
#include "core/css/CSSParserValues.h"
#include "core/css/parser/CSSParserValues.h"
#include "core/css/CSSFunctionValue.h"
#include "core/css/CSSSelectorList.h"
......
third_party/WebKit/Source/core/css/CSSParserValuesTest.cpp → third_party/WebKit/Source/core/css/parser/CSSParserValuesTest.cpp
View file @ 788e2d49
......@@ -29,7 +29,7 @@
*/
#include "config.h"
#include "core/css/CSSParserValues.h"
#include "core/css/parser/CSSParserValues.h"
#include <gtest/gtest.h>
......
third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
View file @ 788e2d49
......@@ -49,7 +49,6 @@
#include "core/css/CSSKeyframeRule.h"
#include "core/css/CSSKeyframesRule.h"
#include "core/css/CSSLineBoxContainValue.h"
#include "core/css/CSSParserValues.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/CSSPropertySourceData.h"
#include "core/css/CSSReflectValue.h"
......@@ -68,6 +67,7 @@
#include "core/css/RuntimeCSSEnabled.h"
#include "core/css/parser/BisonCSSParser.h"
#include "core/css/parser/CSSParserIdioms.h"
#include "core/css/parser/CSSParserValues.h"
#include "core/frame/UseCounter.h"
#include "core/html/parser/HTMLParserIdioms.h"
#include "core/inspector/InspectorInstrumentation.h"
......
third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
View file @ 788e2d49
......@@ -30,11 +30,11 @@
#include "core/css/CSSFilterValue.h"
#include "core/css/CSSGradientValue.h"
#include "core/css/CSSGridTemplateAreasValue.h"
#include "core/css/CSSParserMode.h"
#include "core/css/CSSParserValues.h"
#include "core/css/CSSProperty.h"
#include "core/css/CSSPropertySourceData.h"
#include "core/css/CSSSelector.h"
#include "core/css/parser/CSSParserMode.h"
#include "core/css/parser/CSSParserValues.h"
#include "platform/graphics/Color.h"
#include "wtf/OwnPtr.h"
#include "wtf/Vector.h"
......
third_party/WebKit/Source/core/css/CSSTokenizer-in.cpp → third_party/WebKit/Source/core/css/parser/CSSTokenizer-in.cpp
View file @ 788e2d49
......@@ -25,13 +25,13 @@
*/
#include "config.h"
#include "core/css/CSSTokenizer.h"
#include "core/css/parser/CSSTokenizer.h"
#include "core/css/CSSKeyframeRule.h"
#include "core/css/parser/BisonCSSParser.h"
#include "core/css/CSSParserValues.h"
#include "core/css/MediaQuery.h"
#include "core/css/StyleRule.h"
#include "core/css/parser/BisonCSSParser.h"
#include "core/css/parser/CSSParserValues.h"
#include "core/html/parser/HTMLParserIdioms.h"
#include "core/svg/SVGParserUtilities.h"
......
third_party/WebKit/Source/core/css/parser/MediaQueryParser.h
View file @ 788e2d49
......@@ -5,10 +5,10 @@
#ifndef MediaQueryParser_h
#define MediaQueryParser_h
#include "core/css/CSSParserValues.h"
#include "core/css/MediaList.h"
#include "core/css/MediaQuery.h"
#include "core/css/MediaQueryExp.h"
#include "core/css/parser/CSSParserValues.h"
#include "core/css/parser/MediaQueryBlockWatcher.h"
#include "core/css/parser/MediaQueryToken.h"
#include "wtf/text/WTFString.h"
......
third_party/WebKit/Source/web/WebDocument.cpp
View file @ 788e2d49
......@@ -36,7 +36,6 @@
#include "bindings/core/v8/ScriptState.h"
#include "bindings/core/v8/ScriptValue.h"
#include "core/accessibility/AXObjectCache.h"
#include "core/css/CSSParserMode.h"
#include "core/css/StyleSheetContents.h"
#include "core/dom/CSSSelectorWatch.h"
#include "core/dom/Document.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment