Initialize content listeners with frame metrics as soon as they are k…

…nown
sailfishos · Apr 10, 2014 · 7f02150 · 7f02150
1 parent eb64581
commit 7f02150
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
@@ -594,10 +594,7 @@ EmbedLiteViewThreadChild::RecvUpdateFrame(const FrameMetrics& aFrameMetrics)
     mViewResized = false;
   }
 
-
-  for (unsigned int i = 0; i < mControllerListeners.Length(); i++) {
-    mControllerListeners[i]->RequestContentRepaint(metrics);
-  }
+  RelayFrameMetrics(metrics);
 
   bool ret = true;
   if (sHandleDefaultAZPC.viewport) {
@@ -607,6 +604,14 @@ EmbedLiteViewThreadChild::RecvUpdateFrame(const FrameMetrics& aFrameMetrics)
   return ret;
 }
 
+void
+EmbedLiteViewThreadChild::RelayFrameMetrics(const FrameMetrics& aFrameMetrics)
+{
+  for (unsigned int i = 0; i < mControllerListeners.Length(); i++) {
+    mControllerListeners[i]->RequestContentRepaint(aFrameMetrics);
+  }
+}
+
 bool
 EmbedLiteViewThreadChild::RecvHandleDoubleTap(const nsIntPoint& aPoint)
 {

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h
@@ -120,6 +120,10 @@ class EmbedLiteViewThreadChild : public PEmbedLiteViewChild,
   friend class EmbedLiteAppService;
   friend class EmbedLiteAppThreadChild;
 
+  /**
+   * Relay given frame metrics to listeners subscribed via EmbedLiteAppService
+   */
+  void RelayFrameMetrics(const mozilla::layers::FrameMetrics& aFrameMetrics);
   void InitGeckoWindow(const uint32_t& parentId);
   EmbedLiteAppThreadChild* AppChild();
   void InitEvent(WidgetGUIEvent& event, nsIntPoint* aPoint = nullptr);

diff --git a/embedding/embedlite/utils/TabChildHelper.cpp b/embedding/embedlite/utils/TabChildHelper.cpp
@@ -240,6 +240,8 @@ TabChildHelper::Observe(nsISupports* aSubject,
           utils->SetResolution(mLastRootMetrics.mResolution.scale,
                                mLastRootMetrics.mResolution.scale);
           HandlePossibleViewportChange();
+          // Relay frame metrics to subscribed listeners
+          mView->RelayFrameMetrics(mLastRootMetrics);
         }
       }
 
@@ -265,6 +267,8 @@ TabChildHelper::HandleEvent(nsIDOMEvent* aEvent)
     // This meta data may or may not have been a meta viewport tag. If it was,
     // we should handle it immediately.
     HandlePossibleViewportChange();
+    // Relay frame metrics to subscribed listeners
+    mView->RelayFrameMetrics(mLastRootMetrics);
   }
 
   return NS_OK;