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); |
} |
} |