Changeset 132398 in webkit

Timestamp:

Oct 24, 2012 2:07:02 PM (11 years ago)

Author:

fischman@chromium.org

Message:

call to setNeedsLayout during RenderVideo::paintReplaced
​https://bugs.webkit.org/show_bug.cgi?id=100265

Reviewed by Eric Carlson.

Removed unnecessary call and added new defensive guards to catch erroneous setNeedsLayout() calls
during paints earlier (so the offending calls are in the emitted stacktrace).

No new tests - new defensive checks are triggered by existing tests.

• page/FrameView.cpp:

(WebCore::FrameView::paintContents): forbid setNeedsLayout() during painting

• rendering/RenderObject.cpp:

(WebCore):
(WebCore::RenderObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope):
(WebCore::RenderObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope):

• rendering/RenderObject.h:

(RenderObject):
(SetLayoutNeededForbiddenScope): added helper class for forbidding setNeedsLayout() in a scope.

• rendering/RenderVideo.cpp:

(WebCore::RenderVideo::paintReplaced): drop the offending & unnecessary call to updatePlayer().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderVideo.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-24  Ami Fischman  <fischman@chromium.org>
+
+        call to setNeedsLayout during RenderVideo::paintReplaced
+        https://bugs.webkit.org/show_bug.cgi?id=100265
+
+        Reviewed by Eric Carlson.
+
+        Removed unnecessary call and added new defensive guards to catch erroneous setNeedsLayout() calls
+        during paints earlier (so the offending calls are in the emitted stacktrace).
+
+        No new tests - new defensive checks are triggered by existing tests.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::paintContents): forbid setNeedsLayout() during painting
+        * rendering/RenderObject.cpp:
+        (WebCore):
+        (WebCore::RenderObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope):
+        (WebCore::RenderObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope):
+        * rendering/RenderObject.h:
+        (RenderObject):
+        (SetLayoutNeededForbiddenScope): added helper class for forbidding setNeedsLayout() in a scope.
+        * rendering/RenderVideo.cpp:
+        (WebCore::RenderVideo::paintReplaced): drop the offending & unnecessary call to updatePlayer().
+
 2012-10-24  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -3243 +3243 @@
     RenderLayer* rootLayer = root->layer();
 
+#ifndef NDEBUG
+    RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(rootLayer->renderer());
+#endif
+
     rootLayer->paint(p, rect, m_paintBehavior, eltRenderer);
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -92 +92 @@
 #ifndef NDEBUG
 static void* baseOfRenderObjectBeingDeleted;
+
+RenderObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope(RenderObject* renderObject)
+    : m_renderObject(renderObject)
+    , m_preexistingForbidden(m_renderObject->isSetNeedsLayoutForbidden())
+{
+    m_renderObject->setNeedsLayoutIsForbidden(true);
+}
+
+RenderObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope()
+{
+    m_renderObject->setNeedsLayoutIsForbidden(m_preexistingForbidden);
+}
 #endif
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -249 +249 @@
     bool isSetNeedsLayoutForbidden() const { return m_setNeedsLayoutForbidden; }
     void setNeedsLayoutIsForbidden(bool flag) { m_setNeedsLayoutForbidden = flag; }
+
+    // Helper class forbidding calls to setNeedsLayout() during its lifetime.
+    class SetLayoutNeededForbiddenScope {
+    public:
+        explicit SetLayoutNeededForbiddenScope(RenderObject*);
+        ~SetLayoutNeededForbiddenScope();
+    private:
+        RenderObject* m_renderObject;
+        bool m_preexistingForbidden;
+    };
 #endif
 

trunk/Source/WebCore/rendering/RenderVideo.cpp

@@ -196 +196 @@
         page = frame->page();
 
-    if (!displayingPoster) {
-        if (!mediaPlayer) {
-            if (page && paintInfo.phase == PaintPhaseForeground)
-                page->addRelevantUnpaintedObject(this, visualOverflowRect());
-            return;
-        }
-        updatePlayer();
+    if (!displayingPoster && !mediaPlayer) {
+        if (page && paintInfo.phase == PaintPhaseForeground)
+            page->addRelevantUnpaintedObject(this, visualOverflowRect());
+        return;
     }