Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(629)

Unified Diff: Source/core/css/resolver/StyleResolverState.h

Issue 134473008: Remove CSS regions support, keeping a bare minimum to support "region-based" multicol. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/css/resolver/StyleResolverState.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolverState.h
diff --git a/Source/core/css/resolver/StyleResolverState.h b/Source/core/css/resolver/StyleResolverState.h
index f16016c40792987c5093d6683f7a5c8592b9190a..9c93a43e11a3d8a065c2e834242ffad68fdea068 100644
--- a/Source/core/css/resolver/StyleResolverState.h
+++ b/Source/core/css/resolver/StyleResolverState.h
@@ -39,13 +39,12 @@ namespace WebCore {
class CSSAnimationUpdate;
class FontDescription;
-class RenderRegion;
class StyleRule;
class StyleResolverState {
WTF_MAKE_NONCOPYABLE(StyleResolverState);
public:
- StyleResolverState(Document&, Element*, RenderStyle* parentStyle = 0, RenderRegion* regionForStyling = 0);
+ StyleResolverState(Document&, Element*, RenderStyle* parentStyle = 0);
~StyleResolverState();
// In FontFaceSet and CanvasRenderingContext2D, we don't have an element to grab the document from.
@@ -75,8 +74,6 @@ public:
const RenderStyle* parentStyle() const { return m_parentStyle.get(); }
RenderStyle* parentStyle() { return m_parentStyle.get(); }
- const RenderRegion* regionForStyling() const { return m_regionForStyling; }
-
void setCurrentRule(StyleRule* currentRule) { m_currentRule = currentRule; }
const StyleRule* currentRule() const { return m_currentRule; }
@@ -150,11 +147,6 @@ private:
OwnPtr<CSSAnimationUpdate> m_animationUpdate;
- // Required to ASSERT in applyProperties.
- // FIXME: Regions should not need special state on StyleResolverState
- // no other @rule does.
- RenderRegion* m_regionForStyling;
-
bool m_applyPropertyToRegularStyle;
bool m_applyPropertyToVisitedLinkStyle;
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/css/resolver/StyleResolverState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698