[viewport] Don't recalculate viewport until before-first-paint is emi…

…tted
sailfishos · Dec 15, 2014 · 9443ea2 · 9443ea2
1 parent 25a92e7
commit 9443ea2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
@@ -915,8 +915,11 @@ EmbedLiteViewThreadChild::RecvInputDataTouchMoveEvent(const ScrollableLayerGuid&
 }
 
 NS_IMETHODIMP
-EmbedLiteViewThreadChild::OnLocationChanged(const char* aLocation, bool aCanGoBack, bool aCanGoForward)
+EmbedLiteViewThreadChild::OnLocationChanged(const char* aLocation, bool aCanGoBack, bool aCanGoForward, bool aIsSameDocument)
 {
+  if (!aIsSameDocument) {
+    mHelper->mContentDocumentIsDisplayed = false;
+  }
   return SendOnLocationChanged(nsDependentCString(aLocation), aCanGoBack, aCanGoForward) ? NS_OK : NS_ERROR_FAILURE;
 }
 

diff --git a/embedding/embedlite/utils/WebBrowserChrome.cpp b/embedding/embedlite/utils/WebBrowserChrome.cpp
@@ -303,7 +303,9 @@ WebBrowserChrome::OnLocationChange(nsIWebProgress* aWebProgress,
   navigation->GetCanGoBack(&canGoBack);
   navigation->GetCanGoForward(&canGoForward);
 
-  mListener->OnLocationChanged(spec.get(), canGoBack, canGoForward);
+  bool isSameDocument = aFlags & nsIWebProgressListener::LOCATION_CHANGE_SAME_DOCUMENT;
+
+  mListener->OnLocationChanged(spec.get(), canGoBack, canGoForward, isSameDocument);
 
   // Keep track of hash changes
   mLocationHasChanged = slocation.Equals(mLastLocation);

diff --git a/embedding/embedlite/utils/nsIEmbedBrowserChromeListener.idl b/embedding/embedlite/utils/nsIEmbedBrowserChromeListener.idl
@@ -17,7 +17,8 @@
 [scriptable, uuid(ff88f95e-48d9-11e2-bca5-6b3dfc3f4672)]
 interface nsIEmbedBrowserChromeListener
 {
-    void onLocationChanged(in string aLocation, in boolean aCanGoBack, in boolean aCanGoForward);
+    void onLocationChanged(in string aLocation, in boolean aCanGoBack,
+                           in boolean aCanGoForward, in boolean aIsSameDocument);
     void onLoadStarted(in string aLocation);
     void onLoadFinished();
     void onLoadRedirect();