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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 1380363005: Find a better place for setting Layout/Paint hook related flags. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 2ff804ebb0cef02fe89bcd33c78e41db630d25b3..fe889d4f9fb92f8fe078d49f546d9d80a5e741bc 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -3852,9 +3852,15 @@ void WebViewImpl::setSelectionColors(unsigned activeBackgroundColor,
void WebViewImpl::didCommitLoad(bool isNewNavigation, bool isNavigationWithinPage)
{
- if (isNewNavigation && !isNavigationWithinPage) {
- pageScaleConstraintsSet().setNeedsReset(true);
- m_pageImportanceSignals.onCommitLoad();
+ if (!isNavigationWithinPage) {
esprehn 2015/10/26 21:08:54 What does isNavigationWithinPage mean? Does that m
Alexander Semashko 2015/10/26 21:57:50 Both are in-page navigations, for sure. I'd say th
+ m_shouldDispatchFirstVisuallyNonEmptyLayout = true;
+ m_shouldDispatchFirstLayoutAfterFinishedParsing = true;
+ m_shouldDispatchFirstLayoutAfterFinishedLoading = true;
+
+ if (isNewNavigation) {
+ pageScaleConstraintsSet().setNeedsReset(true);
+ m_pageImportanceSignals.onCommitLoad();
+ }
}
// Give the visual viewport's scroll layer its initial size.
@@ -4138,9 +4144,6 @@ void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
// attempt to paint too early in the next page load.
m_layerTreeView->setDeferCommits(true);
m_layerTreeView->clearRootLayer();
- m_shouldDispatchFirstVisuallyNonEmptyLayout = true;
- m_shouldDispatchFirstLayoutAfterFinishedParsing = true;
- m_shouldDispatchFirstLayoutAfterFinishedLoading = true;
visualViewport.clearLayersForTreeView(m_layerTreeView);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698