Changeset 154546 in webkit for trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp

Timestamp:

Aug 24, 2013, 9:33:15 AM (12 years ago)

Author:

[email protected]

Message:

RenderObject::view() should return a reference.
<​https://webkit.org/b/120247>

Reviewed by Antti Koivisto.

Now that the lifetime and accessibility characteristics of RenderView are well-defined,
we can make RenderObject::view() return a reference, exposing a plethora of unnecessary
null checks.

File:

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

trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp

@@ -100 +100 @@
     if (!m_scrollbar->owningRenderer())
         return;
-    RenderView* renderView = view();
+    RenderView* renderView = &view();
     // FIXME: We are querying layout information but nothing guarantees that it's up-to-date, especially since we are called at style change.
     // FIXME: Querying the style's border information doesn't work on table cells with collapsing borders.
@@ -118 +118 @@
     if (!m_scrollbar->owningRenderer())
         return;
-    RenderView* renderView = view();
+    RenderView* renderView = &view();
     // FIXME: We are querying layout information but nothing guarantees that it's up-to-date, especially since we are called at style change.
     // FIXME: Querying the style's border information doesn't work on table cells with collapsing borders.
@@ -164 +164 @@
         m_scrollbar->theme()->invalidatePart(m_scrollbar, m_part);
     else {
-        if (view()->frameView().isFrameViewScrollCorner(this)) {
-            view()->frameView().invalidateScrollCorner(view()->frameView().scrollCornerRect());
+        if (view().frameView().isFrameViewScrollCorner(this)) {
+            view().frameView().invalidateScrollCorner(view().frameView().scrollCornerRect());
             return;
         }