Changeset 14658 in webkit

Timestamp:

May 31, 2006 10:56:54 PM (18 years ago)

Author:

adele

Message:

Reviewed by Hyatt.

• fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=8969 REGRESSION: typing in textfield repaints whole web page at gamefaqs.com

No test possible (no functionality change)

• dom/Document.cpp: (WebCore::Document::updateLayout): Changed to ensure that pending subtree layouts are performed too.
• page/Frame.cpp: (WebCore::Frame::forceLayout): Force a full layout.
• page/FrameView.cpp: (WebCore::FrameViewPrivate::reset): (WebCore::FrameView::layout): Changed to relayout only the subtree rooted at d->layoutRoot if it's non-zero and allowSubtree is true. (WebCore::FrameView::scheduleRelayout): Change pending subtree relayout into normal relayout by clearing d->layoutRoot and propagating needsLayout to the root. (WebCore::FrameView::scheduleRelayoutOfSubtree): Added.
• page/FrameView.h:
• rendering/RenderObject.cpp: (WebCore::RenderObject::markContainingBlocksForLayout): Added scheduleRelayout parameter. FrameView passes false to force marking all the way to the root when turning a pending subtree relayout into a full relayout. Otherwise, marking stops at the first textField (or at the root) and relayout of the last object reached is scheduled. (WebCore::RenderObject::scheduleRelayout):
• rendering/RenderObject.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• page/Frame.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (12 diffs)
• page/FrameView.h (modified) (2 diffs)
• rendering/RenderObject.cpp (modified) (4 diffs)
• rendering/RenderObject.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-05-31  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed by Hyatt.
+
+        - fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=8969
+          REGRESSION: typing in textfield repaints whole web page at gamefaqs.com
+
+        No test possible (no functionality change)
+
+        * dom/Document.cpp:
+        (WebCore::Document::updateLayout): Changed to ensure that pending subtree
+        layouts are performed too.
+        * page/Frame.cpp:
+        (WebCore::Frame::forceLayout): Force a full layout.
+        * page/FrameView.cpp:
+        (WebCore::FrameViewPrivate::reset):
+        (WebCore::FrameView::layout): Changed to relayout only the subtree rooted
+        at d->layoutRoot if it's non-zero and allowSubtree is true.
+        (WebCore::FrameView::scheduleRelayout): Change pending subtree relayout into
+        normal relayout by clearing d->layoutRoot and propagating needsLayout to the
+        root. 
+        (WebCore::FrameView::scheduleRelayoutOfSubtree): Added.
+        * page/FrameView.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::markContainingBlocksForLayout): Added scheduleRelayout
+        parameter. FrameView passes false to force marking all the way to the root
+        when turning a pending subtree relayout into a full relayout. Otherwise,
+        marking stops at the first textField (or at the root) and
+        relayout of the last object reached is scheduled.
+        (WebCore::RenderObject::scheduleRelayout):
+        * rendering/RenderObject.h:
+
 2006-05-31  Sam Weinig  <sam.weinig@gmail.com>
 

trunk/WebCore/dom/Document.cpp

@@ -886 +886 @@
 
     // Only do a layout if changes have occurred that make it necessary.      
-    if (m_view && renderer() && renderer()->needsLayout())
+    if (m_view && renderer() && (m_view->layoutPending() || renderer()->needsLayout()))
         m_view->layout();
 }

trunk/WebCore/page/Frame.cpp

@@ -2989 +2989 @@
     FrameView *v = d->m_view.get();
     if (v) {
-        v->layout();
+        v->layout(false);
         // We cannot unschedule a pending relayout, since the force can be called with
         // a tiny rectangle from a drawRect update.  By unscheduling we in effect

trunk/WebCore/page/FrameView.cpp

@@ -87 +87 @@
         scrollingSelf = false;
         layoutTimer.stop();
+        layoutRoot = 0;
         delayedLayout = false;
         mousePressed = false;
@@ -123 +124 @@
     Timer<FrameView> layoutTimer;
     bool delayedLayout;
+    RefPtr<Node> layoutRoot;
     
     bool layoutSchedulingEnabled;
@@ -299 +301 @@
 }
 
-void FrameView::layout()
+void FrameView::layout(bool allowSubtree)
 {
     if (d->layoutSuppressed)
@@ -314 +316 @@
     }
 
+    if (!allowSubtree && d->layoutRoot) {
+        if (d->layoutRoot->renderer())
+            d->layoutRoot->renderer()->markContainingBlocksForLayout(false);
+        d->layoutRoot = 0;
+    }
+
+    bool subtree = d->layoutRoot;
     Document* document = m_frame->document();
     if (!document) {
@@ -321 +330 @@
     }
 
+    Node* rootNode = subtree ? d->layoutRoot.get() : document;
     d->layoutSchedulingEnabled = false;
 
@@ -328 +338 @@
         document->recalcStyle();
 
