Merge branch 'embedlite' into embedlite_upgrade

sailfishos · Jan 22, 2014 · 6f6272e · 6f6272e
2 parents 656c8bc + 2cd6d75
commit 6f6272e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/embedding/embedlite/PEmbedLiteView.ipdl b/embedding/embedlite/PEmbedLiteView.ipdl
@@ -15,6 +15,7 @@ using struct nsIntSize from "nsSize.h";
 using struct gfxPoint from "gfxPoint.h";
 using struct nsIntPoint from "nsPoint.h";
 using struct mozilla::layers::FrameMetrics from "FrameMetrics.h";
+using struct mozilla::layers::ScrollableLayerGuid from "FrameMetrics.h";
 using FrameMetrics::ViewID from "FrameMetrics.h";
 using nscolor from "nsColor.h";
 using class mozilla::WidgetKeyboardEvent from "ipc/nsGUIEventIPC.h";
@@ -53,10 +54,10 @@ child:
                int32_t aButton, int32_t aClickCount,
                int32_t aModifiers, bool aIgnoreRootScrollFrame);
 
-    InputDataTouchEvent(MultiTouchInput event);
+    InputDataTouchEvent(ScrollableLayerGuid aGuid, MultiTouchInput event);
     // We use a separate message for touchmove events only to apply
     // compression to them.
-    InputDataTouchMoveEvent(MultiTouchInput event) compress;
+    InputDataTouchMoveEvent(ScrollableLayerGuid aGuid, MultiTouchInput event) compress;
     AddMessageListener(nsCString name);
     RemoveMessageListener(nsCString name);
     AddMessageListeners(nsString [] messageNames);
@@ -82,7 +83,7 @@ parent:
 
     ZoomToRect(CSSRect aRect);
     async SetBackgroundColor(nscolor color);
-    ContentReceivedTouch(bool aPreventDefault);
+    ContentReceivedTouch(ScrollableLayerGuid aGuid, bool aPreventDefault);
     sync GetGLViewSize()
       returns (gfxSize aSize);
 

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
@@ -780,7 +780,7 @@ EmbedLiteViewThreadChild::RecvMouseEvent(const nsString& aType,
 }
 
 bool
