Index: Source/core/css/StyleResolver.cpp |
diff --git a/Source/core/css/StyleResolver.cpp b/Source/core/css/StyleResolver.cpp |
index cd325f1cd40bdcf457313e1124665aaf7294c497..33a903ca8ee13a8f04dbd3891fffddba8b1327bf 100644 |
--- a/Source/core/css/StyleResolver.cpp |
+++ b/Source/core/css/StyleResolver.cpp |
@@ -27,35 +27,13 @@ |
*/ |
#include "config.h" |
-#include "StyleResolver.h" |
+#include "core/css/StyleResolver.h" |
#include "Attribute.h" |
-#include "CSSBorderImage.h" |
-#include "CSSCalculationValue.h" |
-#include "CSSCursorImageValue.h" |
-#include "CSSDefaultStyleSheets.h" |
-#include "CSSFontFaceRule.h" |
-#include "CSSFontSelector.h" |
-#include "CSSLineBoxContainValue.h" |
-#include "CSSPageRule.h" |
-#include "CSSParser.h" |
-#include "CSSPrimitiveValueMappings.h" |
#include "CSSPropertyNames.h" |
-#include "CSSReflectValue.h" |
-#include "CSSSelector.h" |
-#include "CSSSelectorList.h" |
-#include "CSSStyleRule.h" |
-#include "CSSSupportsRule.h" |
-#include "CSSTimingFunctionValue.h" |
-#include "CSSValueList.h" |
-#include "CSSVariableValue.h" |
#include "ContextFeatures.h" |
-#include "Counter.h" |
#include "DocumentStyleSheetCollection.h" |
-#include "ElementRuleCollector.h" |
#include "ElementShadow.h" |
-#include "FontFeatureValue.h" |
-#include "FontValue.h" |
#include "HTMLDocument.h" |
#include "HTMLIFrameElement.h" |
#include "HTMLInputElement.h" |
@@ -67,37 +45,59 @@ |
#include "InsertionPoint.h" |
#include "InspectorInstrumentation.h" |
#include "MathMLNames.h" |
-#include "MediaList.h" |
-#include "MediaQueryEvaluator.h" |
#include "NodeRenderStyle.h" |
#include "NodeRenderingContext.h" |
-#include "PageRuleCollector.h" |
-#include "Pair.h" |
-#include "Rect.h" |
-#include "RuleSet.h" |
#include "SVGDocumentExtensions.h" |
#include "SVGFontFaceElement.h" |
-#include "SelectorCheckerFastPath.h" |
#include "ShadowRoot.h" |
-#include "ShadowValue.h" |
-#include "StyleBuilder.h" |
-#include "StylePropertySet.h" |
-#include "StylePropertyShorthand.h" |
-#include "StyleRule.h" |
-#include "StyleRuleImport.h" |
-#include "StyleSheetContents.h" |
-#include "StyleSheetList.h" |
#include "Text.h" |
#include "UserAgentStyleSheets.h" |
-#include "ViewportStyleResolver.h" |
#include "VisitedLinkState.h" |
#include "WebCoreMemoryInstrumentation.h" |
-#include "WebKitCSSKeyframeRule.h" |
-#include "WebKitCSSKeyframesRule.h" |
-#include "WebKitCSSRegionRule.h" |
-#include "WebKitCSSTransformValue.h" |
#include "WebKitFontFamilyNames.h" |
#include "XMLNames.h" |
+#include "core/css/CSSBorderImage.h" |
+#include "core/css/CSSCalculationValue.h" |
+#include "core/css/CSSCursorImageValue.h" |
+#include "core/css/CSSDefaultStyleSheets.h" |
+#include "core/css/CSSFontFaceRule.h" |
+#include "core/css/CSSFontSelector.h" |
+#include "core/css/CSSLineBoxContainValue.h" |
+#include "core/css/CSSPageRule.h" |
+#include "core/css/CSSParser.h" |
+#include "core/css/CSSPrimitiveValueMappings.h" |
+#include "core/css/CSSReflectValue.h" |
+#include "core/css/CSSSelector.h" |
+#include "core/css/CSSSelectorList.h" |
+#include "core/css/CSSStyleRule.h" |
+#include "core/css/CSSSupportsRule.h" |
+#include "core/css/CSSTimingFunctionValue.h" |
+#include "core/css/CSSValueList.h" |
+#include "core/css/CSSVariableValue.h" |
+#include "core/css/Counter.h" |
+#include "core/css/ElementRuleCollector.h" |
+#include "core/css/FontFeatureValue.h" |
+#include "core/css/FontValue.h" |
+#include "core/css/MediaList.h" |
+#include "core/css/MediaQueryEvaluator.h" |
+#include "core/css/PageRuleCollector.h" |
+#include "core/css/Pair.h" |
+#include "core/css/Rect.h" |
+#include "core/css/RuleSet.h" |
+#include "core/css/SelectorCheckerFastPath.h" |
+#include "core/css/ShadowValue.h" |
+#include "core/css/StyleBuilder.h" |
+#include "core/css/StylePropertySet.h" |
+#include "core/css/StylePropertyShorthand.h" |
+#include "core/css/StyleRule.h" |
+#include "core/css/StyleRuleImport.h" |
+#include "core/css/StyleSheetContents.h" |
+#include "core/css/StyleSheetList.h" |
+#include "core/css/ViewportStyleResolver.h" |
+#include "core/css/WebKitCSSKeyframeRule.h" |
+#include "core/css/WebKitCSSKeyframesRule.h" |
+#include "core/css/WebKitCSSRegionRule.h" |
+#include "core/css/WebKitCSSTransformValue.h" |
#include "core/editing/FrameSelection.h" |
#include "core/loader/cache/CachedImage.h" |
#include "core/page/Frame.h" |
@@ -137,7 +137,7 @@ |
#include <wtf/StdLibExtras.h> |
#include <wtf/Vector.h> |
-#include "WebKitCSSFilterValue.h" |
+#include "core/css/WebKitCSSFilterValue.h" |
#include "core/platform/graphics/filters/FilterOperation.h" |
#if ENABLE(SVG) |
@@ -145,13 +145,13 @@ |
#include "SVGElement.h" |
#include "SVGNames.h" |
#include "SVGURIReference.h" |
-#include "WebKitCSSSVGDocumentValue.h" |
+#include "core/css/WebKitCSSSVGDocumentValue.h" |
#include "core/loader/cache/CachedSVGDocument.h" |
#include "core/loader/cache/CachedSVGDocumentReference.h" |
#endif |
-#include "WebKitCSSMixFunctionValue.h" |
-#include "WebKitCSSShaderValue.h" |
+#include "core/css/WebKitCSSMixFunctionValue.h" |
+#include "core/css/WebKitCSSShaderValue.h" |
#include "core/platform/graphics/filters/custom/CustomFilterArrayParameter.h" |
#include "core/platform/graphics/filters/custom/CustomFilterConstants.h" |
#include "core/platform/graphics/filters/custom/CustomFilterNumberParameter.h" |
@@ -166,7 +166,7 @@ |
#include "core/rendering/style/StyleShader.h" |
#if ENABLE(CSS_IMAGE_SET) |
-#include "CSSImageSetValue.h" |
+#include "core/css/CSSImageSetValue.h" |
#include "core/rendering/style/StyleCachedImageSet.h" |
#endif |