Move StyleResolver and related classes to core/css/resolver

Move StyleResolver, ScopedStyleResolver, ViewportStyleResolver and
support classes to a new core/css/resolver directory.

Update include paths and build file as needed.

R=eseidel@chromium.org
BUG=239244
TESTED=No new tests, no change in functionality.

Review URL: https://chromiumcodereview.appspot.com/15072003

git-svn-id: svn://svn.chromium.org/blink/trunk@150003 bbb929c8-8fbe-4397-9dbb-9b2b20218538

85 files changed, 356 insertions, 360 deletions

diff --git a/third_party/WebKit/Source/WebKit/chromium/src/AutofillPopupMenuClient.cpp b/third_party/WebKit/Source/WebKit/chromium/src/AutofillPopupMenuClient.cpp
index afc3f4c..bcf07b4 100644
--- a/third_party/WebKit/Source/WebKit/chromium/src/AutofillPopupMenuClient.cpp
+++ b/third_party/WebKit/Source/WebKit/chromium/src/AutofillPopupMenuClient.cpp
@@ -37,7 +37,7 @@
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "core/css/CSSFontSelector.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/page/Chrome.h"
 #include "core/page/Frame.h"
diff --git a/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp b/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp
index 00adda9..0f67ed9 100644
--- a/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -73,7 +73,7 @@
 #include "WebTextInputInfo.h"
 #include "WebViewClient.h"
 #include "core/accessibility/AXObjectCache.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/KeyboardEvent.h"
diff --git a/third_party/WebKit/Source/core/core.gypi b/third_party/WebKit/Source/core/core.gypi
index 4bc731d..2f76bd4 100644
--- a/third_party/WebKit/Source/core/core.gypi
+++ b/third_party/WebKit/Source/core/core.gypi
@@ -623,8 +623,6 @@
             'css/DocumentRuleSets.h',
             'css/ElementRuleCollector.cpp',
             'css/ElementRuleCollector.h',
-            'css/FilterOperationResolver.cpp',
-            'css/FilterOperationResolver.h',
             'css/FontFeatureValue.cpp',
             'css/FontFeatureValue.h',
             'css/FontLoader.h',
@@ -664,8 +662,6 @@
             'css/SVGCSSComputedStyleDeclaration.cpp',
             'css/SVGCSSParser.cpp',
             'css/SVGCSSStyleSelector.cpp',
-            'css/ScopedStyleResolver.cpp',
-            'css/ScopedStyleResolver.h',
             'css/SelectorChecker.cpp',
             'css/SelectorChecker.h',
             'css/SelectorCheckerFastPath.cpp',
@@ -685,10 +681,6 @@
             'css/StylePropertySet.h',
             'css/StylePropertyShorthand.cpp',
             'css/StylePropertyShorthand.h',
-            'css/StyleResolver.cpp',
-            'css/StyleResolver.h',
-            'css/StyleResolverState.cpp',
-            'css/StyleResolverState.h',
             'css/StyleRule.cpp',
             'css/StyleRule.h',
             'css/StyleRuleImport.cpp',
@@ -699,10 +691,6 @@
             'css/StyleSheetContents.h',
             'css/StyleSheetList.cpp',
             'css/StyleSheetList.h',
-            'css/TransformBuilder.cpp',
-            'css/TransformBuilder.h',
-            'css/ViewportStyleResolver.cpp',
-            'css/ViewportStyleResolver.h',
             'css/WebKitCSSArrayFunctionValue.cpp',
             'css/WebKitCSSArrayFunctionValue.h',
             'css/WebKitCSSFilterRule.cpp',
@@ -724,6 +712,18 @@
             'css/WebKitCSSTransformValue.cpp',
             'css/WebKitCSSViewportRule.h',
             'css/WebKitCSSViewportRule.cpp',
+            'css/resolver/FilterOperationResolver.cpp',
+            'css/resolver/FilterOperationResolver.h',
+            'css/resolver/ScopedStyleResolver.cpp',
+            'css/resolver/ScopedStyleResolver.h',
+            'css/resolver/StyleResolver.cpp',
+            'css/resolver/StyleResolver.h',
+            'css/resolver/StyleResolverState.cpp',
+            'css/resolver/StyleResolverState.h',
+            'css/resolver/TransformBuilder.cpp',
+            'css/resolver/TransformBuilder.h',
+            'css/resolver/ViewportStyleResolver.cpp',
+            'css/resolver/ViewportStyleResolver.h',
             'editing/AppendNodeCommand.cpp',
             'editing/AppendNodeCommand.h',
             'editing/ApplyBlockElementCommand.cpp',
