2006-06-24 Mitz Pettel <opendarwin.org@mitzpettel.com>
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Jun 2006 13:01:40 +0000 (13:01 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 24 Jun 2006 13:01:40 +0000 (13:01 +0000)
        Reviewed and landed by ap.

        - http://bugzilla.opendarwin.org/show_bug.cgi?id=9563
          Remove unused layoutSuppressed field and inLayout() method

        No test added because there is no change in functionality.

        * page/FrameView.cpp:
        (WebCore::FrameViewPrivate::reset):
        (WebCore::FrameView::layout):
        * page/FrameView.h:
        * rendering/RenderView.cpp:
        (WebCore::RenderView::layout):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15007 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/page/FrameView.cpp
WebCore/page/FrameView.h
WebCore/rendering/RenderView.cpp

index 35fe0f7250d163d0d0100b00f502a1f2dd422c5b..69d66e71d36f5c2a0cc63fb7db5a70c7621ad378 100644 (file)
@@ -1,3 +1,19 @@
+2006-06-24  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed and landed by ap.
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=9563
+          Remove unused layoutSuppressed field and inLayout() method
+
+        No test added because there is no change in functionality.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameViewPrivate::reset):
+        (WebCore::FrameView::layout):
+        * page/FrameView.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::layout):
+
 2006-06-24  Alexey Proskuryakov  <ap@nypop.com>
 
         Reviewed by Darin.
index f39573244948276acbdcd179c4a3b19f647a8022..d1af60a1539c08d4c881e004b116654deab674b5 100644 (file)
@@ -92,7 +92,6 @@ public:
         mousePressed = false;
         doFullRepaint = true;
         layoutSchedulingEnabled = true;
-        layoutSuppressed = false;
         layoutCount = 0;
         firstLayout = true;
         hoverTimer.stop();
@@ -128,7 +127,6 @@ public:
     RefPtr<Node> layoutRoot;
     
     bool layoutSchedulingEnabled;
-    bool layoutSuppressed;
     int layoutCount;
 
     bool firstLayout;
@@ -294,11 +292,6 @@ void FrameView::applyOverflowToViewport(RenderObject* o, ScrollBarMode& hMode, S
     }
 }
 
-bool FrameView::inLayout() const
-{
-    return d->layoutSuppressed;
-}
-
 int FrameView::layoutCount() const
 {
     return d->layoutCount;
@@ -321,9 +314,6 @@ void FrameView::addRepaintInfo(RenderObject* o, const IntRect& r)
 
 void FrameView::layout(bool allowSubtree)
 {
-    if (d->layoutSuppressed)
-        return;
-    
     d->layoutTimer.stop();
     d->delayedLayout = false;
 
@@ -449,7 +439,6 @@ void FrameView::layout(bool allowSubtree)
     m_frame->invalidateSelection();
    
     d->layoutSchedulingEnabled=true;
-    d->layoutSuppressed = false;
 
     if (!subtree && !static_cast<RenderView*>(root)->printingMode())
         resizeContents(layer->width(), layer->height());
index 01a23d5e2a884f63b5a839622db6de7befc16ab6..bc882ad83b2f4ccc764504d637fb8a6c58031b3c 100644 (file)
@@ -117,7 +117,6 @@ public:
 
     void layout(bool allowSubtree = true);
 
-    bool inLayout() const;
     int layoutCount() const;
 
     bool needsFullRepaint() const;
index fed9a3e3e0cd6d055dd1f620b43c5861a7895141..b8e927139a7fd361797d0db628c6b5b6a2ce3980 100644 (file)
@@ -98,8 +98,6 @@ void RenderView::calcMinMaxWidth()
 
 void RenderView::layout()
 {
-    KHTMLAssert(!frameView()->inLayout());
-    
     if (m_printingMode)
         m_minWidth = m_width;