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

Timestamp:

Nov 4, 2013, 11:04:50 PM (12 years ago)

Author:

Alan Bujtas

Message:

Do not call setFrameRect on Widget unless its boundaries changed.
​https://bugs.webkit.org/show_bug.cgi?id=123781

Reviewed by Andreas Kling.

Call Widget:setFrameRect only when the frame's rect actually changes. It also
cleans up the related weak reference code a bit.

Covered by existing tests.

• rendering/RenderWidget.cpp:

(WebCore::RenderWidget::setWidgetGeometry):

File:

• trunk/Source/WebCore/rendering/RenderWidget.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -133 +133 @@
 
     WeakPtr<RenderWidget> weakThis = createWeakPtr();
-
-    // This call *may* cause this renderer to disappear from underneath...
-    m_widget->setFrameRect(newFrame);
-
+    // These calls *may* cause this renderer to disappear from underneath...
+    if (boundsChanged)
+        m_widget->setFrameRect(newFrame);
+    else if (clipChanged)
+        m_widget->clipRectChanged();
     // ...so we follow up with a sanity check.
     if (!weakThis)
         return true;
-
-    if (clipChanged && !boundsChanged) {
-        // This call *may* cause this renderer to disappear from underneath...
-        m_widget->clipRectChanged();
-
-        // ...so here's another sanity check.
-        if (!weakThis)
-            return true;
-    }
 
 #if USE(ACCELERATED_COMPOSITING)