Modified: trunk/Source/WebCore/ChangeLog (103026 => 103027)
--- trunk/Source/WebCore/ChangeLog 2011-12-16 06:02:55 UTC (rev 103026)
+++ trunk/Source/WebCore/ChangeLog 2011-12-16 06:40:32 UTC (rev 103027)
@@ -1,3 +1,12 @@
+2011-12-15 Tony Chang <t...@chromium.org>
+
+ Unreviewed, rollout r102825 because it didn't improve performance.
+ https://bugs.webkit.org/show_bug.cgi?id=74622
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::styleForElement):
+ (WebCore::CSSStyleSelector::pseudoStyleForElement):
+
2011-12-15 Ryosuke Niwa <rn...@webkit.org>
sizeof(RenderObject) is 32 instead of 24 on Windows
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (103026 => 103027)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-16 06:02:55 UTC (rev 103026)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-16 06:40:32 UTC (rev 103027)
@@ -1249,7 +1249,7 @@
// If resolveForRootDefault is true, style based on user agent style sheet only. This is used in media queries, where
// relative units are interpreted according to document root element style, styled only with UA stylesheet
-PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* element, RenderStyle* defaultParent, bool allowSharing, bool resolveForRootDefault, RenderRegion*)
+PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* element, RenderStyle* defaultParent, bool allowSharing, bool resolveForRootDefault, RenderRegion* regionForStyling)
{
// Once an element has a renderer, we don't try to destroy it, since otherwise the renderer
// will vanish if a style recalc happens during loading.
@@ -1265,6 +1265,7 @@
initElement(element);
initForStyleResolve(element, defaultParent);
+ initForRegionStyling(regionForStyling);
if (allowSharing) {
RenderStyle* sharedStyle = locateSharedStyle();
if (sharedStyle)
@@ -1420,7 +1421,7 @@
}
}
-PassRefPtr<RenderStyle> CSSStyleSelector::pseudoStyleForElement(PseudoId pseudo, Element* e, RenderStyle* parentStyle, RenderRegion*)
+PassRefPtr<RenderStyle> CSSStyleSelector::pseudoStyleForElement(PseudoId pseudo, Element* e, RenderStyle* parentStyle, RenderRegion* regionForStyling)
{
if (!e)
return 0;
@@ -1428,6 +1429,7 @@
initElement(e);
initForStyleResolve(e, parentStyle, pseudo);
+ initForRegionStyling(regionForStyling);
m_style = RenderStyle::create();
if (m_parentStyle)