diff --git a/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp b/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp
index c8e6a6f..c6f09d9 100644
--- a/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp
+++ b/third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp
@@ -33,7 +33,7 @@
 #include "core/css/CSSBasicShapes.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSValuePool.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/rendering/style/BasicShapes.h"
 
 namespace WebCore {
diff --git a/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp b/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
index a909d17..74737f8 100644
--- a/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
@@ -32,7 +32,7 @@
 #include "core/css/CSSCalculationValue.h"
 
 #include "core/css/CSSValueList.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 #include "core/platform/Length.h"
 
diff --git a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
index 0137f54..972666e 100644
--- a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -47,8 +47,8 @@
 #include "core/css/ShadowValue.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StylePropertyShorthand.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/WebKitCSSTransformValue.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/PseudoElement.h"
diff --git a/third_party/WebKit/Source/core/css/CSSFontSelector.cpp b/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
index dde4e12..356f23f 100644
--- a/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
+++ b/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
@@ -39,8 +39,8 @@
 #include "core/css/CSSUnicodeRangeValue.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleRule.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/cache/CachedFont.h"
diff --git a/third_party/WebKit/Source/core/css/CSSGradientValue.cpp b/third_party/WebKit/Source/core/css/CSSGradientValue.cpp
index 0be3749..ee15dc2 100644
--- a/third_party/WebKit/Source/core/css/CSSGradientValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSGradientValue.cpp
@@ -28,7 +28,7 @@
 
 #include "CSSValueKeywords.h"
 #include "core/css/CSSCalculationValue.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 #include "core/platform/graphics/GeneratorGeneratedImage.h"
diff --git a/third_party/WebKit/Source/core/css/CSSToStyleMap.cpp b/third_party/WebKit/Source/core/css/CSSToStyleMap.cpp
index abff813..f940e29 100644
--- a/third_party/WebKit/Source/core/css/CSSToStyleMap.cpp
+++ b/third_party/WebKit/Source/core/css/CSSToStyleMap.cpp
@@ -35,7 +35,7 @@
 #include "core/css/CSSTimingFunctionValue.h"
 #include "core/css/Pair.h"
 #include "core/css/Rect.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/platform/animation/CSSAnimationData.h"
 #include "core/rendering/style/FillLayer.h"
 
diff --git a/third_party/WebKit/Source/core/css/DeprecatedStyleBuilder.cpp b/third_party/WebKit/Source/core/css/DeprecatedStyleBuilder.cpp
index 36f405a..1344ae9 100644
--- a/third_party/WebKit/Source/core/css/DeprecatedStyleBuilder.cpp
+++ b/third_party/WebKit/Source/core/css/DeprecatedStyleBuilder.cpp
@@ -34,7 +34,7 @@
 #include "core/css/CSSValueList.h"
 #include "core/css/Pair.h"
 #include "core/css/Rect.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/page/Settings.h"
diff --git a/third_party/WebKit/Source/core/css/DocumentRuleSets.cpp b/third_party/WebKit/Source/core/css/DocumentRuleSets.cpp
index cee308d..a29851c 100644
--- a/third_party/WebKit/Source/core/css/DocumentRuleSets.cpp
+++ b/third_party/WebKit/Source/core/css/DocumentRuleSets.cpp
@@ -32,8 +32,8 @@
 #include "core/css/CSSDefaultStyleSheets.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/MediaQueryEvaluator.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleSheetContents.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/DocumentStyleSheetCollection.h"
 
 namespace WebCore {
@@ -126,7 +126,7 @@ void DocumentRuleSets::appendAuthorStyleSheets(unsigned firstNew, const Vector<R
         StyleSheetContents* sheet = cssSheet->contents();
         if (const ContainerNode* scope = ScopedStyleResolver::scopeFor(cssSheet)) {
             // FIXME: Remove a dependency to calling a StyleResolver's member function.
-            // If we can avoid calling resolver->ensureScopeResolver() here, we don't have to include "core/css/StyleResolver.h".
+            // If we can avoid calling resolver->ensureScopeResolver() here, we don't have to include "core/css/resolver/StyleResolver.h".
             // https://bugs.webkit.org/show_bug.cgi?id=108890
             resolver->ensureScopeResolver()->ensureRuleSetFor(scope)->addRulesFromSheet(sheet, *medium, resolver, scope);
             continue;
diff --git a/third_party/WebKit/Source/core/css/ElementRuleCollector.h b/third_party/WebKit/Source/core/css/ElementRuleCollector.h
index 1871ee9..a95206e 100644
--- a/third_party/WebKit/Source/core/css/ElementRuleCollector.h
+++ b/third_party/WebKit/Source/core/css/ElementRuleCollector.h
@@ -24,7 +24,7 @@
 
 #include "core/css/MediaQueryEvaluator.h"
 #include "core/css/SelectorChecker.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
diff --git a/third_party/WebKit/Source/core/css/FontLoader.cpp b/third_party/WebKit/Source/core/css/FontLoader.cpp
index ac9d074..c731791 100644
--- a/third_party/WebKit/Source/core/css/FontLoader.cpp
+++ b/third_party/WebKit/Source/core/css/FontLoader.cpp
@@ -33,7 +33,7 @@
 #include "core/css/CSSParser.h"
 #include "core/css/CSSSegmentedFontFace.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/page/FrameView.h"
 
diff --git a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
index 2acb0b7..59d1e85 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
@@ -37,7 +37,7 @@
 #include "core/css/MediaList.h"
 #include "core/css/MediaQuery.h"
 #include "core/css/MediaQueryExp.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQueryMatcher.cpp b/third_party/WebKit/Source/core/css/MediaQueryMatcher.cpp
index 8f303a7..4ced467 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryMatcher.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryMatcher.cpp
@@ -24,7 +24,7 @@
 #include "core/css/MediaQueryEvaluator.h"
 #include "core/css/MediaQueryList.h"
 #include "core/css/MediaQueryListListener.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/page/Frame.h"
diff --git a/third_party/WebKit/Source/core/css/PageRuleCollector.h b/third_party/WebKit/Source/core/css/PageRuleCollector.h
index 28f716d..544ea389 100644
--- a/third_party/WebKit/Source/core/css/PageRuleCollector.h
+++ b/third_party/WebKit/Source/core/css/PageRuleCollector.h
@@ -23,7 +23,7 @@
 #define PageRuleCollector_h
 
 #include "core/css/DocumentRuleSets.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
diff --git a/third_party/WebKit/Source/core/css/RuleSet.cpp b/third_party/WebKit/Source/core/css/RuleSet.cpp
index 28654f7..5e8a56b 100644
--- a/third_party/WebKit/Source/core/css/RuleSet.cpp
+++ b/third_party/WebKit/Source/core/css/RuleSet.cpp
@@ -37,11 +37,11 @@
 #include "core/css/SelectorChecker.h"
 #include "core/css/SelectorCheckerFastPath.h"
 #include "core/css/SelectorFilter.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleRule.h"
 #include "core/css/StyleRuleImport.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/WebKitCSSKeyframesRule.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 #include "core/page/SecurityOrigin.h"
 #include <wtf/MemoryInstrumentationHashMap.h>
diff --git a/third_party/WebKit/Source/core/css/SVGCSSStyleSelector.cpp b/third_party/WebKit/Source/core/css/SVGCSSStyleSelector.cpp
index 53d2491..ab07642 100644
--- a/third_party/WebKit/Source/core/css/SVGCSSStyleSelector.cpp
+++ b/third_party/WebKit/Source/core/css/SVGCSSStyleSelector.cpp
@@ -29,7 +29,7 @@
 #include "config.h"
 
 #if ENABLE(SVG)
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 
 #include <stdlib.h>
 #include "CSSPropertyNames.h"
diff --git a/third_party/WebKit/Source/core/css/StyleMedia.cpp b/third_party/WebKit/Source/core/css/StyleMedia.cpp
index 0fda76e..f425c87 100644
--- a/third_party/WebKit/Source/core/css/StyleMedia.cpp
+++ b/third_party/WebKit/Source/core/css/StyleMedia.cpp
@@ -28,7 +28,7 @@
 
 #include "core/css/MediaList.h"
 #include "core/css/MediaQueryEvaluator.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/page/Frame.h"
 #include "core/page/FrameView.h"
diff --git a/third_party/WebKit/Source/core/css/StyleResolverState.h b/third_party/WebKit/Source/core/css/StyleResolverState.h
deleted file mode 100644
index b912f55..0000000
--- a/third_party/WebKit/Source/core/css/StyleResolverState.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef StyleResolverState_h
-#define StyleResolverState_h
-
-#include "CSSPropertyNames.h"
-
-#include "core/css/CSSValueList.h"
-#if ENABLE(SVG)
-#include "core/css/WebKitCSSSVGDocumentValue.h"
-#endif
-#include "core/dom/Element.h"
-#include "core/platform/graphics/Color.h"
-#include "core/platform/graphics/filters/FilterOperations.h"
-#include "core/rendering/style/BorderData.h"
-#include "core/rendering/style/FillLayer.h"
-#include "core/rendering/style/RenderStyle.h"
-#include "core/rendering/style/StyleInheritedData.h"
-
-#include <wtf/HashMap.h>
-
-namespace WebCore {
-
-    class FillLayer;
-    class FontDescription;
-    class RenderRegion;
-    class StyledElement;
-
-    typedef HashMap<CSSPropertyID, RefPtr<CSSValue> > PendingImagePropertyMap;
-#if ENABLE(SVG)
-    typedef HashMap<FilterOperation*, RefPtr<WebKitCSSSVGDocumentValue> > PendingSVGDocumentMap;
-#endif
-
-    class StyleResolverState {
-        WTF_MAKE_NONCOPYABLE(StyleResolverState);
-    public:
-        StyleResolverState()
-        : m_element(0)
-        , m_styledElement(0)
-        , m_parentNode(0)
-        , m_parentStyle(0)
-        , m_rootElementStyle(0)
-        , m_regionForStyling(0)
-        , m_elementLinkState(NotInsideLink)
-        , m_distributedToInsertionPoint(false)
-        , m_elementAffectedByClassRules(false)
-        , m_applyPropertyToRegularStyle(true)
-        , m_applyPropertyToVisitedLinkStyle(false)
-        , m_hasPendingShaders(false)
-        , m_lineHeightValue(0)
-        , m_fontDirty(false)
-        , m_hasUAAppearance(false)
-        , m_backgroundData(BackgroundFillLayer) { }
-
-    public:
-        void initElement(Element*);
-        void initForStyleResolve(Document*, Element*, RenderStyle* parentStyle = 0, RenderRegion* regionForStyling = 0);
-        void clear();
-
-        Color colorFromPrimitiveValue(CSSPrimitiveValue*, bool forVisitedLink = false) const;
-
-        Document* document() const { return m_element->document(); }
-        Element* element() const { return m_element; }
-        StyledElement* styledElement() const { return m_styledElement; }
-        void setStyle(PassRefPtr<RenderStyle> style) { m_style = style; }
-        RenderStyle* style() const { return m_style.get(); }
-        PassRefPtr<RenderStyle> takeStyle() { return m_style.release(); }
-
-        const ContainerNode* parentNode() const { return m_parentNode; }
-        void setParentStyle(PassRefPtr<RenderStyle> parentStyle) { m_parentStyle = parentStyle; }
-        RenderStyle* parentStyle() const { return m_parentStyle.get(); }
-        RenderStyle* rootElementStyle() const { return m_rootElementStyle; }
-
-        const RenderRegion* regionForStyling() const { return m_regionForStyling; }
-        EInsideLink elementLinkState() const { return m_elementLinkState; }
-        bool distributedToInsertionPoint() const { return m_distributedToInsertionPoint; }
-        void setElementAffectedByClassRules(bool isAffected) { m_elementAffectedByClassRules = isAffected; }
-        bool elementAffectedByClassRules() const { return m_elementAffectedByClassRules; }
-
-        void setApplyPropertyToRegularStyle(bool isApply) { m_applyPropertyToRegularStyle = isApply; }
-        void setApplyPropertyToVisitedLinkStyle(bool isApply) { m_applyPropertyToVisitedLinkStyle = isApply; }
-        bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularStyle; }
-        bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisitedLinkStyle; }
-        PendingImagePropertyMap& pendingImageProperties() { return m_pendingImageProperties; }
-#if ENABLE(SVG)
-        PendingSVGDocumentMap& pendingSVGDocuments() { return m_pendingSVGDocuments; }
-#endif
-        void setHasPendingShaders(bool hasPendingShaders) { m_hasPendingShaders = hasPendingShaders; }
-        bool hasPendingShaders() const { return m_hasPendingShaders; }
-
-        void setLineHeightValue(CSSValue* value) { m_lineHeightValue = value; }
-        CSSValue* lineHeightValue() { return m_lineHeightValue; }
-        void setFontDirty(bool isDirty) { m_fontDirty = isDirty; }
-        bool fontDirty() const { return m_fontDirty; }
-
-        void cacheBorderAndBackground();
-        bool hasUAAppearance() const { return m_hasUAAppearance; }
-        BorderData borderData() const { return m_borderData; }
-        FillLayer backgroundData() const { return m_backgroundData; }
-        Color backgroundColor() const { return m_backgroundColor; }
-
-        const FontDescription& fontDescription() { return m_style->fontDescription(); }
-        const FontDescription& parentFontDescription() { return m_parentStyle->fontDescription(); }
-        void setFontDescription(const FontDescription& fontDescription) { m_fontDirty |= m_style->setFontDescription(fontDescription); }
-        void setZoom(float f) { m_fontDirty |= m_style->setZoom(f); }
-        void setEffectiveZoom(float f) { m_fontDirty |= m_style->setEffectiveZoom(f); }
-        void setWritingMode(WritingMode writingMode) { m_fontDirty |= m_style->setWritingMode(writingMode); }
-        void setTextOrientation(TextOrientation textOrientation) { m_fontDirty |= m_style->setTextOrientation(textOrientation); }
-
-        bool useSVGZoomRules() const { return m_element && m_element->isSVGElement(); }
-
-    private:
-        // FIXME(bug 108563): to make it easier to review, these member
-        // variables are public. However we should add methods to access
-        // these variables.
-        Element* m_element;
-        RefPtr<RenderStyle> m_style;
-        StyledElement* m_styledElement;
-        ContainerNode* m_parentNode;
-        RefPtr<RenderStyle> m_parentStyle;
-        RenderStyle* m_rootElementStyle;
-
-        // Required to ASSERT in applyProperties.
-        RenderRegion* m_regionForStyling;
-
-        EInsideLink m_elementLinkState;
-
-        bool m_distributedToInsertionPoint;
-
-        bool m_elementAffectedByClassRules;
-
-        bool m_applyPropertyToRegularStyle;
-        bool m_applyPropertyToVisitedLinkStyle;
-
-        PendingImagePropertyMap m_pendingImageProperties;
-        bool m_hasPendingShaders;
-#if ENABLE(SVG)
-        PendingSVGDocumentMap m_pendingSVGDocuments;
-#endif
-        CSSValue* m_lineHeightValue;
-        bool m_fontDirty;
-
-        bool m_hasUAAppearance;
-        BorderData m_borderData;
-        FillLayer m_backgroundData;
-        Color m_backgroundColor;
-    };
-
-} // namespace WebCore
-
-#endif // StyleResolverState_h
diff --git a/third_party/WebKit/Source/core/css/WebKitCSSMatrix.cpp b/third_party/WebKit/Source/core/css/WebKitCSSMatrix.cpp
index 06c9a3d..7d83c49 100644
--- a/third_party/WebKit/Source/core/css/WebKitCSSMatrix.cpp
+++ b/third_party/WebKit/Source/core/css/WebKitCSSMatrix.cpp
@@ -30,8 +30,8 @@
 #include "CSSValueKeywords.h"
 #include "core/css/CSSParser.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
-#include "core/css/TransformBuilder.h"
+#include "core/css/resolver/StyleResolver.h"
+#include "core/css/resolver/TransformBuilder.h"
 #include "core/dom/ExceptionCode.h"
 #include <wtf/MathExtras.h>
 
diff --git a/third_party/WebKit/Source/core/css/FilterOperationResolver.cpp b/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp
index 3f5c505..50b4dfc 100644
--- a/third_party/WebKit/Source/core/css/FilterOperationResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "config.h"
-#include "core/css/FilterOperationResolver.h"
+#include "core/css/resolver/FilterOperationResolver.h"
 
 #include "core/css/CSSParser.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/ShadowValue.h"
-#include "core/css/TransformBuilder.h"
 #include "core/css/WebKitCSSFilterValue.h"
 #include "core/css/WebKitCSSMixFunctionValue.h"
 #include "core/css/WebKitCSSShaderValue.h"
+#include "core/css/resolver/TransformBuilder.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"
diff --git a/third_party/WebKit/Source/core/css/FilterOperationResolver.h b/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.h
index 37bd2c4..3009735 100644
--- a/third_party/WebKit/Source/core/css/FilterOperationResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.h
@@ -24,7 +24,7 @@
 
 #include "CSSPropertyNames.h"
 #include "core/css/CSSValueList.h"
-#include "core/css/StyleResolverState.h"
+#include "core/css/resolver/StyleResolverState.h"
 #include "core/platform/graphics/filters/FilterOperations.h"
 
 namespace WebCore {
diff --git a/third_party/WebKit/Source/core/css/ScopedStyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp
index c6f730d..18889f5 100644
--- a/third_party/WebKit/Source/core/css/ScopedStyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "core/css/ScopedStyleResolver.h"
+#include "core/css/resolver/ScopedStyleResolver.h"
 
 #include "HTMLNames.h"
 #include "core/css/CSSStyleRule.h"
@@ -38,9 +38,9 @@
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 #include "core/html/HTMLStyleElement.h"
 #include "core/html/shadow/ContentDistributor.h"
-#include <wtf/MemoryInstrumentationHashMap.h>
-#include <wtf/MemoryInstrumentationHashSet.h>
-#include <wtf/MemoryInstrumentationVector.h>
+#include "wtf/MemoryInstrumentationHashMap.h"
+#include "wtf/MemoryInstrumentationHashSet.h"
+#include "wtf/MemoryInstrumentationVector.h"
 
 namespace WebCore {
 
diff --git a/third_party/WebKit/Source/core/css/ScopedStyleResolver.h b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h
index 9f6bb28..00b174fa 100644
--- a/third_party/WebKit/Source/core/css/ScopedStyleResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h
@@ -27,11 +27,11 @@
 #ifndef ScopedStyleResolver_h
 #define ScopedStyleResolver_h
 
-#include <wtf/Assertions.h>
-#include <wtf/Forward.h>
-#include <wtf/HashMap.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/Vector.h>
+#include "wtf/Assertions.h"
+#include "wtf/Forward.h"
+#include "wtf/HashMap.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/Vector.h"
 
 namespace WebCore {
 
diff --git a/third_party/WebKit/Source/core/css/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
index 8c73ead..747437f 100644
--- a/third_party/WebKit/Source/core/css/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "config.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
@@ -58,7 +58,6 @@
 #include "core/css/Counter.h"
 #include "core/css/DeprecatedStyleBuilder.h"
 #include "core/css/ElementRuleCollector.h"
-#include "core/css/FilterOperationResolver.h"
 #include "core/css/FontFeatureValue.h"
 #include "core/css/FontValue.h"
 #include "core/css/MediaList.h"
@@ -75,11 +74,12 @@
 #include "core/css/StyleRuleImport.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/StyleSheetList.h"
-#include "core/css/TransformBuilder.h"
-#include "core/css/ViewportStyleResolver.h"
 #include "core/css/WebKitCSSKeyframeRule.h"
 #include "core/css/WebKitCSSKeyframesRule.h"
 #include "core/css/WebKitCSSRegionRule.h"
+#include "core/css/resolver/FilterOperationResolver.h"
+#include "core/css/resolver/TransformBuilder.h"
+#include "core/css/resolver/ViewportStyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/ContextFeatures.h"
 #include "core/dom/DocumentStyleSheetCollection.h"
@@ -126,11 +126,11 @@
 #include "core/rendering/style/StylePendingImage.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGFontFaceElement.h"
-#include <wtf/MemoryInstrumentationHashMap.h>
-#include <wtf/MemoryInstrumentationHashSet.h>
-#include <wtf/MemoryInstrumentationVector.h>
-#include <wtf/StdLibExtras.h>
-#include <wtf/Vector.h>
+#include "wtf/MemoryInstrumentationHashMap.h"
+#include "wtf/MemoryInstrumentationHashSet.h"
+#include "wtf/MemoryInstrumentationVector.h"
+#include "wtf/StdLibExtras.h"
+#include "wtf/Vector.h"
 
 #if ENABLE(SVG)
 #include "SVGNames.h"
@@ -145,6 +145,7 @@
 #include "core/css/CSSImageSetValue.h"
 #include "core/css/WebKitCSSMixFunctionValue.h"
 #include "core/css/WebKitCSSShaderValue.h"
+#include "core/html/track/WebVTTElement.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"
@@ -159,8 +160,6 @@
 #include "core/rendering/style/StylePendingShader.h"
 #include "core/rendering/style/StyleShader.h"
 
-#include "core/html/track/WebVTTElement.h"
-
 using namespace std;
 
 namespace WTF {
@@ -497,7 +496,7 @@ void StyleResolver::matchUARules(ElementRuleCollector& collector)
 
     // In quirks mode, we match rules from the quirks user agent sheet.
     if (document()->inQuirksMode())
-      matchUARules(collector, CSSDefaultStyleSheets::defaultQuirksStyle);
+        matchUARules(collector, CSSDefaultStyleSheets::defaultQuirksStyle);
 
     // If document uses view source styles (in view source mode or in xml viewer mode), then we match rules from the view source style sheet.
     if (document()->isViewSource())
@@ -549,10 +548,10 @@ void StyleResolver::matchAllRules(ElementRuleCollector& collector, bool matchAut
     // Now check our inline style attribute.
     if (matchAuthorAndUserStyles && m_state.styledElement() && m_state.styledElement()->inlineStyle()) {
         // Inline style is immutable as long as there is no CSSOM wrapper.
-      // FIXME: Media control shadow trees seem to have problems with caching.
-      bool isInlineStyleCacheable = !m_state.styledElement()->inlineStyle()->isMutable() && !m_state.styledElement()->isInShadowTree();
-      // FIXME: Constify.
-      collector.addElementStyleProperties(m_state.styledElement()->inlineStyle(), isInlineStyleCacheable);
+        // FIXME: Media control shadow trees seem to have problems with caching.
+        bool isInlineStyleCacheable = !m_state.styledElement()->inlineStyle()->isMutable() && !m_state.styledElement()->isInShadowTree();
+        // FIXME: Constify.
+        collector.addElementStyleProperties(m_state.styledElement()->inlineStyle(), isInlineStyleCacheable);
     }
 
 #if ENABLE(SVG)
@@ -906,7 +905,7 @@ static void setStylesForPaginationMode(Pagination::Mode paginationMode, RenderSt
 {
     if (paginationMode == Pagination::Unpaginated)
         return;
-        
+
     switch (paginationMode) {
     case Pagination::LeftToRightPaginated:
         style->setColumnAxis(HorizontalColumnAxis);
@@ -1101,8 +1100,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
     state.initForStyleResolve(document(), element, defaultParent, regionForStyling);
     if (sharingBehavior == AllowStyleSharing && !state.distributedToInsertionPoint()) {
         RenderStyle* sharedStyle = locateSharedStyle();
-        if (sharedStyle)
-        {
+        if (sharedStyle) {
             state.clear();
             return sharedStyle;
         }
@@ -1148,7 +1146,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
     if (matchingBehavior == MatchOnlyUserAgentRules)
         matchUARules(collector);
     else
-      matchAllRules(collector, m_matchAuthorAndUserStyles, matchingBehavior != MatchAllRulesExcludingSMIL);
+        matchAllRules(collector, m_matchAuthorAndUserStyles, matchingBehavior != MatchAllRulesExcludingSMIL);
 
     applyMatchedProperties(collector.matchedResult(), element);
 
@@ -1200,7 +1198,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(const RenderStyle* eleme
 
     // Start loading resources referenced by this style.
     loadPendingResources();
-    
+
     // Add all the animating properties to the keyframe.
     if (const StylePropertySet* styleDeclaration = keyframe->properties()) {
         unsigned propertyCount = styleDeclaration->propertyCount();
@@ -1462,7 +1460,7 @@ static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool s
     return BLOCK;
 }
 
-// CSS requires text-decoration to be reset at each DOM element for tables, 
+// CSS requires text-decoration to be reset at each DOM element for tables,
 // inline blocks, inline tables, run-ins, shadow DOM crossings, floating elements,
 // and absolute or relatively positioned elements.
 static bool doesNotInheritTextDecoration(RenderStyle* style, Element* e)
@@ -1796,7 +1794,7 @@ PassRefPtr<CSSRuleList> StyleResolver::pseudoStyleRulesForElement(Element* e, Ps
     if (rulesToInclude & UAAndUserCSSRules) {
         // First we match rules from the user agent sheet.
         matchUARules(collector);
-        
+
         // Now we check user sheet rules.
         if (m_matchAuthorAndUserStyles)
             matchUserRules(collector, rulesToInclude & EmptyCSSRules);
@@ -1939,7 +1937,7 @@ void StyleResolver::applyMatchedProperties(const MatchResult& matchResult, bool
 
 unsigned StyleResolver::computeMatchedPropertiesHash(const MatchedProperties* properties, unsigned size)
 {
-    
+
     return StringHasher::hashMemory(properties, sizeof(MatchedProperties) * size);
 }
 
@@ -2044,7 +2042,7 @@ void StyleResolver::applyMatchedProperties(const MatchResult& matchResult, const
     const MatchedPropertiesCacheItem* cacheItem = 0;
     if (cacheHash && (cacheItem = findFromMatchedPropertiesCache(cacheHash, matchResult))) {
         // We can build up the style by copying non-inherited properties from an earlier style object built using the same exact
-        // style declarations. We then only need to apply the inherited properties, if any, as their values can depend on the 
+        // style declarations. We then only need to apply the inherited properties, if any, as their values can depend on the
         // element context. This is fast and saves memory by reusing the style data structures.
         state.style()->copyNonInheritedFrom(cacheItem->renderStyle.get());
         if (state.parentStyle()->inheritedDataShared(cacheItem->parentRenderStyle.get()) && !isAtShadowBoundary(element)) {
@@ -2057,7 +2055,7 @@ void StyleResolver::applyMatchedProperties(const MatchResult& matchResult, const
             state.style()->setInsideLink(linkStatus);
             return;
         }
-        applyInheritedOnly = true; 
+        applyInheritedOnly = true;
     }
 
     // First apply all variable definitions, as they may be used during application of later properties.
@@ -2097,10 +2095,10 @@ void StyleResolver::applyMatchedProperties(const MatchResult& matchResult, const
 
     // Now do the normal priority UA properties.
     applyMatchedProperties<LowPriorityProperties>(matchResult, false, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly);
-    
+
     // Cache our border and background so that we can examine them later.
     state.cacheBorderAndBackground();
-    
+
     // Now do the author and user normal priority properties and all the !important properties.
     applyMatchedProperties<LowPriorityProperties>(matchResult, false, matchResult.ranges.lastUARule + 1, matchResult.matchedProperties.size() - 1, applyInheritedOnly);
     if (RuntimeEnabledFeatures::webAnimationEnabled())
@@ -2108,12 +2106,12 @@ void StyleResolver::applyMatchedProperties(const MatchResult& matchResult, const
     applyMatchedProperties<LowPriorityProperties>(matchResult, true, matchResult.ranges.firstAuthorRule, matchResult.ranges.lastAuthorRule, applyInheritedOnly);
     applyMatchedProperties<LowPriorityProperties>(matchResult, true, matchResult.ranges.firstUserRule, matchResult.ranges.lastUserRule, applyInheritedOnly);
     applyMatchedProperties<LowPriorityProperties>(matchResult, true, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly);
-   
+
     // Start loading resources referenced by this style.
     loadPendingResources();
-    
+
     ASSERT(!state.fontDirty());
-    
+
     if (cacheItem || !cacheHash)
         return;
     if (!isCacheableInMatchedPropertiesCache(state.element(), state.style(), state.parentStyle()))
@@ -2900,7 +2898,7 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
     // CSS Text Layout Module Level 3: Vertical writing support
     case CSSPropertyWebkitWritingMode: {
         HANDLE_INHERIT_AND_INITIAL(writingMode, WritingMode);
-        
+
         if (primitiveValue)
             setWritingMode(*primitiveValue);
 
@@ -3390,8 +3388,8 @@ void StyleResolver::checkForGenericFamilyChange(RenderStyle* style, RenderStyle*
             ? static_cast<float>(settings->defaultFixedFontSize()) / settings->defaultFontSize()
             : 1;
         size = parentFont.useFixedDefaultSize() ?
-                childFont.specifiedSize() / fixedScaleFactor :
-                childFont.specifiedSize() * fixedScaleFactor;
+            childFont.specifiedSize() / fixedScaleFactor :
+            childFont.specifiedSize() * fixedScaleFactor;
     }
 
     FontDescription newFontDescription(childFont);
@@ -3485,14 +3483,14 @@ const int totalKeywords = 8;
 // WinIE/Nav4 table for font sizes. Designed to match the legacy font mapping system of HTML.
 static const int quirksFontSizeTable[fontSizeTableMax - fontSizeTableMin + 1][totalKeywords] =
 {
-      { 9,    9,     9,     9,    11,    14,    18,    28 },
-      { 9,    9,     9,    10,    12,    15,    20,    31 },
-      { 9,    9,     9,    11,    13,    17,    22,    34 },
-      { 9,    9,    10,    12,    14,    18,    24,    37 },
-      { 9,    9,    10,    13,    16,    20,    26,    40 }, // fixed font default (13)
-      { 9,    9,    11,    14,    17,    21,    28,    42 },
-      { 9,   10,    12,    15,    17,    23,    30,    45 },
-      { 9,   10,    13,    16,    18,    24,    32,    48 } // proportional font default (16)
+    { 9,    9,     9,     9,    11,    14,    18,    28 },
+    { 9,    9,     9,    10,    12,    15,    20,    31 },
+    { 9,    9,     9,    11,    13,    17,    22,    34 },
+    { 9,    9,    10,    12,    14,    18,    24,    37 },
+    { 9,    9,    10,    13,    16,    20,    26,    40 }, // fixed font default (13)
+    { 9,    9,    11,    14,    17,    21,    28,    42 },
+    { 9,   10,    12,    15,    17,    23,    30,    45 },
+    { 9,   10,    13,    16,    18,    24,    32,    48 } // proportional font default (16)
 };
 // HTML       1      2      3      4      5      6      7
 // CSS  xxs   xs     s      m      l     xl     xxl
@@ -3502,14 +3500,14 @@ static const int quirksFontSizeTable[fontSizeTableMax - fontSizeTableMin + 1][to
 // Strict mode table matches MacIE and Mozilla's settings exactly.
 static const int strictFontSizeTable[fontSizeTableMax - fontSizeTableMin + 1][totalKeywords] =
 {
-      { 9,    9,     9,     9,    11,    14,    18,    27 },
-      { 9,    9,     9,    10,    12,    15,    20,    30 },
-      { 9,    9,    10,    11,    13,    17,    22,    33 },
-      { 9,    9,    10,    12,    14,    18,    24,    36 },
-      { 9,   10,    12,    13,    16,    20,    26,    39 }, // fixed font default (13)
-      { 9,   10,    12,    14,    17,    21,    28,    42 },
-      { 9,   10,    13,    15,    18,    23,    30,    45 },
-      { 9,   10,    13,    16,    18,    24,    32,    48 } // proportional font default (16)
+    { 9,    9,     9,     9,    11,    14,    18,    27 },
+    { 9,    9,     9,    10,    12,    15,    20,    30 },
+    { 9,    9,    10,    11,    13,    17,    22,    33 },
+    { 9,    9,    10,    12,    14,    18,    24,    36 },
+    { 9,   10,    12,    13,    16,    20,    26,    39 }, // fixed font default (13)
+    { 9,   10,    12,    14,    17,    21,    28,    42 },
+    { 9,   10,    13,    15,    18,    23,    30,    45 },
+    { 9,   10,    13,    16,    18,    24,    32,    48 } // proportional font default (16)
 };
 // HTML       1      2      3      4      5      6      7
 // CSS  xxs   xs     s      m      l     xl     xxl
@@ -3782,7 +3780,7 @@ void StyleResolver::loadPendingResources()
 
     // Start loading the shaders referenced by this style.
     loadPendingShaders();
-    
+
 #if ENABLE(SVG)
     // Start loading the SVG Documents referenced by this style.
     loadPendingSVGDocuments();
@@ -3842,7 +3840,7 @@ void StyleResolver::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     // FIXME: move this to a place where it would be called only once?
     info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
     info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyle");
-    info.addMember(CSSDefaultStyleSheets::defaultPrintStyle,"defaultPrintStyle");
+    info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle");
     info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSourceStyle");
 }
 
diff --git a/third_party/WebKit/Source/core/css/StyleResolver.h b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
index 953ffe4..34bdfcb 100644
--- a/third_party/WebKit/Source/core/css/StyleResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
@@ -22,6 +22,7 @@
 #ifndef StyleResolver_h
 #define StyleResolver_h
 
+#include "RuntimeEnabledFeatures.h"
 #include "core/css/CSSRuleList.h"
 #include "core/css/CSSToStyleMap.h"
 #include "core/css/CSSValueList.h"
@@ -30,26 +31,25 @@
 #include "core/css/MediaQueryExp.h"
 #include "core/css/RuleFeature.h"
 #include "core/css/RuleSet.h"
-#include "core/css/ScopedStyleResolver.h"
 #include "core/css/SelectorChecker.h"
 #include "core/css/SelectorFilter.h"
 #include "core/css/SiblingTraversalStrategies.h"
-#include "core/css/StyleResolverState.h"
-#include "core/css/ViewportStyleResolver.h"
-#include "RuntimeEnabledFeatures.h"
-#include "core/platform/LinkHash.h"
-#include "core/platform/ScrollTypes.h"
-#include "core/rendering/style/RenderStyle.h"
 #if ENABLE(SVG)
 #include "core/css/WebKitCSSSVGDocumentValue.h"
 #endif
+#include "core/css/resolver/ScopedStyleResolver.h"
+#include "core/css/resolver/StyleResolverState.h"
+#include "core/css/resolver/ViewportStyleResolver.h"
+#include "core/platform/LinkHash.h"
+#include "core/platform/ScrollTypes.h"
 #include "core/platform/graphics/filters/custom/CustomFilterConstants.h"
-#include <wtf/HashMap.h>
-#include <wtf/HashSet.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/AtomicStringHash.h>
-#include <wtf/text/StringHash.h>
-#include <wtf/Vector.h>
+#include "core/rendering/style/RenderStyle.h"
+#include "wtf/HashMap.h"
+#include "wtf/HashSet.h"
+#include "wtf/RefPtr.h"
+#include "wtf/Vector.h"
+#include "wtf/text/AtomicStringHash.h"
+#include "wtf/text/StringHash.h"
 
 namespace WebCore {
 
diff --git a/third_party/WebKit/Source/core/css/StyleResolverState.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
index b48d2ab..3e3b860 100644
--- a/third_party/WebKit/Source/core/css/StyleResolverState.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp
@@ -20,12 +20,12 @@
  */
 
 #include "config.h"
-#include "core/css/StyleResolverState.h"
+#include "core/css/resolver/StyleResolverState.h"
 
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/dom/Node.h"
-#include "core/dom/NodeRenderingContext.h"
 #include "core/dom/NodeRenderStyle.h"
+#include "core/dom/NodeRenderingContext.h"
 #include "core/dom/StyledElement.h"
 #include "core/dom/VisitedLinkState.h"
 #include "core/rendering/RenderTheme.h"
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h
new file mode 100644
index 0000000..4a5aa1c
--- /dev/null
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef StyleResolverState_h
+#define StyleResolverState_h
+
+#include "CSSPropertyNames.h"
+
+#include "core/css/CSSValueList.h"
+#if ENABLE(SVG)
+#include "core/css/WebKitCSSSVGDocumentValue.h"
+#endif
+#include "core/dom/Element.h"
+#include "core/platform/graphics/Color.h"
+#include "core/platform/graphics/filters/FilterOperations.h"
+#include "core/rendering/style/BorderData.h"
+#include "core/rendering/style/FillLayer.h"
+#include "core/rendering/style/RenderStyle.h"
+#include "core/rendering/style/StyleInheritedData.h"
+#include "wtf/HashMap.h"
+
+namespace WebCore {
+
+class FillLayer;
+class FontDescription;
+class RenderRegion;
+class StyledElement;
+
+typedef HashMap<CSSPropertyID, RefPtr<CSSValue> > PendingImagePropertyMap;
+#if ENABLE(SVG)
+typedef HashMap<FilterOperation*, RefPtr<WebKitCSSSVGDocumentValue> > PendingSVGDocumentMap;
+#endif
+
+class StyleResolverState {
+WTF_MAKE_NONCOPYABLE(StyleResolverState);
+public:
+    StyleResolverState()
+    : m_element(0)
+    , m_styledElement(0)
+    , m_parentNode(0)
+    , m_parentStyle(0)
+    , m_rootElementStyle(0)
+    , m_regionForStyling(0)
+    , m_elementLinkState(NotInsideLink)
+    , m_distributedToInsertionPoint(false)
+    , m_elementAffectedByClassRules(false)
+    , m_applyPropertyToRegularStyle(true)
+    , m_applyPropertyToVisitedLinkStyle(false)
+    , m_hasPendingShaders(false)
+    , m_lineHeightValue(0)
+    , m_fontDirty(false)
+    , m_hasUAAppearance(false)
+    , m_backgroundData(BackgroundFillLayer) { }
+
+    public:
+    void initElement(Element*);
+    void initForStyleResolve(Document*, Element*, RenderStyle* parentStyle = 0, RenderRegion* regionForStyling = 0);
+    void clear();
+
+    Color colorFromPrimitiveValue(CSSPrimitiveValue*, bool forVisitedLink = false) const;
+
+    Document* document() const { return m_element->document(); }
+    Element* element() const { return m_element; }
+    StyledElement* styledElement() const { return m_styledElement; }
+    void setStyle(PassRefPtr<RenderStyle> style) { m_style = style; }
+    RenderStyle* style() const { return m_style.get(); }
+    PassRefPtr<RenderStyle> takeStyle() { return m_style.release(); }
+
+    const ContainerNode* parentNode() const { return m_parentNode; }
+    void setParentStyle(PassRefPtr<RenderStyle> parentStyle) { m_parentStyle = parentStyle; }
+    RenderStyle* parentStyle() const { return m_parentStyle.get(); }
+    RenderStyle* rootElementStyle() const { return m_rootElementStyle; }
+
+    const RenderRegion* regionForStyling() const { return m_regionForStyling; }
+    EInsideLink elementLinkState() const { return m_elementLinkState; }
+    bool distributedToInsertionPoint() const { return m_distributedToInsertionPoint; }
+    void setElementAffectedByClassRules(bool isAffected) { m_elementAffectedByClassRules = isAffected; }
+    bool elementAffectedByClassRules() const { return m_elementAffectedByClassRules; }
+
+    void setApplyPropertyToRegularStyle(bool isApply) { m_applyPropertyToRegularStyle = isApply; }
+    void setApplyPropertyToVisitedLinkStyle(bool isApply) { m_applyPropertyToVisitedLinkStyle = isApply; }
+    bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularStyle; }
+    bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisitedLinkStyle; }
+    PendingImagePropertyMap& pendingImageProperties() { return m_pendingImageProperties; }
+#if ENABLE(SVG)
+    PendingSVGDocumentMap& pendingSVGDocuments() { return m_pendingSVGDocuments; }
+#endif
+    void setHasPendingShaders(bool hasPendingShaders) { m_hasPendingShaders = hasPendingShaders; }
+    bool hasPendingShaders() const { return m_hasPendingShaders; }
+
+    void setLineHeightValue(CSSValue* value) { m_lineHeightValue = value; }
+    CSSValue* lineHeightValue() { return m_lineHeightValue; }
+    void setFontDirty(bool isDirty) { m_fontDirty = isDirty; }
+    bool fontDirty() const { return m_fontDirty; }
+
+    void cacheBorderAndBackground();
+    bool hasUAAppearance() const { return m_hasUAAppearance; }
+    BorderData borderData() const { return m_borderData; }
+    FillLayer backgroundData() const { return m_backgroundData; }
+    Color backgroundColor() const { return m_backgroundColor; }
+
+    const FontDescription& fontDescription() { return m_style->fontDescription(); }
+    const FontDescription& parentFontDescription() { return m_parentStyle->fontDescription(); }
+    void setFontDescription(const FontDescription& fontDescription) { m_fontDirty |= m_style->setFontDescription(fontDescription); }
+    void setZoom(float f) { m_fontDirty |= m_style->setZoom(f); }
+    void setEffectiveZoom(float f) { m_fontDirty |= m_style->setEffectiveZoom(f); }
+    void setWritingMode(WritingMode writingMode) { m_fontDirty |= m_style->setWritingMode(writingMode); }
+    void setTextOrientation(TextOrientation textOrientation) { m_fontDirty |= m_style->setTextOrientation(textOrientation); }
+
+    bool useSVGZoomRules() const { return m_element && m_element->isSVGElement(); }
+
+private:
+    // FIXME(bug 108563): to make it easier to review, these member
+    // variables are public. However we should add methods to access
+    // these variables.
+    Element* m_element;
+    RefPtr<RenderStyle> m_style;
+    StyledElement* m_styledElement;
+    ContainerNode* m_parentNode;
+    RefPtr<RenderStyle> m_parentStyle;
+    RenderStyle* m_rootElementStyle;
+
+    // Required to ASSERT in applyProperties.
+    RenderRegion* m_regionForStyling;
+
+    EInsideLink m_elementLinkState;
+
+    bool m_distributedToInsertionPoint;
+
+    bool m_elementAffectedByClassRules;
+
+    bool m_applyPropertyToRegularStyle;
+    bool m_applyPropertyToVisitedLinkStyle;
+
+    PendingImagePropertyMap m_pendingImageProperties;
+    bool m_hasPendingShaders;
+#if ENABLE(SVG)
+    PendingSVGDocumentMap m_pendingSVGDocuments;
+#endif
+    CSSValue* m_lineHeightValue;
+    bool m_fontDirty;
+
+    bool m_hasUAAppearance;
+    BorderData m_borderData;
+    FillLayer m_backgroundData;
+    Color m_backgroundColor;
+};
+
+} // namespace WebCore
+
+#endif // StyleResolverState_h
diff --git a/third_party/WebKit/Source/core/css/TransformBuilder.cpp b/third_party/WebKit/Source/core/css/resolver/TransformBuilder.cpp
index 4c3825b..a9ccdcf 100644
--- a/third_party/WebKit/Source/core/css/TransformBuilder.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/TransformBuilder.cpp
@@ -27,10 +27,12 @@
  */
 
 #include "config.h"
-#include "core/css/TransformBuilder.h"
+#include "core/css/resolver/TransformBuilder.h"
 
+#include "core/css/CSSPrimitiveValueMappings.h"
+#include "core/css/WebKitCSSFilterValue.h"
 #include "core/css/WebKitCSSTransformValue.h"
-#include "core/rendering/style/RenderStyle.h"
+#include "core/platform/graphics/filters/FilterOperation.h"
 #include "core/platform/graphics/transforms/Matrix3DTransformOperation.h"
 #include "core/platform/graphics/transforms/MatrixTransformOperation.h"
 #include "core/platform/graphics/transforms/PerspectiveTransformOperation.h"
@@ -39,10 +41,7 @@
 #include "core/platform/graphics/transforms/SkewTransformOperation.h"
 #include "core/platform/graphics/transforms/TransformationMatrix.h"
 #include "core/platform/graphics/transforms/TranslateTransformOperation.h"
-
-#include "core/css/WebKitCSSFilterValue.h"
-#include "core/platform/graphics/filters/FilterOperation.h"
-#include "core/css/CSSPrimitiveValueMappings.h"
+#include "core/rendering/style/RenderStyle.h"
 
 namespace WebCore {
 
@@ -289,21 +288,21 @@ bool TransformBuilder::createTransformOperations(CSSValue* inValue, RenderStyle*
             if (transformValue->length() < 16)
                 break;
             TransformationMatrix matrix(static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(0))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(1))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(2))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(3))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(4))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(5))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(6))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(7))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(8))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(9))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(10))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(11))->getDoubleValue(),
-                               zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(12))->getDoubleValue(),
-                               zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(13))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(14))->getDoubleValue(),
-                               static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(15))->getDoubleValue());
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(1))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(2))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(3))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(4))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(5))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(6))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(7))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(8))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(9))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(10))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(11))->getDoubleValue(),
+                zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(12))->getDoubleValue(),
+                zoomFactor * static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(13))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(14))->getDoubleValue(),
+                static_cast<CSSPrimitiveValue*>(transformValue->itemWithoutBoundsCheck(15))->getDoubleValue());
             operations.operations().append(Matrix3DTransformOperation::create(matrix));
             break;
         }
