Changeset 143848 in webkit for trunk/Source/WebCore/rendering/RenderScrollbar.cpp

Timestamp:

Feb 23, 2013, 12:41:26 PM (12 years ago)

Author:

Dimitri Glazkov

Message:

Scrollbar style resolution arguments should not passed via statics.
​https://bugs.webkit.org/show_bug.cgi?id=110690

Use PseudoStyleRequest to pass scrollbar params for style resolve.

Reviewed by Eric Seidel.

No change in functionality, covered by existing tests.

• css/SelectorChecker.cpp:

(WebCore::SelectorChecker::match): Changed to use context params, rather than statics.
(WebCore::SelectorChecker::checkOne): Changed to pass context to checkScrollbarPseudoClass.
(WebCore::SelectorChecker::checkScrollbarPseudoClass): Changed to use context params, rather than statics.

• css/SelectorChecker.h:

(WebCore::SelectorChecker::SelectorCheckingContext::SelectorCheckingContext): Added scrollbar style args.
(SelectorCheckingContext): Ditto.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::collectMatchingRulesForList): Changed to use PseudoStyleRequest.
(WebCore::StyleResolver::State::initForStyleResolve): Ditto.
(WebCore::StyleResolver::pseudoStyleForElement): Ditto.
(WebCore::StyleResolver::ruleMatches): Ditto and added stuffing scrollbar style resolve args into SelectorCheckingContext.

• css/StyleResolver.h:

(PseudoStyleRequest): Added.
(State): Changed to hold and use PseudoStyleRequest instead of just PseudoId

• dom/Element.cpp:

(WebCore::Element::pseudoStyleCacheIsInvalid): Changed to use PseudoStyleRequest.

• page/FrameView.cpp: Ditto.

(WebCore::FrameView::updateScrollCorner): Ditto.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateScrollCornerStyle): Ditto.
(WebCore::RenderLayer::updateResizerStyle): Ditto.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::selectionBackgroundColor): Ditto.
(WebCore::RenderObject::selectionColor): Ditto.
(WebCore::firstLineStyleForCachedUncachedType): Ditto.
(WebCore::RenderObject::getCachedPseudoStyle): Ditto.
(WebCore::RenderObject::getUncachedPseudoStyle): Ditto.

• rendering/RenderObject.h:

(RenderObject): Ditto.

• rendering/RenderScrollbar.cpp:

(WebCore::RenderScrollbar::getScrollbarPseudoStyle): Ditto.

• rendering/RenderScrollbar.h:

(RenderScrollbar): Removed static members that are now obsolete.

File:

• trunk/Source/WebCore/rendering/RenderScrollbar.cpp (modified) (3 diffs)

trunk/Source/WebCore/rendering/RenderScrollbar.cpp

@@ -33 +33 @@
 #include "RenderScrollbarTheme.h"
 #include "StyleInheritedData.h"
+#include "StyleResolver.h"
 
 namespace WebCore {
@@ -146 +147 @@
 }
 
-static ScrollbarPart s_styleResolvePart;
-static RenderScrollbar* s_styleResolveScrollbar;
-
-RenderScrollbar* RenderScrollbar::scrollbarForStyleResolve()
-{
-    return s_styleResolveScrollbar;
-}
-
-ScrollbarPart RenderScrollbar::partForStyleResolve()
-{
-    return s_styleResolvePart;
-}
-
 PassRefPtr<RenderStyle> RenderScrollbar::getScrollbarPseudoStyle(ScrollbarPart partType, PseudoId pseudoId)
 {
@@ -164 +152 @@
         return 0;
 
-    s_styleResolvePart = partType;
-    s_styleResolveScrollbar = this;
-    RefPtr<RenderStyle> result = owningRenderer()->getUncachedPseudoStyle(pseudoId, owningRenderer()->style());
-    s_styleResolvePart = NoPart;
-    s_styleResolveScrollbar = 0;
-
+    RefPtr<RenderStyle> result = owningRenderer()->getUncachedPseudoStyle(PseudoStyleRequest(pseudoId, this, partType), owningRenderer()->style());
     // Scrollbars for root frames should always have background color 
     // unless explicitly specified as transparent. So we force it.