Fixed embedlite branch compilation

sailfishos · May 19, 2015 · d972c78 · d972c78
1 parent 7a5ccc5
commit d972c78
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/embedding/embedlite/EmbedLiteView.h b/embedding/embedlite/EmbedLiteView.h
@@ -71,6 +71,8 @@ class EmbedLiteViewListener
   // Will be always called from the compositor thread.
   virtual void DrawOverlay(const nsIntRect& aRect) {}
 
+  // Some GL Context implementations require Platform GL context to be active and valid
+  virtual bool RequestCurrentGLContext() { return false; }
 };
 
 class EmbedLiteApp;

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp b/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp
@@ -68,7 +68,7 @@ EmbedLiteViewBaseParent::SetCompositor(EmbedLiteCompositorParent* aCompositor)
   UpdateScrollController();
   if (mCompositor) {
     if (mPendingRotation) {
-      mCompositor->SetScreenRotation(mRotation, mWorldTransform);
+      mCompositor->SetScreenRotation(mRotation);
       mPendingRotation = false;
     }
     mCompositor->SetSurfaceSize(mGLViewPortSize.width, mGLViewPortSize.height);

diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp
@@ -252,18 +252,18 @@ void EmbedLiteCompositorParent::SetScreenRotation(const mozilla::ScreenRotation
     switch (rotation) {
     case mozilla::ROTATION_90:
         // Pi / 2
-        rotationMartix.Rotate(M_PI_2l);
-        rotationMartix.Translate(0.0, -mLastViewSize.height);
+        rotationMartix.PreRotate(M_PI_2l);
+        rotationMartix.PreTranslate(0.0, -mLastViewSize.height);
         break;
     case mozilla::ROTATION_270:
         // 3 / 2 * Pi
-        rotationMartix.Rotate(M_PI_2l * 3);
-        rotationMartix.Translate(-mLastViewSize.width, 0.0);
+        rotationMartix.PreRotate(M_PI_2l * 3);
+        rotationMartix.PreTranslate(-mLastViewSize.width, 0.0);
         break;
     case mozilla::ROTATION_180:
         // Pi
-        rotationMartix.Rotate(M_PIl);
-        rotationMartix.Translate(-mLastViewSize.width, -mLastViewSize.height);
+        rotationMartix.PreRotate(M_PIl);
+        rotationMartix.PreTranslate(-mLastViewSize.width, -mLastViewSize.height);
         break;
     default:
         break;