-EmbedLiteViewThreadChild::RecvInputDataTouchEvent(const mozilla::MultiTouchInput& aData)
+EmbedLiteViewThreadChild::RecvInputDataTouchEvent(const ScrollableLayerGuid& aGuid, const mozilla::MultiTouchInput& aData)
 {
   WidgetTouchEvent localEvent;
   if (mHelper->ConvertMutiTouchInputToEvent(aData, localEvent)) {
@@ -789,7 +789,7 @@ EmbedLiteViewThreadChild::RecvInputDataTouchEvent(const mozilla::MultiTouchInput
     nsCOMPtr<nsPIDOMWindow> outerWindow = do_GetInterface(mWebNavigation);
     nsCOMPtr<nsPIDOMWindow> innerWindow = outerWindow->GetCurrentInnerWindow();
     if (innerWindow && innerWindow->HasTouchEventListeners()) {
-      SendContentReceivedTouch(nsIPresShell::gPreventMouseEvents);
+      SendContentReceivedTouch(aGuid, nsIPresShell::gPreventMouseEvents);
     }
     static bool sDispatchMouseEvents;
     static bool sDispatchMouseEventsCached = false;
@@ -815,9 +815,9 @@ EmbedLiteViewThreadChild::RecvInputDataTouchEvent(const mozilla::MultiTouchInput
 }
 
 bool
-EmbedLiteViewThreadChild::RecvInputDataTouchMoveEvent(const mozilla::MultiTouchInput& aData)
+EmbedLiteViewThreadChild::RecvInputDataTouchMoveEvent(const ScrollableLayerGuid& aGuid, const mozilla::MultiTouchInput& aData)
 {
-  return RecvInputDataTouchEvent(aData);
+  return RecvInputDataTouchEvent(aGuid, aData);
 }
 
 NS_IMETHODIMP

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h
@@ -91,8 +91,8 @@ class EmbedLiteViewThreadChild : public PEmbedLiteViewChild,
   virtual bool RecvHandleTextEvent(const nsString& commit, const nsString& preEdit);
   virtual bool RecvHandleKeyPressEvent(const int& domKeyCode, const int& gmodifiers, const int& charCode);
   virtual bool RecvHandleKeyReleaseEvent(const int& domKeyCode, const int& gmodifiers, const int& charCode);
-  virtual bool RecvInputDataTouchEvent(const mozilla::MultiTouchInput&);
-  virtual bool RecvInputDataTouchMoveEvent(const mozilla::MultiTouchInput&);
+  virtual bool RecvInputDataTouchEvent(const ScrollableLayerGuid& aGuid, const mozilla::MultiTouchInput&);
+  virtual bool RecvInputDataTouchMoveEvent(const ScrollableLayerGuid& aGuid, const mozilla::MultiTouchInput&);
 
   virtual bool
   RecvAddMessageListener(const nsCString&);

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp
@@ -281,10 +281,10 @@ EmbedLiteViewThreadParent::RecvZoomToRect(const CSSRect& aRect)
 }
 
 bool
-EmbedLiteViewThreadParent::RecvContentReceivedTouch(const bool& aPreventDefault)
+EmbedLiteViewThreadParent::RecvContentReceivedTouch(const ScrollableLayerGuid& aGuid, const bool& aPreventDefault)
 {
   if (mController) {
-    mController->GetManager()->ContentReceivedTouch(ScrollableLayerGuid(mRootLayerTreeId, 0, 0), aPreventDefault);
+    mController->GetManager()->ContentReceivedTouch(aGuid, aPreventDefault);
   }
   return true;
 }
@@ -569,9 +569,9 @@ EmbedLiteViewThreadParent::ReceiveInputEvent(const InputData& aEvent)
         translatedEvent.mTouches.AppendElement(newData);
       }
       if (multiTouchInput.mType == MultiTouchInput::MULTITOUCH_MOVE) {
-        unused << SendInputDataTouchMoveEvent(translatedEvent);
+        unused << SendInputDataTouchMoveEvent(guid, translatedEvent);
       } else {
-        unused << SendInputDataTouchEvent(translatedEvent);
+        unused << SendInputDataTouchEvent(guid, translatedEvent);
       }
     }
   }

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h
@@ -115,7 +115,7 @@ class EmbedLiteViewThreadParent : public PEmbedLiteViewParent,
   RecvUpdateZoomConstraints(const bool&, const float&, const float&);
   virtual bool RecvZoomToRect(const CSSRect& aRect);
   virtual bool RecvSetBackgroundColor(const nscolor& aColor);
-  virtual bool RecvContentReceivedTouch(const bool& aPreventDefault);
+  virtual bool RecvContentReceivedTouch(const ScrollableLayerGuid& aGuid, const bool& aPreventDefault);
 
   // IME
   virtual bool RecvGetInputContext(int32_t* aIMEEnabled,

diff --git a/embedding/embedlite/modules/EmbedLiteAppService.cpp b/embedding/embedlite/modules/EmbedLiteAppService.cpp
@@ -32,10 +32,15 @@
 #include "xpcprivate.h"
 #include "nsPIDOMWindow.h"
 #include "mozilla/AutoRestore.h"
+#include "FrameMetrics.h"
 
 using namespace mozilla;
 using namespace mozilla::embedlite;
 
+using namespace mozilla::gfx;
+using namespace mozilla::layers;
+using namespace mozilla::widget;
+
 namespace
 {
   class AsyncArrayRemove : public nsRunnable
@@ -280,7 +285,7 @@ EmbedLiteAppService::ContentReceivedTouch(uint32_t aWinId, bool aPreventDefault)
 {
   EmbedLiteViewThreadChild* view = sGetViewById(aWinId);
   NS_ENSURE_TRUE(view, NS_ERROR_FAILURE);
-  view->SendContentReceivedTouch(aPreventDefault);
+  view->SendContentReceivedTouch(ScrollableLayerGuid(0, 0, 0), aPreventDefault);
   return NS_OK;
 }
 

diff --git a/gfx/2d/Factory.cpp b/gfx/2d/Factory.cpp
@@ -337,6 +337,7 @@ Factory::CreateDrawTargetForData(BackendType aBackend,
       newTarget = new DrawTargetSkia();
       newTarget->Init(aData, aSize, aStride, aFormat);
       retVal = newTarget;
+      break;
     }
 #endif
 #ifdef XP_MACOSX