Fixed build issues

sailfishos · Jun 9, 2014 · bdcea94 · bdcea94
1 parent f0127eb
commit bdcea94
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/embedding/embedlite/EmbedLiteApp.cpp b/embedding/embedlite/EmbedLiteApp.cpp
@@ -55,7 +55,6 @@ EmbedLiteApp::EmbedLiteApp()
   , mRenderType(RENDER_AUTO)
   , mProfilePath(strdup("mozembed"))
   , mIsAsyncLoop(false)
-  , mIsCompositeInMainThread(true)
 {
   LOGT();
   sSingleton = this;
@@ -456,9 +455,6 @@ EmbedLiteApp::Initialized()
   if (mListener) {
     mListener->Initialized();
   }
-  if (mIsCompositeInMainThread) {
-    mozilla::layers::CompositorParent::StartUpWithExistingThread(MessageLoop::current(), PlatformThread::CurrentId());
-  }
 }
 
 } // namespace embedlite

diff --git a/embedding/embedlite/EmbedLiteApp.h b/embedding/embedlite/EmbedLiteApp.h
@@ -88,7 +88,7 @@ class EmbedLiteApp
   virtual void Stop();
 
   // if true then compositor will be started in separate own thread, and view->CompositorCreated notification will be called in non-main thread
-  virtual void SetCompositorInSeparateThread(bool aOwnThread) { mIsCompositeInMainThread = !aOwnThread; }
+  virtual void SetCompositorInSeparateThread(bool aOwnThread) { } // Deprecated
 
   // Create custom Event Message pump, alloc new object which must be destroyed in EmbedLiteAppListener::Destroyed, or later
   virtual EmbedLiteMessagePump* CreateEmbedLiteMessagePump(EmbedLiteMessagePumpListener* aListener);
@@ -168,7 +168,6 @@ class EmbedLiteApp
   RenderType mRenderType;
   char* mProfilePath;
   bool mIsAsyncLoop;
-  bool mIsCompositeInMainThread;
 };
 
 } // namespace embedlite

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp
@@ -560,7 +560,7 @@ EmbedLiteViewThreadParent::ReceiveInputEvent(const InputData& aEvent)
     if (aEvent.mInputType == MULTITOUCH_INPUT) {
       const MultiTouchInput& multiTouchInput = aEvent.AsMultiTouchInput();
       LayoutDeviceIntPoint lpt;
-      MultiTouchInput translatedEvent(multiTouchInput.mType, multiTouchInput.mTime, multiTouchInput.modifiers);
+      MultiTouchInput translatedEvent(multiTouchInput.mType, multiTouchInput.mTime, TimeStamp(), multiTouchInput.modifiers);
       for (uint32_t i = 0; i < multiTouchInput.mTouches.Length(); ++i) {
         const SingleTouchData& data = multiTouchInput.mTouches[i];
         mController->GetManager()->TransformCoordinateToGecko(ScreenIntPoint(data.mScreenPoint.x, data.mScreenPoint.y), &lpt);
@@ -615,7 +615,7 @@ void
 EmbedLiteViewThreadParent::MousePress(int x, int y, int mstime, unsigned int buttons, unsigned int modifiers)
 {
   LOGT("pt[%i,%i], t:%i, bt:%u, mod:%u", x, y, mstime, buttons, modifiers);
-  MultiTouchInput event(MultiTouchInput::MULTITOUCH_START, mstime, modifiers);
+  MultiTouchInput event(MultiTouchInput::MULTITOUCH_START, mstime, TimeStamp(), modifiers);
   event.mTouches.AppendElement(SingleTouchData(0,
                                                mozilla::ScreenIntPoint(x, y),
                                                mozilla::ScreenSize(1, 1),
@@ -631,7 +631,7 @@ void
 EmbedLiteViewThreadParent::MouseRelease(int x, int y, int mstime, unsigned int buttons, unsigned int modifiers)
 {
   LOGT("pt[%i,%i], t:%i, bt:%u, mod:%u", x, y, mstime, buttons, modifiers);
-  MultiTouchInput event(MultiTouchInput::MULTITOUCH_END, mstime, modifiers);
+  MultiTouchInput event(MultiTouchInput::MULTITOUCH_END, mstime, TimeStamp(), modifiers);
   event.mTouches.AppendElement(SingleTouchData(0,
                                                mozilla::ScreenIntPoint(x, y),
                                                mozilla::ScreenSize(1, 1),
@@ -647,7 +647,7 @@ void
 EmbedLiteViewThreadParent::MouseMove(int x, int y, int mstime, unsigned int buttons, unsigned int modifiers)
 {
   LOGT("pt[%i,%i], t:%i, bt:%u, mod:%u", x, y, mstime, buttons, modifiers);
-  MultiTouchInput event(MultiTouchInput::MULTITOUCH_MOVE, mstime, modifiers);
+  MultiTouchInput event(MultiTouchInput::MULTITOUCH_MOVE, mstime, TimeStamp(), modifiers);
   event.mTouches.AppendElement(SingleTouchData(0,
                                                mozilla::ScreenIntPoint(x, y),
                                                mozilla::ScreenSize(1, 1),

diff --git a/embedding/embedlite/utils/WindowCreator.cpp b/embedding/embedlite/utils/WindowCreator.cpp
@@ -33,6 +33,7 @@ WindowCreator::CreateChromeWindow2(nsIWebBrowserChrome* aParent,
                                    uint32_t aChromeFlags,
                                    uint32_t aContextFlags,
                                    nsIURI* aURI,
+                                   nsITabParent* aOpeningTab,
                                    bool* aCancel,
                                    nsIWebBrowserChrome* *_retval)
 {
@@ -93,5 +94,5 @@ WindowCreator::CreateChromeWindow(nsIWebBrowserChrome* aParent,
 {
   LOGNI();
   bool cancel;
-  return CreateChromeWindow2(aParent, aChromeFlags, 0, 0, &cancel, _retval);
+  return CreateChromeWindow2(aParent, aChromeFlags, 0, nullptr, nullptr, &cancel, _retval);
 }