Changeset 20385 in webkit

Timestamp:

Mar 22, 2007 2:13:13 AM (17 years ago)

Author:

hyatt

Message:

Minor refactoring and cleanup of the bridge calls that want to control layout settings on the RenderView.
Have the bridge talk through the FrameView instead of just asking for the RenderView directly.

Add an assert to help catch situations where the RenderView needs layout at paint time, since this is a known
catastrophic scenario that will (much of the time) result in a crash in RenderTableSection::paint.

Reviewed by aroben

• page/FrameView.cpp: (WebCore::FrameView::adjustViewSize): (WebCore::FrameView::needsLayout): (WebCore::FrameView::setNeedsLayout):
• page/FrameView.h:
• page/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge needsLayout]): (-[WebCoreFrameBridge setNeedsLayout]):
• rendering/RenderView.cpp: (WebCore::RenderView::paint):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (2 diffs)
• page/FrameView.h (modified) (1 diff)
• page/mac/WebCoreFrameBridge.mm (modified) (1 diff)
• rendering/RenderView.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-22  David Hyatt  <hyatt@apple.com>
+
+        Minor refactoring and cleanup of the bridge calls that want to control layout settings on the RenderView.
+        Have the bridge talk through the FrameView instead of just asking for the RenderView directly.
+
+        Add an assert to help catch situations where the RenderView needs layout at paint time, since this is a known
+        catastrophic scenario that will (much of the time) result in a crash in RenderTableSection::paint.
+
+        Reviewed by aroben
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::adjustViewSize):
+        (WebCore::FrameView::needsLayout):
+        (WebCore::FrameView::setNeedsLayout):
+        * page/FrameView.h:
+        * page/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge needsLayout]):
+        (-[WebCoreFrameBridge setNeedsLayout]):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::paint):
+
 2007-03-21  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/page/FrameView.cpp

@@ -218 +218 @@
 {
     ASSERT(m_frame->view() == this);
-    if (Document* document = m_frame->document()) {
-        RenderView* root = static_cast<RenderView*>(document->renderer());
-        if (!root)
-            return;
-        resizeContents(root->overflowWidth(), root->overflowHeight());
-    }
+    RenderView* root = static_cast<RenderView*>(m_frame->renderer());
+    if (!root)
+        return;
+    resizeContents(root->overflowWidth(), root->overflowHeight());
 }
 
@@ -698 +696 @@
 }
 
+bool FrameView::needsLayout() const
+{
+    return layoutPending();
+}
+
+void FrameView::setNeedsLayout()
+{
+    if (m_frame->renderer())
+        m_frame->renderer()->setNeedsLayout(true);
+}
+
 bool FrameView::haveDelayedLayoutScheduled()
 {

trunk/WebCore/page/FrameView.h

@@ -85 +85 @@
     int layoutCount() const;
 
+    // These two helper functions just pass through to the RenderView.
+    bool needsLayout() const;
+    void setNeedsLayout();
+
     bool needsFullRepaint() const;
     void repaintRectangle(const IntRect&, bool immediate);

trunk/WebCore/page/mac/WebCoreFrameBridge.mm

@@ -770 +770 @@
 - (BOOL)needsLayout
 {
-    FrameView* view = m_frame->view();
-    return view ? view->layoutPending() : false;
+    return m_frame->view() ? m_frame->view()->needsLayout() : false;
 }
 
 - (void)setNeedsLayout
 {
-    RenderObject *renderer = m_frame->renderer();
-    if (renderer)
-        renderer->setNeedsLayout(true);
+    if (m_frame->view())
+        m_frame->view()->setNeedsLayout();
 }
 

trunk/WebCore/rendering/RenderView.cpp

@@ -129 +129 @@
 void RenderView::paint(PaintInfo& paintInfo, int tx, int ty)
 {
+    // If we ever require layout but receive a paint anyway, something has gone horribly wrong.
+    ASSERT(!needsLayout());
+
     // Cache the print rect because the dirty rect could get changed during painting.
     if (printing())