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

Timestamp:

Oct 4, 2013, 8:50:42 PM (12 years ago)

Author:

[email protected]

Message:

CTTE: RenderScrollbar DOM owner is always an Element.
<​https://webkit.org/b/122348>

Reviewed by Antti Koivisto.

When RenderScrollbar is owned by a DOM node, it's always Element.
Tighten the code a bit with this knowledge.

Also marked the class FINAL and beat it with the OVERRIDE stick.

File:

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

trunk/Source/WebCore/rendering/RenderScrollbar.cpp

@@ -37 +37 @@
 namespace WebCore {
 
-PassRefPtr<Scrollbar> RenderScrollbar::createCustomScrollbar(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, Node* ownerNode, Frame* owningFrame)
-{
-    return adoptRef(new RenderScrollbar(scrollableArea, orientation, ownerNode, owningFrame));
-}
-
-RenderScrollbar::RenderScrollbar(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, Node* ownerNode, Frame* owningFrame)
+RefPtr<Scrollbar> RenderScrollbar::createCustomScrollbar(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, Element* ownerElement, Frame* owningFrame)
+{
+    return adoptRef(new RenderScrollbar(scrollableArea, orientation, ownerElement, owningFrame));
+}
+
+RenderScrollbar::RenderScrollbar(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, Element* ownerElement, Frame* owningFrame)
     : Scrollbar(scrollableArea, orientation, RegularScrollbar, RenderScrollbarTheme::renderScrollbarTheme())
-    , m_owner(ownerNode)
+    , m_ownerElement(ownerElement)
     , m_owningFrame(owningFrame)
 {
-    ASSERT(ownerNode || owningFrame);
+    ASSERT(ownerElement || owningFrame);
 
     // FIXME: We need to do this because RenderScrollbar::styleChanged is called as soon as the scrollbar is created.
@@ -86 +86 @@
         return currentRenderer;
     }
-    return m_owner && m_owner->renderer() ? m_owner->renderer()->enclosingBox() : 0;
+    ASSERT(m_ownerElement);
+    return m_ownerElement->renderer() ? m_ownerElement->renderer()->enclosingBox() : nullptr;
 }