Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(703)

Unified Diff: Source/core/frame/FrameView.cpp

Issue 235323005: Revert of Optimize repaint on FrameView resize (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 4e719fadf1885786b6d23ca9d7aecd67e5b6e49c..2c6accbb6a20ab13c3d12ef1b5b88c3a9eff3624 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -888,6 +888,7 @@ void FrameView::layout(bool allowSubtree)
return;
}
+ bool shouldDoFullLayout = false;
FontCachePurgePreventer fontCachePurgePreventer;
RenderLayer* layer;
{
@@ -913,7 +914,7 @@ void FrameView::layout(bool allowSubtree)
ScrollbarMode vMode;
calculateScrollbarModesForLayoutAndSetViewportRenderer(hMode, vMode);
- bool shouldDoFullRepaint = !inSubtreeLayout && (m_firstLayout || toRenderView(rootForThisLayout)->document().printing());
+ shouldDoFullLayout = !inSubtreeLayout && (m_firstLayout || toRenderView(rootForThisLayout)->document().printing());
if (!inSubtreeLayout) {
// Now set our scrollbar state for the layout.
@@ -946,15 +947,7 @@ void FrameView::layout(bool allowSubtree)
m_size = LayoutSize(layoutSize().width(), layoutSize().height());
if (oldSize != m_size) {
- // It's hard to predict here which of full repaint or per-descendant repaint costs less.
- // For vertical writing mode or width change, it's more likely that per-descendant repaint
- // eventually turns out to be full repaint but with the cost to handle layout states and
- // discrete repaint rects, so marking full repaint here is more likely to cost less.
- // For height only changes, per-descendant repaint is more likely to avoid unnecessary
- // full repaints.
- if (!renderView()->style()->isHorizontalWritingMode() || oldSize.width() != m_size.width())
- shouldDoFullRepaint = true;
-
+ shouldDoFullLayout = true;
if (!m_firstLayout) {
RenderBox* rootRenderer = document->documentElement() ? document->documentElement()->renderBox() : 0;
RenderBox* bodyRenderer = rootRenderer && document->body() ? document->body()->renderBox() : 0;
@@ -970,7 +963,7 @@ void FrameView::layout(bool allowSubtree)
// We need to set m_doFullRepaint before triggering layout as RenderObject::checkForRepaint
// checks the boolean to disable local repaints.
- m_doFullRepaint |= shouldDoFullRepaint;
+ m_doFullRepaint |= shouldDoFullLayout;
performLayout(rootForThisLayout, inSubtreeLayout);
@@ -1739,10 +1732,7 @@ void FrameView::contentsResized()
}
ScrollView::contentsResized();
- if (RenderView* renderView = this->renderView()) {
- // Don't directly repaint layer in setNeedsLayout. We'll handle repaint in layout().
- renderView->setNeedsLayout(MarkContainingBlockChain, 0, DontRepaintLayer);
- }
+ setNeedsLayout();
}
void FrameView::scrollbarExistenceDidChange()
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698