[EFL] Remove m_contentPosition from PageViewportControllerClientEfl
authorjaepark@webkit.org <jaepark@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 18 May 2014 01:43:49 +0000 (01:43 +0000)
committerjaepark@webkit.org <jaepark@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 18 May 2014 01:43:49 +0000 (01:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=132774

Reviewed by Anders Carlsson.

m_contentPosition is not used anywhere. So, this patch removes
m_contentPosition and reduces one unnecessary assignment in
setViewportPosition. Also, it renames contentsPoint to contentsPosition.

* UIProcess/PageViewportControllerClient.h:
* UIProcess/efl/PageViewportControllerClientEfl.cpp:
(WebKit::PageViewportControllerClientEfl::setViewportPosition):
* UIProcess/efl/PageViewportControllerClientEfl.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@169003 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/PageViewportControllerClient.h
Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp
Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h

index 31b31f0..7d92b40 100644 (file)
@@ -1,3 +1,19 @@
+2014-05-17  Jae Hyun Park  <jaepark@webkit.org>
+
+        [EFL] Remove m_contentPosition from PageViewportControllerClientEfl
+        https://bugs.webkit.org/show_bug.cgi?id=132774
+
+        Reviewed by Anders Carlsson.
+
+        m_contentPosition is not used anywhere. So, this patch removes
+        m_contentPosition and reduces one unnecessary assignment in
+        setViewportPosition. Also, it renames contentsPoint to contentsPosition.
+
+        * UIProcess/PageViewportControllerClient.h:
+        * UIProcess/efl/PageViewportControllerClientEfl.cpp:
+        (WebKit::PageViewportControllerClientEfl::setViewportPosition):
+        * UIProcess/efl/PageViewportControllerClientEfl.h:
+
 2014-05-17  David Kilzer  <ddkilzer@apple.com>
 
         Need a way to get a WKPageRef from a WKWebView
index 15d9a5e..eddbd92 100644 (file)
@@ -38,7 +38,7 @@ public:
     PageViewportControllerClient() { }
     virtual ~PageViewportControllerClient() { }
 
-    virtual void setViewportPosition(const WebCore::FloatPoint& contentsPoint) = 0;
+    virtual void setViewportPosition(const WebCore::FloatPoint&) = 0;
     virtual void setPageScaleFactor(float) = 0;
 
     virtual void didChangeContentsSize(const WebCore::IntSize&) = 0;
index 022871a..79fe47a 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "EwkView.h"
 #include "PageViewportController.h"
+#include <WebCore/FloatPoint.h>
 
 using namespace WebCore;
 
@@ -46,13 +47,10 @@ void PageViewportControllerClientEfl::didChangeContentsSize(const WebCore::IntSi
     m_view->scheduleUpdateDisplay();
 }
 
-void PageViewportControllerClientEfl::setViewportPosition(const WebCore::FloatPoint& contentsPoint)
+void PageViewportControllerClientEfl::setViewportPosition(const WebCore::FloatPoint& contentsPosition)
 {
-    m_contentPosition = contentsPoint;
-
-    WKViewSetContentPosition(m_view->wkView(), WKPointMake(contentsPoint.x(), contentsPoint.y()));
-
-    m_controller->didChangeContentsVisibility(m_contentPosition, m_controller->currentScale());
+    WKViewSetContentPosition(m_view->wkView(), WKPointMake(contentsPosition.x(), contentsPosition.y()));
+    m_controller->didChangeContentsVisibility(contentsPosition, m_controller->currentScale());
 }
 
 void PageViewportControllerClientEfl::setPageScaleFactor(float newScale)
index 2a281e4..f48b342 100644 (file)
@@ -28,7 +28,6 @@
 #define PageViewportControllerClientEfl_h
 
 #include "PageViewportControllerClient.h"
-#include <WebCore/FloatPoint.h>
 
 class EwkView;
 
@@ -50,7 +49,6 @@ public:
 
 private:
     EwkView* m_view;
-    WebCore::FloatPoint m_contentPosition;
     PageViewportController* m_controller;
 };