Changeset 150893 in webkit

Timestamp:

May 29, 2013 7:34:19 AM (11 years ago)

Author:

marcelo.lira@openbossa.org

Message:

[WK2][CoordinatedGraphics][EFL] WKViewUserViewportToContents() function doesn't do what it says
​https://bugs.webkit.org/show_bug.cgi?id=116683

Reviewed by Noam Rosenthal.

Source/WebKit2:

WKViewUserViewportToContents now converts WebView coordinates to
page contents coordinates, taking into account factors as content
scale and scroll, and also device scale.

The function WKViewUserViewportToScene was added to convert WebView
coordinates to the coordinates of the canvas/scene where the view
is drawn, and EwkView was fixed to use it, instead of
WKViewUserViewportToContents.

• UIProcess/API/C/CoordinatedGraphics/WKView.cpp:

(WKViewUserViewportToScene):

• UIProcess/API/C/CoordinatedGraphics/WKView.h:
• UIProcess/API/efl/EwkView.cpp:

(EwkView::createGLSurface):

• UIProcess/CoordinatedGraphics/WebView.cpp:

(WebKit::WebView::userViewportToContents):
(WebKit):
(WebKit::WebView::userViewportToScene):
(WebKit::WebView::transformToScene):

• UIProcess/CoordinatedGraphics/WebView.h:

(WebView):

Tools:

A coordinates conversion test for WKViewUserViewportToContents was
added to WebKit2 API tests.

• TestWebKitAPI/PlatformEfl.cmake:
• TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewUserViewportToContents.cpp: Added.

(TestWebKitAPI):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/efl/EwkView.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/PlatformEfl.cmake (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics (added)
• Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewUserViewportToContents.cpp (added)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-29  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        [WK2][CoordinatedGraphics][EFL] WKViewUserViewportToContents() function doesn't do what it says
+        https://bugs.webkit.org/show_bug.cgi?id=116683
+
+        Reviewed by Noam Rosenthal.
+
+        WKViewUserViewportToContents now converts WebView coordinates to
+        page contents coordinates, taking into account factors as content
+        scale and scroll, and also device scale.
+
+        The function WKViewUserViewportToScene was added to convert WebView
+        coordinates to the coordinates of the canvas/scene where the view
+        is drawn, and EwkView was fixed to use it, instead of
+        WKViewUserViewportToContents.
+
+        * UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
+        (WKViewUserViewportToScene):
+        * UIProcess/API/C/CoordinatedGraphics/WKView.h:
+        * UIProcess/API/efl/EwkView.cpp:
+        (EwkView::createGLSurface):
+        * UIProcess/CoordinatedGraphics/WebView.cpp:
+        (WebKit::WebView::userViewportToContents):
+        (WebKit):
+        (WebKit::WebView::userViewportToScene):
+        (WebKit::WebView::transformToScene):
+        * UIProcess/CoordinatedGraphics/WebView.h:
+        (WebView):
+
 2013-05-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp

@@ -107 +107 @@
 }
 
+WKPoint WKViewUserViewportToScene(WKViewRef viewRef, WKPoint point)
+{
+    WebCore::IntPoint result = toImpl(viewRef)->userViewportToScene(toIntPoint(point));
+    return WKPointMake(result.x(), result.y());
+}
+
 void WKViewPaintToCurrentGLContext(WKViewRef viewRef)
 {

trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.h

@@ -80 +80 @@
 WK_EXPORT void WKViewSetUserViewportTranslation(WKViewRef, double tx, double ty);
 WK_EXPORT WKPoint WKViewUserViewportToContents(WKViewRef, WKPoint);
+WK_EXPORT WKPoint WKViewUserViewportToScene(WKViewRef, WKPoint);
 
 WK_EXPORT void WKViewPaintToCurrentGLContext(WKViewRef);

trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp

@@ -775 +775 @@
     Evas_GL_API* gl = evas_gl_api_get(m_evasGL.get());
 
-    const WKPoint& boundsEnd = WKViewUserViewportToContents(wkView(), WKPointMake(deviceSize().width(), deviceSize().height()));
+    WKPoint boundsEnd = WKViewUserViewportToScene(wkView(), WKPointMake(deviceSize().width(), deviceSize().height()));
     gl->glViewport(0, 0, boundsEnd.x, boundsEnd.y);
     gl->glClearColor(1.0, 1.0, 1.0, 0);

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

@@ -111 +111 @@
 IntPoint WebView::userViewportToContents(const IntPoint& point) const
 {
+    return transformFromScene().mapPoint(point);
+}
+
+IntPoint WebView::userViewportToScene(const WebCore::IntPoint& point) const
+{
     return m_userViewportTransform.mapPoint(point);
 }
@@ -203 +208 @@
 AffineTransform WebView::transformToScene() const
 {
+    FloatPoint position = -m_contentPosition;
+    float effectiveScale = m_contentScaleFactor * m_page->deviceScaleFactor();
+    position.scale(effectiveScale, effectiveScale);
+
     TransformationMatrix transform = m_userViewportTransform;
-
-    const FloatPoint& position = contentPosition();
-    transform.scale(m_page->deviceScaleFactor());
-    transform.translate(-position.x(), -position.y());
-    transform.scale(contentScaleFactor());
+    transform.translate(position.x(), position.y());
+    transform.scale(effectiveScale);
 
     return transform.toAffineTransform();

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h

@@ -72 +72 @@
     void setUserViewportTranslation(double tx, double ty);
     WebCore::IntPoint userViewportToContents(const WebCore::IntPoint&) const;
+    WebCore::IntPoint userViewportToScene(const WebCore::IntPoint&) const;
 
     void paintToCurrentGLContext();

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-29  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        [WK2][CoordinatedGraphics][EFL] WKViewUserViewportToContents() function doesn't do what it says
+        https://bugs.webkit.org/show_bug.cgi?id=116683
+
+        Reviewed by Noam Rosenthal.
+
+        A coordinates conversion test for WKViewUserViewportToContents was
+        added to WebKit2 API tests.
+
+        * TestWebKitAPI/PlatformEfl.cmake:
+        * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewUserViewportToContents.cpp: Added.
+        (TestWebKitAPI):
+        (TestWebKitAPI::TEST):
+
 2013-05-29  Yong Li  <yong.li.webkit@outlook.com>
 

trunk/Tools/TestWebKitAPI/PlatformEfl.cmake

@@ -95 +95 @@
     WKURL
     WillSendSubmitEvent
+    CoordinatedGraphics/WKViewUserViewportToContents
     efl/WKViewClientWebProcessCallbacks
 )