Fixed compilation issues

sailfishos · Sep 19, 2014 · a89fa9a · a89fa9a
1 parent d6f7342
commit a89fa9a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 26 deletions.
diff --git a/embedding/embedlite/utils/EmbedLiteXulAppInfo.cpp b/embedding/embedlite/utils/EmbedLiteXulAppInfo.cpp
@@ -195,3 +195,21 @@ EmbedLiteXulAppInfo::GetBrowserTabsRemoteAutostart(bool* aResult)
   *aResult = false;
   return NS_OK;
 }
+
+NS_IMETHODIMP
+EmbedLiteXulAppInfo::GetKeyboardMayHaveIME(bool* aResult)
+{
+  *aResult = true;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+EmbedLiteXulAppInfo::GetAccessibilityEnabled(bool* aResult)
+{
+#ifdef ACCESSIBILITY
+  *aResult = GetAccService() != nullptr;
+#else
+  *aResult = false;
+#endif
+  return NS_OK;
+}
diff --git a/gfx/layers/Compositor.cpp b/gfx/layers/Compositor.cpp
@@ -105,17 +105,10 @@ Compositor::DrawDiagnostics(DiagnosticFlags aFlags,
 }
 
 RenderTargetRect
-Compositor::ClipRectInLayersCoordinates(Layer* aLayer, RenderTargetIntRect aClip) const {
-  ContainerLayer* parent = aLayer->AsContainerLayer() ? aLayer->AsContainerLayer() : aLayer->GetParent();
-  while (!parent->UseIntermediateSurface() && parent->GetParent()) {
-    parent = parent->GetParent();
-  }
-
-  RenderTargetIntPoint renderTargetOffset = RenderTargetIntRect::FromUntyped(
-    parent->GetEffectiveVisibleRegion().GetBounds()).TopLeft();
-
+Compositor::ClipRectInLayersCoordinates(RenderTargetIntRect aClip) const {
   RenderTargetRect result;
-  aClip = aClip + renderTargetOffset;
+  aClip = aClip + RenderTargetIntPoint(GetCurrentRenderTarget()->GetOrigin().x,
+                                       GetCurrentRenderTarget()->GetOrigin().y);
   result = RenderTargetRect(aClip.x, aClip.y, aClip.width, aClip.height);
   return result;
 }

diff --git a/gfx/layers/Compositor.h b/gfx/layers/Compositor.h
@@ -494,7 +494,7 @@ class Compositor
   // at the OS level rather than in Gecko.
   // In addition, the clip rect needs to be offset by the rendering origin.
   // This becomes important if intermediate surfaces are used.
-  RenderTargetRect ClipRectInLayersCoordinates(Layer* aLayer, RenderTargetIntRect aClip) const;
+  RenderTargetRect ClipRectInLayersCoordinates(RenderTargetIntRect aClip) const;
 
 protected:
   void DrawDiagnosticsInternal(DiagnosticFlags aFlags,

diff --git a/gfx/layers/composite/ContainerLayerComposite.cpp b/gfx/layers/composite/ContainerLayerComposite.cpp
@@ -209,16 +209,6 @@ ContainerPrepare(ContainerT* aContainer,
       continue;
     }
 
-    RenderTargetRect quad = layerToRender->GetLayer()->
-      TransformRectToRenderTarget(LayerPixel::FromUntyped(
-        layerToRender->GetLayer()->GetEffectiveVisibleRegion().GetBounds()));
-
-    Compositor* compositor = aManager->GetCompositor();
-    if (!layerToRender->GetLayer()->AsContainerLayer() &&
-        !quad.Intersects(compositor->ClipRectInLayersCoordinates(layerToRender->GetLayer(), clipRect))) {
-      continue;
-    }
-
     CULLING_LOG("Preparing sublayer %p\n", layerToRender->GetLayer());
 
     nsIntRegion savedVisibleRegion;

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,9 +73,5 @@ 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;