Drop old API

sailfishos · Jan 28, 2014 · 3178699 · 3178699
1 parent b166d4e
commit 3178699
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 26 deletions.
diff --git a/embedding/embedlite/EmbedLiteView.cpp b/embedding/embedlite/EmbedLiteView.cpp
@@ -333,14 +333,6 @@ EmbedLiteView::ScheduleRender()
   mViewImpl->ScheduleRender();
 }
 
-bool
-EmbedLiteView::ScrollBy(int aDX, int aDY, bool aDoOverflow)
-{
-  LOGT();
-  NS_ENSURE_TRUE(mViewImpl, false);
-  return mViewImpl->ScrollBy(aDX, aDY);
-}
-
 void
 EmbedLiteView::ReceiveInputEvent(const InputData& aEvent)
 {

diff --git a/embedding/embedlite/EmbedLiteView.h b/embedding/embedlite/EmbedLiteView.h
@@ -109,9 +109,6 @@ class EmbedLiteView
   // Setup renderable view size
   virtual void SetViewSize(int width, int height);
 
-  // Scroll/Zoom API
-  virtual bool ScrollBy(int aDX, int aDY, bool aDoOverflow = false);
-
   // Compositor Interface
   //   PNG Decoded data
   virtual char* GetImageAsURL(int aWidth = -1, int aHeight = -1);

diff --git a/embedding/embedlite/embedhelpers/EmbedLiteViewImplIface.h b/embedding/embedlite/embedhelpers/EmbedLiteViewImplIface.h
@@ -46,7 +46,6 @@ class EmbedLiteViewImplIface
     virtual void SetTransformation(float aScale, nsIntPoint aScrollOffset) {}
     virtual void ScheduleRender() {}
     virtual void SetClipping(nsIntRect aClipRect) {}
-    virtual bool ScrollBy(int aDX, int aDY, bool aDoOverflow = false) { return false; }
     virtual void ReceiveInputEvent(const InputData& aEvent) {}
     virtual void TextEvent(const char* composite, const char* preEdit) {}
     virtual void SendKeyPress(int domKeyCode, int gmodifiers, int charCode) {}

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp
@@ -50,8 +50,6 @@ EmbedLiteViewThreadParent::EmbedLiteViewThreadParent(const uint32_t& id, const u
   , mView(EmbedLiteApp::GetInstance()->GetViewByID(id))
   , mViewAPIDestroyed(false)
   , mCompositor(nullptr)
-  , mScrollOffset(0, 0)
-  , mLastScale(1.0f)
   , mInTouchProcess(false)
   , mUILoop(MessageLoop::current())
   , mLastIMEState(0)
@@ -472,15 +470,6 @@ EmbedLiteViewThreadParent::RenderGL()
   return false;
 }
 
-bool
-EmbedLiteViewThreadParent::ScrollBy(int aDX, int aDY, bool aDoOverflow)
-{
-  LOGT("d[%i,%i]", aDX, aDY);
-  mScrollOffset.MoveBy(-aDX, -aDY);
-
-  return true;
-}
-
 void
 EmbedLiteViewThreadParent::SetViewSize(int width, int height)
 {

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h
@@ -45,7 +45,6 @@ class EmbedLiteViewThreadParent : public PEmbedLiteViewParent,
   virtual void SetTransformation(float aScale, nsIntPoint aScrollOffset);
   virtual void ScheduleRender();
   virtual void UpdateScrollController();
-  virtual bool ScrollBy(int aDX, int aDY, bool aDoOverflow = false);
   virtual void MousePress(int x, int y, int mstime, unsigned int buttons, unsigned int modifiers);
   virtual void MouseRelease(int x, int y, int mstime, unsigned int buttons, unsigned int modifiers);
   virtual void MouseMove(int x, int y, int mstime, unsigned int buttons, unsigned int modifiers);
@@ -138,8 +137,6 @@ class EmbedLiteViewThreadParent : public PEmbedLiteViewParent,
   EmbedLiteView* mView;
   bool mViewAPIDestroyed;
   RefPtr<EmbedLiteCompositorParent> mCompositor;
-  gfx::Point mScrollOffset;
-  float mLastScale;
 
   ScreenIntSize mViewSize;
   gfxSize mGLViewPortSize;