<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174882] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174882">174882</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-20 03:39:58 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Improve zooming gesture positioning
https://bugs.webkit.org/show_bug.cgi?id=137822
Patch by Carlos Garnacho <carlosg@gnome.org> on 2014-10-20
Reviewed by Carlos Garcia Campos.
* UIProcess/WebPageProxy.h:
* UIProcess/gtk/GestureController.cpp:
(WebKit::GestureController::ZoomGesture::center):
(WebKit::GestureController::ZoomGesture::begin):
(WebKit::GestureController::ZoomGesture::handleZoom):
(WebKit::GestureController::ZoomGesture::scaleChanged): Calculate
the proper view coordinates for the current offset/scale, based
on the initial gesture center point in document coordinates, and
the current center/scale.
* UIProcess/gtk/GestureController.h:
* UIProcess/gtk/WebPageProxyGtk.cpp:
(WebKit::WebPageProxy::getCenterForZoomGesture): Added. Synchronous
call to retrieve the zoom gesture anchor point, in document coordinates.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in: Added stub.
* WebProcess/WebPage/gtk/WebPageGtk.cpp:
(WebKit::WebPage::getCenterForZoomGesture): Added. Getter for the
translated coordinates used as the anchor point of the zoom gesture.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkGestureControllercpp">trunk/Source/WebKit2/UIProcess/gtk/GestureController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkGestureControllerh">trunk/Source/WebKit2/UIProcess/gtk/GestureController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPageProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkWebPageGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174881 => 174882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-20 09:54:50 UTC (rev 174881)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-20 10:39:58 UTC (rev 174882)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-10-20 Carlos Garnacho <carlosg@gnome.org>
+
+ [GTK] Improve zooming gesture positioning
+ https://bugs.webkit.org/show_bug.cgi?id=137822
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/gtk/GestureController.cpp:
+ (WebKit::GestureController::ZoomGesture::center):
+ (WebKit::GestureController::ZoomGesture::begin):
+ (WebKit::GestureController::ZoomGesture::handleZoom):
+ (WebKit::GestureController::ZoomGesture::scaleChanged): Calculate
+ the proper view coordinates for the current offset/scale, based
+ on the initial gesture center point in document coordinates, and
+ the current center/scale.
+ * UIProcess/gtk/GestureController.h:
+ * UIProcess/gtk/WebPageProxyGtk.cpp:
+ (WebKit::WebPageProxy::getCenterForZoomGesture): Added. Synchronous
+ call to retrieve the zoom gesture anchor point, in document coordinates.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in: Added stub.
+ * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+ (WebKit::WebPage::getCenterForZoomGesture): Added. Getter for the
+ translated coordinates used as the anchor point of the zoom gesture.
+
</ins><span class="cx"> 2014-10-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove the factory method from DragAndDropHandler
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (174881 => 174882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-10-20 09:54:50 UTC (rev 174881)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-10-20 10:39:58 UTC (rev 174882)
</span><span class="lines">@@ -471,6 +471,10 @@
</span><span class="cx"> void setInputMethodState(bool enabled);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM (GTK) && HAVE(GTK_GESTURES)
+ void getCenterForZoomGesture(const WebCore::IntPoint& centerInViewCoordinates, WebCore::IntPoint& center);
+#endif
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void windowAndViewFramesChanged(const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates);
</span><span class="cx"> void setMainFrameIsScrollable(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkGestureControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/GestureController.cpp (174881 => 174882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/GestureController.cpp 2014-10-20 09:54:50 UTC (rev 174881)
+++ trunk/Source/WebKit2/UIProcess/gtk/GestureController.cpp 2014-10-20 10:39:58 UTC (rev 174882)
</span><span class="lines">@@ -168,26 +168,41 @@
</span><span class="cx"> g_signal_connect_swapped(m_gesture.get(), "end", G_CALLBACK(end), this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IntPoint GestureController::ZoomGesture::center() const
+{
+ double x, y;
+ gtk_gesture_get_bounding_box_center(m_gesture.get(), &x, &y);
+ return IntPoint(x, y);
+}
+
</ins><span class="cx"> void GestureController::ZoomGesture::begin(ZoomGesture* zoomGesture, GdkEventSequence*, GtkGesture* gesture)
</span><span class="cx"> {
</span><span class="cx"> gtk_gesture_set_state(gesture, GTK_EVENT_SEQUENCE_CLAIMED);
</span><span class="cx">
</span><span class="cx"> zoomGesture->m_initialScale = zoomGesture->m_page.pageScaleFactor();
</span><del>- double x, y;
- gtk_gesture_get_bounding_box_center(gesture, &x, &y);
- zoomGesture->m_point = IntPoint(x, y);
</del><ins>+ zoomGesture->m_page.getCenterForZoomGesture(zoomGesture->center(), zoomGesture->m_initialPoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void GestureController::ZoomGesture::handleZoom()
+{
+ IntPoint scaledOriginOffset = m_viewPoint;
+ scaledOriginOffset.scale(1 / m_scale, 1 / m_scale);
+
+ IntPoint newOrigin = m_initialPoint;
+ newOrigin.moveBy(-scaledOriginOffset);
+ newOrigin.scale(m_scale, m_scale);
+
+ m_page.scalePage(m_scale, newOrigin);
+}
+
</ins><span class="cx"> void GestureController::ZoomGesture::scaleChanged(ZoomGesture* zoomGesture, double scale, GtkGesture*)
</span><span class="cx"> {
</span><span class="cx"> zoomGesture->m_scale = zoomGesture->m_initialScale * scale;
</span><ins>+ zoomGesture->m_viewPoint = zoomGesture->center();
</ins><span class="cx"> if (zoomGesture->m_idle.isScheduled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- zoomGesture->m_idle.schedule("[WebKit] Zoom Gesture Idle", [zoomGesture]() {
- // FIXME: Zoomed area is not correctly centered.
- zoomGesture->m_page.scalePage(zoomGesture->m_scale, zoomGesture->m_point);
- });
</del><ins>+ zoomGesture->m_idle.schedule("[WebKit] Zoom Gesture Idle", std::bind(&GestureController::ZoomGesture::handleZoom, zoomGesture));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GestureController::ZoomGesture::ZoomGesture(WebPageProxy& page)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/GestureController.h (174881 => 174882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/GestureController.h 2014-10-20 09:54:50 UTC (rev 174881)
+++ trunk/Source/WebKit2/UIProcess/gtk/GestureController.h 2014-10-20 10:39:58 UTC (rev 174882)
</span><span class="lines">@@ -86,12 +86,16 @@
</span><span class="cx"> ZoomGesture(WebPageProxy&);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ WebCore::IntPoint center() const;
+ void handleZoom();
+
</ins><span class="cx"> static void begin(ZoomGesture*, GdkEventSequence*, GtkGesture*);
</span><span class="cx"> static void scaleChanged(ZoomGesture*, double scale, GtkGesture*);
</span><span class="cx">
</span><span class="cx"> gdouble m_initialScale;
</span><span class="cx"> gdouble m_scale;
</span><del>- WebCore::IntPoint m_point;
</del><ins>+ WebCore::IntPoint m_initialPoint;
+ WebCore::IntPoint m_viewPoint;
</ins><span class="cx"> GMainLoopSource m_idle;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPageProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp (174881 => 174882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2014-10-20 09:54:50 UTC (rev 174881)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2014-10-20 10:39:58 UTC (rev 174882)
</span><span class="lines">@@ -142,4 +142,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if HAVE(GTK_GESTURES)
+void WebPageProxy::getCenterForZoomGesture(const WebCore::IntPoint& centerInViewCoordinates, WebCore::IntPoint& center)
+{
+ process().sendSync(Messages::WebPage::GetCenterForZoomGesture(centerInViewCoordinates), Messages::WebPage::GetCenterForZoomGesture::Reply(center), m_pageID);
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (174881 => 174882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-10-20 09:54:50 UTC (rev 174881)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-10-20 10:39:58 UTC (rev 174882)
</span><span class="lines">@@ -578,6 +578,10 @@
</span><span class="cx"> void cancelComposition();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM (GTK) && HAVE(GTK_GESTURES)
+ void getCenterForZoomGesture(const WebCore::IntPoint& centerInViewCoordinates, WebCore::IntPoint& result);
+#endif
+
</ins><span class="cx"> void didChangeSelection();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (174881 => 174882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-10-20 09:54:50 UTC (rev 174881)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-10-20 10:39:58 UTC (rev 174882)
</span><span class="lines">@@ -310,6 +310,10 @@
</span><span class="cx"> CancelComposition()
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM (GTK) && HAVE(GTK_GESTURES)
+ GetCenterForZoomGesture(WebCore::IntPoint centerInViewCoordinates) -> (WebCore::IntPoint center)
+#endif
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> # Complex text input support for plug-ins.
</span><span class="cx"> SendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, String textInput)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebPageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp (174881 => 174882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2014-10-20 09:54:50 UTC (rev 174881)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2014-10-20 10:39:58 UTC (rev 174882)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include <WebCore/EventHandler.h>
</span><span class="cx"> #include <WebCore/FocusController.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><ins>+#include <WebCore/FrameView.h>
</ins><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/PasteboardHelper.h>
</span><span class="lines">@@ -181,4 +182,13 @@
</span><span class="cx"> return WebCore::standardUserAgentForURL(url);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if HAVE(GTK_GESTURES)
+void WebPage::getCenterForZoomGesture(const IntPoint& centerInViewCoordinates, IntPoint& result)
+{
+ result = mainFrameView()->rootViewToContents(centerInViewCoordinates);
+ double scale = m_page->pageScaleFactor();
+ result.scale(1 / scale, 1 / scale);
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>