Merge branch 'regress_7d604b16de7b24652e23788c221f511099d4d90b' into …

…embedlite Conflicts: content/media/moz.build embedding/embedlite/utils/EmbedLiteXulAppInfo.cpp gfx/layers/client/TextureClient.cpp
sailfishos · Sep 19, 2014 · 2a37433 · 2a37433
2 parents f538dc0 + 6752759
commit 2a37433
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/content/media/moz.build b/content/media/moz.build
@@ -176,7 +176,6 @@ UNIFIED_SOURCES += [
 SOURCES += [
     'NemoResourceHandler.cpp',
 ]
-
 if CONFIG['OS_TARGET'] == 'WINNT':
   SOURCES += [ 'ThreadPoolCOMListener.cpp' ]
 

diff --git a/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.cpp
@@ -77,7 +77,7 @@ EmbedLiteAppThreadChild::Init(MessageChannel* aParentChannel)
   Open(aParentChannel, mParentLoop, ipc::ChildSide);
   RecvSetBoolPref(nsDependentCString("layers.offmainthreadcomposition.enabled"), true);
 
-  nsresult rv = InitAppService();
+  mozilla::DebugOnly<nsresult> rv = InitAppService();
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 
   SendInitialized();

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp
@@ -599,8 +599,7 @@ EmbedLiteViewThreadParent::ReceiveInputEvent(const mozilla::InputData& aEvent)
         const SingleTouchData& data = multiTouchInput.mTouches[i];
         mController->GetManager()->TransformCoordinateToGecko(ScreenIntPoint(data.mScreenPoint.x, data.mScreenPoint.y), &lpt);
         SingleTouchData newData = multiTouchInput.mTouches[i];
-        newData.mScreenPoint.x = lpt.x;
-        newData.mScreenPoint.y = lpt.y;
+        newData.mScreenPoint = ScreenIntPoint(lpt.x, lpt.y);
         translatedEvent.mTouches.AppendElement(newData);
       }
       if (multiTouchInput.mType == MultiTouchInput::MULTITOUCH_MOVE) {

diff --git a/gfx/layers/client/TextureClient.cpp b/gfx/layers/client/TextureClient.cpp
@@ -41,7 +41,7 @@
 #include "mozilla/layers/GrallocTextureClient.h"
 #endif
 
-#if defined(MOZ_ANDROID_OMTC) || defined(USE_ANDROID_OMTC_HACKS)
+#if defined(MOZ_WIDGET_ANDROID) || defined(USE_ANDROID_OMTC_HACKS)
 #  include "gfxReusableImageSurfaceWrapper.h"
 #else
 #  include "gfxReusableSharedImageSurfaceWrapper.h"

diff --git a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc
@@ -15,7 +15,7 @@
 #if defined(WEBRTC_ARCH_X86_FAMILY) && defined(_MSC_VER)
 #include <intrin.h>
 #endif
-
+#include "droid-cpu-features.h"
 #include "webrtc/typedefs.h"
 
 // No CPU feature is available => straight C path.
@@ -73,5 +73,9 @@ uint64_t WebRtc_GetCPUFeaturesARM(void) {
 
 #endif
 
+uint64_t WebRtc_GetCPUFeaturesARM(void) {
+  return ANDROID_CPU_ARM_FEATURE_ARMv7 | ANDROID_CPU_ARM_FEATURE_VFPv3 | ANDROID_CPU_ARM_FEATURE_NEON;
+}
+
 WebRtc_CPUInfo WebRtc_GetCPUInfo = GetCPUInfo;
 WebRtc_CPUInfo WebRtc_GetCPUInfoNoASM = GetCPUInfoNoASM;