Index: Source/core/page/FrameView.cpp |
diff --git a/Source/core/page/FrameView.cpp b/Source/core/page/FrameView.cpp |
index 8f0cb6b8f1cce3967d9ab878be73eeac73f4bdd7..910c62c297358fc2804826370cb1e3efadd8d04f 100644 |
--- a/Source/core/page/FrameView.cpp |
+++ b/Source/core/page/FrameView.cpp |
@@ -63,7 +63,6 @@ |
#include "core/rendering/RenderLayer.h" |
#include "core/rendering/RenderLayerBacking.h" |
#include "core/rendering/RenderLayerCompositor.h" |
-#include "core/rendering/RenderLazyBlock.h" |
#include "core/rendering/RenderPart.h" |
#include "core/rendering/RenderScrollbar.h" |
#include "core/rendering/RenderScrollbarPart.h" |
@@ -1035,8 +1034,6 @@ void FrameView::layout(bool allowSubtree) |
cache->postNotification(rootForThisLayout, AXObjectCache::AXLayoutComplete, true); |
updateAnnotatedRegions(); |
- layoutLazyBlocks(); |
- |
ASSERT(!rootForThisLayout->needsLayout()); |
updateCanBlitOnScrollRecursively(); |
@@ -1095,35 +1092,6 @@ void FrameView::layout(bool allowSubtree) |
frame()->page()->chrome().client()->layoutUpdated(frame()); |
} |
-void FrameView::layoutLazyBlocks() |
-{ |
- // FIXME: This infinite recursion protection would seem to break plugins |
- // doing things that require lazy blocks to layout. |
- if (m_nestedLayoutCount != 1) |
- return; |
- |
- if (!renderView()->firstLazyBlock()) |
- return; |
- |
- // First mark all lazy blocks as needing layout and perform another layout. |
- for (RenderLazyBlock* block = renderView()->firstLazyBlock(); block; block = block->next()) |
- block->markForNestedLayout(); |
- |
- layout(); |
- |
- // FIXME: This is pretty awful if you start nesting lazy blocks, we should |
- // signal to the nested blocks to avoid doing work until the second pass. |
- |
- // Next walk all lazy blocks and find nested ones, these need another layout |
- // since the first one would not have placed them correctly inside the viewport. |
- for (RenderLazyBlock* block = renderView()->firstLazyBlock(); block; block = block->next()) { |
- if (!block->isNested()) |
- continue; |
- block->setNeedsLayout(); |
- layout(); |
- } |
-} |
- |
RenderBox* FrameView::embeddedContentBox() const |
{ |
RenderView* renderView = this->renderView(); |
@@ -1582,8 +1550,6 @@ void FrameView::scrollPositionChanged() |
if (RenderView* renderView = this->renderView()) { |
if (renderView->usesCompositing()) |
renderView->compositor()->frameViewDidScroll(); |
- |
- renderView->markLazyBlocksForLayout(); |
} |
} |