diff --git a/third_party/WebKit/Source/core/css/TransformBuilder.h b/third_party/WebKit/Source/core/css/resolver/TransformBuilder.h
index 1d0300c..8807205 100644
--- a/third_party/WebKit/Source/core/css/TransformBuilder.h
+++ b/third_party/WebKit/Source/core/css/resolver/TransformBuilder.h
@@ -32,7 +32,7 @@
 #define TransformBuilder_h
 
 #include "core/platform/graphics/transforms/TransformOperations.h"
-#include <wtf/Noncopyable.h>
+#include "wtf/Noncopyable.h"
 
 namespace WebCore {
 
diff --git a/third_party/WebKit/Source/core/css/ViewportStyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
index 1462971..8071f1d 100644
--- a/third_party/WebKit/Source/core/css/ViewportStyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "config.h"
-#include "core/css/ViewportStyleResolver.h"
+#include "core/css/resolver/ViewportStyleResolver.h"
 
 #if ENABLE(CSS_DEVICE_ADAPTATION)
 
diff --git a/third_party/WebKit/Source/core/css/ViewportStyleResolver.h b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.h
index 7c999a6..bdbc150 100644
--- a/third_party/WebKit/Source/core/css/ViewportStyleResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.h
@@ -34,8 +34,8 @@
 
 #include "CSSPropertyNames.h"
 #include "core/platform/graphics/FloatSize.h"
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
+#include "wtf/RefCounted.h"
+#include "wtf/RefPtr.h"
 
 namespace WebCore {
 
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index 4c96ca1..2db1979 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -45,9 +45,9 @@
 #include "core/css/MediaQueryList.h"
 #include "core/css/MediaQueryMatcher.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/StyleSheetList.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attr.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/CDATASection.h"
diff --git a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp
index 7f7bfd3..4735ab2 100644
--- a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp
+++ b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp
@@ -34,9 +34,9 @@
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/SelectorChecker.h"
 #include "core/css/StyleInvalidationAnalysis.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/StyleSheetList.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/ProcessingInstruction.h"
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index f9d978d..cd5ec55 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -33,7 +33,7 @@
 #include "core/css/CSSParser.h"
 #include "core/css/CSSSelectorList.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attr.h"
 #include "core/dom/ClientRect.h"
 #include "core/dom/ClientRectList.h"
diff --git a/third_party/WebKit/Source/core/dom/Node.cpp b/third_party/WebKit/Source/core/dom/Node.cpp
index aaf9fed1..79136ad 100644
--- a/third_party/WebKit/Source/core/dom/Node.cpp
+++ b/third_party/WebKit/Source/core/dom/Node.cpp
@@ -34,7 +34,7 @@
 #include "core/css/CSSSelectorList.h"
 #include "core/css/CSSStyleRule.h"
 #include "core/css/CSSStyleSheet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attr.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/BeforeLoadEvent.h"
diff --git a/third_party/WebKit/Source/core/dom/NodeRenderingContext.cpp b/third_party/WebKit/Source/core/dom/NodeRenderingContext.cpp
index aca7e5f..acdfbbd 100644
--- a/third_party/WebKit/Source/core/dom/NodeRenderingContext.cpp
+++ b/third_party/WebKit/Source/core/dom/NodeRenderingContext.cpp
@@ -27,7 +27,7 @@
 #include "core/dom/NodeRenderingContext.h"
 
 #include "HTMLNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ContainerNode.h"
 #include "core/dom/ElementShadow.h"
 #include "core/dom/Node.h"
diff --git a/third_party/WebKit/Source/core/dom/ShadowRoot.cpp b/third_party/WebKit/Source/core/dom/ShadowRoot.cpp
index 3e72c72..47d3eb0 100644
--- a/third_party/WebKit/Source/core/dom/ShadowRoot.cpp
+++ b/third_party/WebKit/Source/core/dom/ShadowRoot.cpp
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "core/dom/ShadowRoot.h"
 
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ElementShadow.h"
 #include "core/dom/Text.h"
 #include "core/editing/markup.h"
diff --git a/third_party/WebKit/Source/core/dom/StyledElement.cpp b/third_party/WebKit/Source/core/dom/StyledElement.cpp
index a329f7f..e975d03 100644
--- a/third_party/WebKit/Source/core/dom/StyledElement.cpp
+++ b/third_party/WebKit/Source/core/dom/StyledElement.cpp
@@ -33,7 +33,7 @@
 #include "core/css/CSSValuePool.h"
 #include "core/css/PropertySetCSSStyleDeclaration.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/Document.h"
 #include "core/dom/ScriptableDocumentParser.h"
diff --git a/third_party/WebKit/Source/core/dom/Text.cpp b/third_party/WebKit/Source/core/dom/Text.cpp
index 3a383ff..71721f2 100644
--- a/third_party/WebKit/Source/core/dom/Text.cpp
+++ b/third_party/WebKit/Source/core/dom/Text.cpp
@@ -34,7 +34,7 @@
 #include "core/rendering/svg/RenderSVGInlineText.h"
 #endif
 
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/rendering/style/StyleInheritedData.h"
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
diff --git a/third_party/WebKit/Source/core/editing/ApplyStyleCommand.cpp b/third_party/WebKit/Source/core/editing/ApplyStyleCommand.cpp
index 85300df..069cdcb 100644
--- a/third_party/WebKit/Source/core/editing/ApplyStyleCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/ApplyStyleCommand.cpp
@@ -33,7 +33,7 @@
 #include "core/css/CSSParser.h"
 #include "core/css/CSSValuePool.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/NodeList.h"
 #include "core/dom/NodeTraversal.h"
diff --git a/third_party/WebKit/Source/core/editing/EditingStyle.cpp b/third_party/WebKit/Source/core/editing/EditingStyle.cpp
index 1be4f7c..03994cb 100644
--- a/third_party/WebKit/Source/core/editing/EditingStyle.cpp
+++ b/third_party/WebKit/Source/core/editing/EditingStyle.cpp
@@ -35,8 +35,8 @@
 #include "core/css/CSSStyleRule.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleRule.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Node.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/Position.h"
diff --git a/third_party/WebKit/Source/core/editing/Editor.cpp b/third_party/WebKit/Source/core/editing/Editor.cpp
index b14329d..96fe750 100644
--- a/third_party/WebKit/Source/core/editing/Editor.cpp
+++ b/third_party/WebKit/Source/core/editing/Editor.cpp
@@ -33,7 +33,7 @@
 #include "core/accessibility/AXObjectCache.h"
 #include "core/css/CSSComputedStyleDeclaration.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Clipboard.h"
 #include "core/dom/ClipboardEvent.h"
 #include "core/dom/CompositionEvent.h"
diff --git a/third_party/WebKit/Source/core/editing/markup.cpp b/third_party/WebKit/Source/core/editing/markup.cpp
index 4d093bf..4e44bf0 100644
--- a/third_party/WebKit/Source/core/editing/markup.cpp
+++ b/third_party/WebKit/Source/core/editing/markup.cpp
@@ -39,7 +39,7 @@
 #include "core/css/CSSStyleRule.h"
 #include "core/css/CSSValue.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/CDATASection.h"
 #include "core/dom/ChildListMutationScope.h"
 #include "core/dom/ContextFeatures.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLDialogElement.cpp b/third_party/WebKit/Source/core/html/HTMLDialogElement.cpp
index f8d85eb..52718b3 100644
--- a/third_party/WebKit/Source/core/html/HTMLDialogElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLDialogElement.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "core/html/HTMLDialogElement.h"
 
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/page/FrameView.h"
 #include "core/rendering/RenderBlock.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp
index 1dad8d7..9188895 100644
--- a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp
@@ -34,7 +34,7 @@
 #include "HTMLNames.h"
 #include "bindings/v8/ScriptEventListener.h"
 #include "core/accessibility/AXObjectCache.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/BeforeTextInsertedEvent.h"
 #include "core/dom/Document.h"
 #include "core/dom/ElementShadow.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
index 6f143fe..3ded8b66 100644
--- a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
@@ -29,8 +29,8 @@
 #include "bindings/v8/ScriptEventListener.h"
 #include "core/css/MediaList.h"
 #include "core/css/MediaQueryEvaluator.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleSheetContents.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentStyleSheetCollection.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
index f7da957..7cd8034 100644
--- a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
@@ -26,7 +26,7 @@
 #include "core/html/HTMLOptGroupElement.h"
 
 #include "HTMLNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/dom/NodeRenderingContext.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp b/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
index 3add454..e689cd3 100644
--- a/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
@@ -28,7 +28,7 @@
 #include "core/html/HTMLOptionElement.h"
 
 #include "HTMLNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInImageElement.cpp b/third_party/WebKit/Source/core/html/HTMLPlugInImageElement.cpp
index f3b8e9f..64eecf4 100644
--- a/third_party/WebKit/Source/core/html/HTMLPlugInImageElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLPlugInImageElement.cpp
@@ -22,7 +22,7 @@
 #include "core/html/HTMLPlugInImageElement.h"
 
 #include "bindings/v8/ScriptController.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/MouseEvent.h"
 #include "core/dom/NodeList.h"
 #include "core/dom/NodeRenderStyle.h"
diff --git a/third_party/WebKit/Source/core/html/ValidationMessage.cpp b/third_party/WebKit/Source/core/html/ValidationMessage.cpp
index c155fa2..5149203 100644
--- a/third_party/WebKit/Source/core/html/ValidationMessage.cpp
+++ b/third_party/WebKit/Source/core/html/ValidationMessage.cpp
@@ -34,7 +34,7 @@
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
 #include "HTMLNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ElementShadow.h"
 #include "core/dom/ExceptionCodePlaceholder.h"
 #include "core/dom/ShadowRoot.h"
diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.cpp
index 12d51b6..3864544 100644
--- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.cpp
+++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.cpp
@@ -38,7 +38,7 @@
 #include "core/css/CSSFontSelector.h"
 #include "core/css/CSSParser.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExceptionCodePlaceholder.h"
 #include "core/html/HTMLCanvasElement.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp b/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp
index 1e323a1..678f58e 100644
--- a/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp
@@ -28,7 +28,7 @@
 #include "core/html/shadow/DateTimeEditElement.h"
 
 #include "HTMLNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/KeyboardEvent.h"
 #include "core/dom/MouseEvent.h"
 #include "core/dom/Text.h"
diff --git a/third_party/WebKit/Source/core/html/shadow/TextFieldDecorationElement.cpp b/third_party/WebKit/Source/core/html/shadow/TextFieldDecorationElement.cpp
index c330767..86d709c 100644
--- a/third_party/WebKit/Source/core/html/shadow/TextFieldDecorationElement.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/TextFieldDecorationElement.cpp
@@ -33,7 +33,7 @@
 
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ElementShadow.h"
 #include "core/dom/Event.h"
 #include "core/dom/NodeRenderStyle.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
index 214a159..f390b7d 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
@@ -36,10 +36,10 @@
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StylePropertyShorthand.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleRule.h"
 #include "core/css/StyleSheet.h"
 #include "core/css/StyleSheetList.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ExceptionCodePlaceholder.h"
 #include "core/dom/NamedFlow.h"
 #include "core/dom/NamedFlowCollection.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
index 7f1c772..1ceb90c 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
@@ -42,8 +42,8 @@
 #include "core/css/CSSStyleRule.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleSheetList.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attr.h"
 #include "core/dom/CharacterData.h"
 #include "core/dom/ContainerNode.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
index 3f182f9..3acd738 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
@@ -35,8 +35,8 @@
 #include "bindings/v8/ScriptController.h"
 #include "core/css/CSSRule.h"
 #include "core/css/CSSStyleRule.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleRule.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/DeviceOrientationData.h"
 #include "core/dom/Event.h"
 #include "core/dom/EventContext.h"
diff --git a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
index cb2e2be..295cfb1 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
@@ -39,12 +39,12 @@
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/CSSSupportsRule.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleRule.h"
 #include "core/css/StyleRuleImport.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/StyleSheetList.h"
 #include "core/css/WebKitCSSKeyframesRule.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Node.h"
diff --git a/third_party/WebKit/Source/core/loader/LinkLoader.cpp b/third_party/WebKit/Source/core/loader/LinkLoader.cpp
index 1e8f750..f1734be 100644
--- a/third_party/WebKit/Source/core/loader/LinkLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/LinkLoader.cpp
@@ -33,7 +33,7 @@
 #include "core/loader/LinkLoader.h"
 
 #include "core/css/CSSStyleSheet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ContainerNode.h"
 #include "core/dom/Document.h"
 #include "core/html/LinkRelAttribute.h"
diff --git a/third_party/WebKit/Source/core/page/DOMWindow.cpp b/third_party/WebKit/Source/core/page/DOMWindow.cpp
index 4482d66..8f509d7 100644
--- a/third_party/WebKit/Source/core/page/DOMWindow.cpp
+++ b/third_party/WebKit/Source/core/page/DOMWindow.cpp
@@ -38,7 +38,7 @@
 #include "core/css/MediaQueryList.h"
 #include "core/css/MediaQueryMatcher.h"
 #include "core/css/StyleMedia.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/BeforeUnloadEvent.h"
 #include "core/dom/DOMStringList.h"
 #include "core/dom/DeviceOrientationController.h"
diff --git a/third_party/WebKit/Source/core/page/FrameView.cpp b/third_party/WebKit/Source/core/page/FrameView.cpp
index 7364a3a..cdea37e 100644
--- a/third_party/WebKit/Source/core/page/FrameView.cpp
+++ b/third_party/WebKit/Source/core/page/FrameView.cpp
@@ -31,7 +31,7 @@
 #include "RuntimeEnabledFeatures.h"
 #include "core/accessibility/AXObjectCache.h"
 #include "core/css/FontLoader.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/OverflowEvent.h"
 #include "core/editing/FrameSelection.h"
diff --git a/third_party/WebKit/Source/core/page/animation/CSSPropertyAnimation.cpp b/third_party/WebKit/Source/core/page/animation/CSSPropertyAnimation.cpp
index 84e7a28..6e72b37 100644
--- a/third_party/WebKit/Source/core/page/animation/CSSPropertyAnimation.cpp
+++ b/third_party/WebKit/Source/core/page/animation/CSSPropertyAnimation.cpp
@@ -37,7 +37,7 @@
 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/StylePropertyShorthand.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/loader/cache/CachedImage.h"
 #include "core/page/animation/AnimationBase.h"
 #include "core/platform/FloatConversion.h"
diff --git a/third_party/WebKit/Source/core/page/animation/KeyframeAnimation.cpp b/third_party/WebKit/Source/core/page/animation/KeyframeAnimation.cpp
index 90b3305..b745ebc 100644
--- a/third_party/WebKit/Source/core/page/animation/KeyframeAnimation.cpp
+++ b/third_party/WebKit/Source/core/page/animation/KeyframeAnimation.cpp
@@ -30,7 +30,7 @@
 #include "core/page/animation/KeyframeAnimation.h"
 
 #include "CSSPropertyNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/EventNames.h"
 #include "core/page/animation/AnimationControllerPrivate.h"
 #include "core/page/animation/CSSPropertyAnimation.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderLayer.cpp b/third_party/WebKit/Source/core/rendering/RenderLayer.cpp
index 34a0862..76a2ed8 100644
--- a/third_party/WebKit/Source/core/rendering/RenderLayer.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderLayer.cpp
@@ -47,7 +47,7 @@
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentEventQueue.h"
 #include "core/dom/OverflowEvent.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderLayerBacking.cpp b/third_party/WebKit/Source/core/rendering/RenderLayerBacking.cpp
index 5adb079..4c50398 100644
--- a/third_party/WebKit/Source/core/rendering/RenderLayerBacking.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderLayerBacking.cpp
@@ -29,7 +29,7 @@
 
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLIFrameElement.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderListBox.cpp b/third_party/WebKit/Source/core/rendering/RenderListBox.cpp
index f76cdfa..f22f65a 100644
--- a/third_party/WebKit/Source/core/rendering/RenderListBox.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderListBox.cpp
@@ -34,7 +34,7 @@
 #include "HTMLNames.h"
 #include "core/accessibility/AXObjectCache.h"
 #include "core/css/CSSFontSelector.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentEventQueue.h"
 #include "core/dom/NodeRenderStyle.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderMenuList.cpp b/third_party/WebKit/Source/core/rendering/RenderMenuList.cpp
index d36eeb0..1734f3e 100644
--- a/third_party/WebKit/Source/core/rendering/RenderMenuList.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderMenuList.cpp
@@ -30,7 +30,7 @@
 #include "core/accessibility/AXObjectCache.h"
 #include "core/accessibility/AccessibilityMenuList.h"
 #include "core/css/CSSFontSelector.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/NodeRenderStyle.h"
 #include "core/html/HTMLOptGroupElement.h"
 #include "core/html/HTMLOptionElement.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderObject.cpp b/third_party/WebKit/Source/core/rendering/RenderObject.cpp
index 429ff80..6965c96 100644
--- a/third_party/WebKit/Source/core/rendering/RenderObject.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderObject.cpp
@@ -31,7 +31,7 @@
 #include <algorithm>
 #include "HTMLNames.h"
 #include "core/accessibility/AXObjectCache.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 #include "core/editing/EditingBoundary.h"
 #include "core/editing/FrameSelection.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderRegion.cpp b/third_party/WebKit/Source/core/rendering/RenderRegion.cpp
index 73754b2..91b017e 100644
--- a/third_party/WebKit/Source/core/rendering/RenderRegion.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderRegion.cpp
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "core/rendering/RenderRegion.h"
 
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Range.h"
 #include "core/platform/graphics/GraphicsContext.h"
 #include "core/platform/graphics/IntRect.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderScrollbar.cpp b/third_party/WebKit/Source/core/rendering/RenderScrollbar.cpp
index b83655f..083c76c 100644
--- a/third_party/WebKit/Source/core/rendering/RenderScrollbar.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderScrollbar.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "core/rendering/RenderScrollbar.h"
 
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/page/Frame.h"
 #include "core/page/FrameView.h"
 #include "core/rendering/RenderPart.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderSearchField.cpp b/third_party/WebKit/Source/core/rendering/RenderSearchField.cpp
index 81e1113..ecee30e 100644
--- a/third_party/WebKit/Source/core/rendering/RenderSearchField.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderSearchField.cpp
@@ -27,7 +27,7 @@
 #include "CSSValueKeywords.h"
 #include "HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/editing/FrameSelection.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/shadow/TextControlInnerElements.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderSlider.cpp b/third_party/WebKit/Source/core/rendering/RenderSlider.cpp
index eac96e8..cac447a 100644
--- a/third_party/WebKit/Source/core/rendering/RenderSlider.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderSlider.cpp
@@ -23,7 +23,7 @@
 
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/Event.h"
 #include "core/dom/EventNames.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderTextControlSingleLine.cpp b/third_party/WebKit/Source/core/rendering/RenderTextControlSingleLine.cpp
index 86bc8ee..36354f0 100644
--- a/third_party/WebKit/Source/core/rendering/RenderTextControlSingleLine.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderTextControlSingleLine.cpp
@@ -27,7 +27,7 @@
 #include "CSSValueKeywords.h"
 #include "HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/editing/FrameSelection.h"
 #include "core/html/shadow/TextControlInnerElements.h"
 #include "core/page/Chrome.h"
diff --git a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumMac.mm b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumMac.mm
index 682aa23d..1a479e6 100644
--- a/third_party/WebKit/Source/core/rendering/RenderThemeChromiumMac.mm
+++ b/third_party/WebKit/Source/core/rendering/RenderThemeChromiumMac.mm
@@ -25,7 +25,7 @@
 #import "HTMLNames.h"
 #import "UserAgentStyleSheets.h"
 #import "core/css/CSSValueList.h"
-#import "core/css/StyleResolver.h"
+#import "core/css/resolver/StyleResolver.h"
 #import "core/dom/Document.h"
 #import "core/dom/Element.h"
 #import "core/fileapi/FileList.h"
diff --git a/third_party/WebKit/Source/core/rendering/style/RenderStyle.cpp b/third_party/WebKit/Source/core/rendering/style/RenderStyle.cpp
index 8b58ff2..761c0d5 100644
--- a/third_party/WebKit/Source/core/rendering/style/RenderStyle.cpp
+++ b/third_party/WebKit/Source/core/rendering/style/RenderStyle.cpp
@@ -25,7 +25,7 @@
 
 #include <algorithm>
 #include "CSSPropertyNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 #include "core/platform/graphics/Font.h"
 #include "core/platform/graphics/FontSelector.h"
diff --git a/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.cpp b/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.cpp
index 76bdac5..f1fe1af 100644
--- a/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.cpp
+++ b/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.cpp
@@ -25,7 +25,7 @@
 #include "core/rendering/style/StyleGeneratedImage.h"
 
 #include "core/css/CSSImageGeneratorValue.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/rendering/RenderObject.h"
 
 namespace WebCore {
diff --git a/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.cpp b/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.cpp
index 1880b7b..f358fa8 100644
--- a/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.cpp
+++ b/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.cpp
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "core/rendering/style/StyleRareNonInheritedData.h"
 
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 #include "core/rendering/RenderCounter.h"
 #include "core/rendering/style/ContentData.h"
@@ -255,7 +255,7 @@ bool StyleRareNonInheritedData::counterDataEquivalent(const StyleRareNonInherite
 {
     if (m_counterDirectives.get() == o.m_counterDirectives.get())
         return true;
-        
+
     if (m_counterDirectives && o.m_counterDirectives && *m_counterDirectives == *o.m_counterDirectives)
         return true;
 
diff --git a/third_party/WebKit/Source/core/rendering/svg/RenderSVGInlineText.cpp b/third_party/WebKit/Source/core/rendering/svg/RenderSVGInlineText.cpp
index 1595312..b29fdf6 100644
--- a/third_party/WebKit/Source/core/rendering/svg/RenderSVGInlineText.cpp
+++ b/third_party/WebKit/Source/core/rendering/svg/RenderSVGInlineText.cpp
@@ -27,7 +27,7 @@
 #include "core/rendering/svg/RenderSVGInlineText.h"
 
 #include "core/css/CSSFontSelector.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/editing/VisiblePosition.h"
 #include "core/page/Settings.h"
 #include "core/platform/FloatConversion.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGClipPathElement.cpp b/third_party/WebKit/Source/core/svg/SVGClipPathElement.cpp
index 52a4d24..33f5313 100644
--- a/third_party/WebKit/Source/core/svg/SVGClipPathElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGClipPathElement.cpp
@@ -25,7 +25,7 @@
 #include "core/svg/SVGClipPathElement.h"
 
 #include "SVGNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/Document.h"
 #include "core/rendering/svg/RenderSVGResourceClipper.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGElementRareData.h b/third_party/WebKit/Source/core/svg/SVGElementRareData.h
index b2573bd..2cc0795 100644
--- a/third_party/WebKit/Source/core/svg/SVGElementRareData.h
+++ b/third_party/WebKit/Source/core/svg/SVGElementRareData.h
@@ -22,7 +22,7 @@
 
 #include "core/css/CSSParserMode.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/StdLibExtras.h>
diff --git a/third_party/WebKit/Source/core/svg/SVGFontFaceElement.cpp b/third_party/WebKit/Source/core/svg/SVGFontFaceElement.cpp
index 0d0ac0d..46d8fa8 100644
--- a/third_party/WebKit/Source/core/svg/SVGFontFaceElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGFontFaceElement.cpp
@@ -33,8 +33,8 @@
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/StyleResolver.h"
 #include "core/css/StyleRule.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/Document.h"
 #include "core/platform/graphics/Font.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGGradientElement.cpp b/third_party/WebKit/Source/core/svg/SVGGradientElement.cpp
index 84fcd12..e97ad65 100644
--- a/third_party/WebKit/Source/core/svg/SVGGradientElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGGradientElement.cpp
@@ -25,7 +25,7 @@
 #include "core/svg/SVGGradientElement.h"
 
 #include "SVGNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/rendering/svg/RenderSVGHiddenContainer.h"
 #include "core/rendering/svg/RenderSVGPath.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp b/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp
index f098f32..1907d37 100644
--- a/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp
@@ -27,7 +27,7 @@
 #include "core/svg/SVGMaskElement.h"
 
 #include "SVGNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/rendering/svg/RenderSVGResourceMasker.h"
 #include "core/rendering/svg/SVGRenderSupport.h"
diff --git a/third_party/WebKit/Source/core/svg/SVGUseElement.cpp b/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
index 55b09e7..404a5d4 100644
--- a/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
@@ -30,7 +30,7 @@
 #include "HTMLNames.h"
 #include "SVGNames.h"
 #include "XLinkNames.h"
-#include "core/css/StyleResolver.h"
+#include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/Document.h"
 #include "core/dom/ElementShadow.h"