Fixed build issues

sailfishos · Sep 27, 2014 · fe57fec · fe57fec
1 parent a4e8ddc
commit fe57fec
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git a/embedding/embedlite/tests/Makefile.in b/embedding/embedlite/tests/Makefile.in
@@ -10,10 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES += -DXPCOM_GLUE
-# move me to common, when we link with common library
-STL_FLAGS=
-
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
 
 ifeq (1 ,$(MOZ_X11))

diff --git a/embedding/embedlite/tests/embedLiteViewInitTest.cpp b/embedding/embedlite/tests/embedLiteViewInitTest.cpp
@@ -20,6 +20,8 @@
 #endif /* MOZ_X11 */
 #endif
 
+#include "mozilla/mozalloc.h"
+
 using namespace mozilla::embedlite;
 
 static bool sDoExit = getenv("NORMAL_EXIT");

diff --git a/embedding/embedlite/utils/TabChildHelper.cpp b/embedding/embedlite/utils/TabChildHelper.cpp
@@ -445,13 +445,7 @@ TabChildHelper::ConvertMutiTouchInputToEvent(const mozilla::MultiTouchInput& aDa
 
   aEvent.touches.SetCapacity(aData.mTouches.Length());
   for (uint32_t i = 0; i < aData.mTouches.Length(); ++i) {
-    const SingleTouchData& data = aData.mTouches[i];
-    nsRefPtr<Touch> t = new Touch(data.mIdentifier,
-                                  nsIntPoint(data.mScreenPoint.x, data.mScreenPoint.y),
-                                  nsIntPoint(data.mRadius.width, data.mRadius.height),
-                                  data.mRotationAngle,
-                                  data.mForce);
-    aEvent.touches.AppendElement(t);
+    aEvent.touches.AppendElement(aData.mTouches[i].ToNewDOMTouch());
   }
 
   return true;

diff --git a/ipc/chromium/src/base/message_loop.cc b/ipc/chromium/src/base/message_loop.cc
@@ -98,7 +98,7 @@ MessageLoop::MessageLoop(base::MessagePump* messagePump)
       next_sequence_num_(0)
 {
   DCHECK(!current()) << "should only have one message loop per thread";
-  lazy_tls_ptr.Pointer()->Set(this);
+  get_tls_ptr().Set(this);
   pump_ = messagePump;
 }
 

diff --git a/ipc/chromium/src/base/message_pump_qt.cc b/ipc/chromium/src/base/message_pump_qt.cc
@@ -15,7 +15,6 @@
 #include <math.h>
 
 #include "base/eintr_wrapper.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/platform_thread.h"