Changeset 155817 in webkit for trunk/Source/WebCore/rendering/RenderWidget.cpp

Timestamp:

Sep 15, 2013, 11:12:52 AM (12 years ago)

Author:

[email protected]

Message:

RenderWidget doesn't need to cache a FrameView pointer.
<​https://webkit.org/b/121158>

Reviewed by Antti Koivisto.

The FrameView can be found through RenderObject::view().frameView().
This way also gets you a reference, so no need for null-checking.

File:

• trunk/Source/WebCore/rendering/RenderWidget.cpp (modified) (4 diffs)

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -92 +92 @@
     : RenderReplaced(&element)
     , m_weakPtrFactory(this)
-    , m_widget(0)
-    , m_frameView(element.document().view())
 {
     setInline(false);
@@ -208 +206 @@
             }
         }
-        moveWidgetToParentSoon(m_widget.get(), m_frameView);
+        moveWidgetToParentSoon(m_widget.get(), &view().frameView());
     }
     // make sure the scrollbars are set correctly for restore
@@ -291 +289 @@
         paintOutline(paintInfo, LayoutRect(adjustedPaintOffset, size()));
 
-    if (!m_frameView || paintInfo.phase != PaintPhaseForeground)
+    if (paintInfo.phase != PaintPhaseForeground)
         return;
 
@@ -359 +357 @@
 IntRect RenderWidget::windowClipRect() const
 {
-    if (!m_frameView)
-        return IntRect();
-
-    return intersection(m_frameView->contentsToWindow(m_clipRect), m_frameView->windowClipRect());
+    return intersection(view().frameView().contentsToWindow(m_clipRect), view().frameView().windowClipRect());
 }