Don't recalculate viewport for wrong presShell

sailfishos · Jun 16, 2014 · 1d22249 · 1d22249
1 parent bdcea94
commit 1d22249
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
@@ -587,8 +587,10 @@ EmbedLiteViewThreadChild::RecvUpdateFrame(const FrameMetrics& aFrameMetrics)
     return true;
   }
 
-
-  if (mViewResized && mHelper->HandlePossibleViewportChange()) {
+  if (mViewResized &&
+      aFrameMetrics.mIsRoot &&
+      mHelper->mLastRootMetrics.mPresShellId == aFrameMetrics.mPresShellId &&
+      mHelper->HandlePossibleViewportChange()) {
     mViewResized = false;
   }