-    RenderView* root = static_cast<RenderView*>(document->renderer());
+    RenderObject* root = rootNode->renderer();
     if (!root) {
         // FIXME: Do we need to set m_size here?
@@ -338 +348 @@
     ScrollBarMode vMode = d->vmode;
     
-    RenderObject* rootRenderer = document->documentElement() ? document->documentElement()->renderer() : 0;
-    if (document->isHTMLDocument()) {
-        Node *body = static_cast<HTMLDocument*>(document)->body();
-        if (body && body->renderer()) {
-            if (body->hasTagName(framesetTag)) {
-                body->renderer()->setNeedsLayout(true);
-                vMode = ScrollBarAlwaysOff;
-                hMode = ScrollBarAlwaysOff;
+    if (!subtree) {
+        Document* document = static_cast<Document*>(rootNode);
+        RenderObject* rootRenderer = document->documentElement() ? document->documentElement()->renderer() : 0;
+        if (document->isHTMLDocument()) {
+            Node *body = static_cast<HTMLDocument*>(document)->body();
+            if (body && body->renderer()) {
+                if (body->hasTagName(framesetTag)) {
+                    body->renderer()->setNeedsLayout(true);
+                    vMode = ScrollBarAlwaysOff;
+                    hMode = ScrollBarAlwaysOff;
+                } else if (body->hasTagName(bodyTag)) {
+                    RenderObject* o = (rootRenderer->style()->overflow() == OVISIBLE) ? body->renderer() : rootRenderer;
+                    applyOverflowToViewport(o, hMode, vMode); // Only applies to HTML UAs, not to XML/XHTML UAs
+                }
             }
-            else if (body->hasTagName(bodyTag)) {
-                RenderObject* o = (rootRenderer->style()->overflow() == OVISIBLE) ? body->renderer() : rootRenderer;
-                applyOverflowToViewport(o, hMode, vMode); // Only applies to HTML UAs, not to XML/XHTML UAs
-            }
-        }
-    }
-    else if (rootRenderer)
-        applyOverflowToViewport(rootRenderer, hMode, vMode); // XML/XHTML UAs use the root element.
-
+        } else if (rootRenderer)
+            applyOverflowToViewport(rootRenderer, hMode, vMode); // XML/XHTML UAs use the root element.
 #if INSTRUMENT_LAYOUT_SCHEDULING
-    if (d->firstLayout && !document->ownerElement())
-        printf("Elapsed time before first layout: %d\n", document->elapsedTime());
+        if (d->firstLayout && !document->ownerElement())
+            printf("Elapsed time before first layout: %d\n", document->elapsedTime());
 #endif
-
-    d->doFullRepaint = d->firstLayout || root->printingMode();
+    }
+
+    d->doFullRepaint = !subtree && (d->firstLayout || static_cast<RenderView*>(root)->printingMode());
     if (d->repaintRects)
         d->repaintRects->clear();
 
-    // Now set our scrollbar state for the layout.
-    ScrollBarMode currentHMode = hScrollBarMode();
-    ScrollBarMode currentVMode = vScrollBarMode();
-
     bool didFirstLayout = false;
-    if (d->firstLayout || (hMode != currentHMode || vMode != currentVMode)) {
-        suppressScrollBars(true);
-        if (d->firstLayout) {
-            d->firstLayout = false;
-            didFirstLayout = true;
+    if (!subtree) {
+        // Now set our scrollbar state for the layout.
+        ScrollBarMode currentHMode = hScrollBarMode();
+        ScrollBarMode currentVMode = vScrollBarMode();
+
+        if (d->firstLayout || (hMode != currentHMode || vMode != currentVMode)) {
+            suppressScrollBars(true);
+            if (d->firstLayout) {
+                d->firstLayout = false;
+                didFirstLayout = true;
+                
+                // Set the initial vMode to AlwaysOn if we're auto.
+                if (vMode == ScrollBarAuto)
+                    ScrollView::setVScrollBarMode(ScrollBarAlwaysOn); // This causes a vertical scrollbar to appear.
+                // Set the initial hMode to AlwaysOff if we're auto.
+                if (hMode == ScrollBarAuto)
+                    ScrollView::setHScrollBarMode(ScrollBarAlwaysOff); // This causes a horizontal scrollbar to disappear.
+            }
             
-            // Set the initial vMode to AlwaysOn if we're auto.
-            if (vMode == ScrollBarAuto)
-                ScrollView::setVScrollBarMode(ScrollBarAlwaysOn); // This causes a vertical scrollbar to appear.
-            // Set the initial hMode to AlwaysOff if we're auto.
-            if (hMode == ScrollBarAuto)
-                ScrollView::setHScrollBarMode(ScrollBarAlwaysOff); // This causes a horizontal scrollbar to disappear.
+            if (hMode == vMode)
+                ScrollView::setScrollBarsMode(hMode);
+            else {
+                ScrollView::setHScrollBarMode(hMode);
+                ScrollView::setVScrollBarMode(vMode);
+            }
+
+            suppressScrollBars(false, true);
         }
-        
-        if (hMode == vMode)
-            ScrollView::setScrollBarsMode(hMode);
-        else {
-            ScrollView::setHScrollBarMode(hMode);
-            ScrollView::setVScrollBarMode(vMode);
-        }
-
-        suppressScrollBars(false, true);
-    }
-
-    IntSize oldSize = m_size;
-
-    m_size = IntSize(visibleWidth(), visibleHeight());
-
-    if (oldSize != m_size)
-        d->doFullRepaint = true;
-    
-    RenderLayer* layer = root->layer();
+
+        IntSize oldSize = m_size;
+
+        m_size = IntSize(visibleWidth(), visibleHeight());
+
+        if (oldSize != m_size)
+            d->doFullRepaint = true;
+    }
+    
+    RenderLayer* layer = root->enclosingLayer();
      
     if (!d->doFullRepaint) {
@@ -408 +420 @@
     }
 
+    if (subtree) {
+        if (root->recalcMinMax())
+            root->recalcMinMaxWidths();
+    }
     root->layout();
+    d->layoutRoot = 0;
 
     m_frame->invalidateSelection();
@@ -415 +432 @@
     d->layoutSuppressed = false;
 
-    if (!root->printingMode())
+    if (!subtree && !static_cast<RenderView*>(root)->printingMode())
         resizeContents(layer->width(), layer->height());
 
@@ -422 +439 @@
 
     // We update our widget positions right after doing a layout.
-    root->updateWidgetPositions();
+    if (!subtree)
+        static_cast<RenderView*>(root)->updateWidgetPositions();
     
     if (d->repaintRects && !d->repaintRects->isEmpty()) {
@@ -1066 +1084 @@
 void FrameView::scheduleRelayout()
 {
+    if (d->layoutRoot) {
+        if (d->layoutRoot->renderer())
+            d->layoutRoot->renderer()->markContainingBlocksForLayout(false);
+        d->layoutRoot = 0;
+    }
     if (!d->layoutSchedulingEnabled)
         return;
@@ -1088 +1111 @@
 }
 
+void FrameView::scheduleRelayoutOfSubtree(Node* n)
+{
+    if (!d->layoutSchedulingEnabled || m_frame->document() && m_frame->document()->renderer() && m_frame->document()->renderer()->needsLayout()) {
+        if (n->renderer())
+            n->renderer()->markContainingBlocksForLayout(false);
+        return;
+    }
+
+    if (layoutPending()) {
+        if (d->layoutRoot != n) {
+            // Just do a full relayout
+            if (d->layoutRoot && d->layoutRoot->renderer())
+                d->layoutRoot->renderer()->markContainingBlocksForLayout(false);
+            d->layoutRoot = 0;
+            if (n->renderer())
+                n->renderer()->markContainingBlocksForLayout(false);
+        }
+    } else {
+        int delay = m_frame->document()->minimumLayoutDelay();
+        d->layoutRoot = n;
+        d->delayedLayout = delay != 0;
+        d->layoutTimer.startOneShot(delay * 0.001);
+    }
+}
+
 bool FrameView::layoutPending()
 {

trunk/WebCore/page/FrameView.h

@@ -116 +116 @@
     void print();
 
-    void layout();
+    void layout(bool allowSubtree = true);
 
     bool inLayout() const;
@@ -153 +153 @@
     
     void scheduleRelayout();
+    void scheduleRelayoutOfSubtree(Node*);
     void unscheduleRelayout();
     bool haveDelayedLayoutScheduled();

trunk/WebCore/rendering/RenderObject.cpp

@@ -690 +690 @@
 }
 
-void RenderObject::markContainingBlocksForLayout()
+void RenderObject::markContainingBlocksForLayout(bool scheduleRelayout)
 {
     RenderObject *o = container();
@@ -700 +700 @@
                 return;
             o->m_posChildNeedsLayout = true;
-        }
-        else {
+        } else {
             if (o->m_normalChildNeedsLayout)
                 return;
@@ -708 +707 @@
 
         last = o;
+        if (scheduleRelayout && last->isTextField())
+            break;
         o = o->container();
     }
 
-    last->scheduleRelayout();
+    if (scheduleRelayout)
+        last->scheduleRelayout();
 }
 
@@ -2560 +2562 @@
 void RenderObject::scheduleRelayout()
 {
-    if (!isRenderView())
-        return;
-    FrameView *view = static_cast<RenderView *>(this)->frameView();
-    if (view)
-        view->scheduleRelayout();
+     if (isRenderView()) {
+         FrameView* view = static_cast<RenderView*>(this)->frameView();
+         if (view)
+             view->scheduleRelayout();
+     } else {
+         FrameView* v = view() ? view()->frameView() : 0;
+         if (v)
+             v->scheduleRelayoutOfSubtree(node());
+     }
 }
 

trunk/WebCore/rendering/RenderObject.h

@@ -340 +340 @@
 
     virtual void markAllDescendantsWithFloatsForLayout(RenderObject* floatToRemove = 0);
-    void markContainingBlocksForLayout();
+    void markContainingBlocksForLayout(bool scheduleRelayout = true);
     void setNeedsLayout(bool b, bool markParents = true);
     void setChildNeedsLayout(bool b, bool markParents = true);