Commit 3e6a2d71 authored by ap's avatar ap
Browse files

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):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15007 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c548c22a
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.
......
......@@ -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());
......
......@@ -117,7 +117,6 @@ public:
void layout(bool allowSubtree = true);
bool inLayout() const;
int layoutCount() const;
bool needsFullRepaint() const;
......
......@@ -98,8 +98,6 @@ void RenderView::calcMinMaxWidth()
void RenderView::layout()
{
KHTMLAssert(!frameView()->inLayout());
if (m_printingMode)
m_minWidth = m_width;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment