Title: [102712] trunk/Source/WebCore
- Revision
- 102712
- Author
- [email protected]
- Date
- 2011-12-13 15:38:17 -0800 (Tue, 13 Dec 2011)
Log Message
inline setting m_regionForStyling since region is rarely set
https://bugs.webkit.org/show_bug.cgi?id=74435
Reviewed by Andreas Kling.
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::initForRegionStyling):
(WebCore::CSSStyleSelector::initRegionRules):
* css/CSSStyleSelector.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102711 => 102712)
--- trunk/Source/WebCore/ChangeLog 2011-12-13 23:26:58 UTC (rev 102711)
+++ trunk/Source/WebCore/ChangeLog 2011-12-13 23:38:17 UTC (rev 102712)
@@ -1,3 +1,15 @@
+2011-12-13 Tony Chang <[email protected]>
+
+ inline setting m_regionForStyling since region is rarely set
+ https://bugs.webkit.org/show_bug.cgi?id=74435
+
+ Reviewed by Andreas Kling.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::initForRegionStyling):
+ (WebCore::CSSStyleSelector::initRegionRules):
+ * css/CSSStyleSelector.h:
+
2011-12-13 James Simonsen <[email protected]>
Unreviewed, Chromium Mac build fix.
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (102711 => 102712)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-13 23:26:58 UTC (rev 102711)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-13 23:38:17 UTC (rev 102712)
@@ -870,13 +870,17 @@
m_fontDirty = false;
}
-void CSSStyleSelector::initForRegionStyling(RenderRegion* region)
+inline void CSSStyleSelector::initForRegionStyling(RenderRegion* region)
{
setRegionForStyling(region);
- if (!region)
- return;
+ if (region)
+ initRegionRules(region);
+}
+void CSSStyleSelector::initRegionRules(RenderRegion* region)
+{
+ ASSERT(region);
// Mark that the set of rules comes from region styling since we need to filter
// the properties that can be applied.
m_regionRules = adoptPtr(new RuleSet(true));
Modified: trunk/Source/WebCore/css/CSSStyleSelector.h (102711 => 102712)
--- trunk/Source/WebCore/css/CSSStyleSelector.h 2011-12-13 23:26:58 UTC (rev 102711)
+++ trunk/Source/WebCore/css/CSSStyleSelector.h 2011-12-13 23:38:17 UTC (rev 102712)
@@ -131,6 +131,7 @@
void initForStyleResolve(Element*, RenderStyle* parentStyle = 0, PseudoId = NOPSEUDO);
void initElement(Element*);
void initForRegionStyling(RenderRegion*);
+ void initRegionRules(RenderRegion*);
RenderStyle* locateSharedStyle();
bool matchesRuleSet(RuleSet*);
Node* locateCousinList(Element* parent, unsigned& visitedNodeCount) const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
