<!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>[161571] 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/161571">161571</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-01-09 12:20:28 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit2 View Gestures: Support plugins that take over the page scale gesture
https://bugs.webkit.org/show_bug.cgi?id=126399
<rdar://problem/15738928>
Reviewed by Sam Weinig.
Teach ViewGestureController how to handle WebFrame::handlesPageScaleGesture=true,
which is used so that PDFPlugin can deal with magnification itself.
* UIProcess/mac/ViewGestureController.cpp:
(WebKit::ViewGestureController::ViewGestureController):
(WebKit::ViewGestureController::didCollectGeometryForMagnificationGesture):
(WebKit::ViewGestureController::handleMagnificationGesture):
(WebKit::ViewGestureController::endMagnificationGesture):
(WebKit::ViewGestureController::didCollectGeometryForSmartMagnificationGesture):
If the WebFrame is going to handle the page scale gesture itself (which currently
simply means that it is a main-frame PDFPlugin), send the magnification information
straight through to it. Also, don't provide smart-zoom in this case, since there
is currently no way to collect geometry information from the plugin.
* UIProcess/mac/ViewGestureController.h:
* UIProcess/mac/ViewGestureController.messages.in:
* WebProcess/WebPage/ViewGestureGeometryCollector.cpp:
(WebKit::ViewGestureGeometryCollector::collectGeometryForMagnificationGesture):
(WebKit::ViewGestureGeometryCollector::collectGeometryForSmartMagnificationGesture):
Retrieve WebFrame::handlesPageScaleGesture and return it to the UI process.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllercpp">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerh">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllermessagesin">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161570 => 161571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-09 20:20:26 UTC (rev 161570)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-09 20:20:28 UTC (rev 161571)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-01-09 Tim Horton <timothy_horton@apple.com>
+
+ WebKit2 View Gestures: Support plugins that take over the page scale gesture
+ https://bugs.webkit.org/show_bug.cgi?id=126399
+ <rdar://problem/15738928>
+
+ Reviewed by Sam Weinig.
+
+ Teach ViewGestureController how to handle WebFrame::handlesPageScaleGesture=true,
+ which is used so that PDFPlugin can deal with magnification itself.
+
+ * UIProcess/mac/ViewGestureController.cpp:
+ (WebKit::ViewGestureController::ViewGestureController):
+ (WebKit::ViewGestureController::didCollectGeometryForMagnificationGesture):
+ (WebKit::ViewGestureController::handleMagnificationGesture):
+ (WebKit::ViewGestureController::endMagnificationGesture):
+ (WebKit::ViewGestureController::didCollectGeometryForSmartMagnificationGesture):
+ If the WebFrame is going to handle the page scale gesture itself (which currently
+ simply means that it is a main-frame PDFPlugin), send the magnification information
+ straight through to it. Also, don't provide smart-zoom in this case, since there
+ is currently no way to collect geometry information from the plugin.
+
+ * UIProcess/mac/ViewGestureController.h:
+ * UIProcess/mac/ViewGestureController.messages.in:
+ * WebProcess/WebPage/ViewGestureGeometryCollector.cpp:
+ (WebKit::ViewGestureGeometryCollector::collectGeometryForMagnificationGesture):
+ (WebKit::ViewGestureGeometryCollector::collectGeometryForSmartMagnificationGesture):
+ Retrieve WebFrame::handlesPageScaleGesture and return it to the UI process.
+
</ins><span class="cx"> 2014-01-09 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Promote WKBackForwardList{,Item}.h to public
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp (161570 => 161571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp 2014-01-09 20:20:26 UTC (rev 161570)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp 2014-01-09 20:20:28 UTC (rev 161571)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> : m_webPageProxy(webPageProxy)
</span><span class="cx"> , m_activeGestureType(ViewGestureType::None)
</span><span class="cx"> , m_visibleContentRectIsValid(false)
</span><ins>+ , m_frameHandlesMagnificationGesture(false)
</ins><span class="cx"> {
</span><span class="cx"> m_webPageProxy.process().addMessageReceiver(Messages::ViewGestureController::messageReceiverName(), m_webPageProxy.pageID(), *this);
</span><span class="cx"> }
</span><span class="lines">@@ -88,11 +89,12 @@
</span><span class="cx"> return scaledMagnificationOrigin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewGestureController::didCollectGeometryForMagnificationGesture(FloatRect visibleContentRect)
</del><ins>+void ViewGestureController::didCollectGeometryForMagnificationGesture(FloatRect visibleContentRect, bool frameHandlesMagnificationGesture)
</ins><span class="cx"> {
</span><span class="cx"> m_activeGestureType = ViewGestureType::Magnification;
</span><span class="cx"> m_visibleContentRect = visibleContentRect;
</span><span class="cx"> m_visibleContentRectIsValid = true;
</span><ins>+ m_frameHandlesMagnificationGesture = frameHandlesMagnificationGesture;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ViewGestureController::handleMagnificationGesture(double scale, FloatPoint origin)
</span><span class="lines">@@ -111,6 +113,8 @@
</span><span class="cx"> if (!m_visibleContentRectIsValid)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_activeGestureType = ViewGestureType::Magnification;
+
</ins><span class="cx"> double scaleWithResistance = resistanceForDelta(scale, m_magnification) * scale;
</span><span class="cx">
</span><span class="cx"> m_magnification += m_magnification * scaleWithResistance;
</span><span class="lines">@@ -118,9 +122,10 @@
</span><span class="cx">
</span><span class="cx"> m_magnificationOrigin = origin;
</span><span class="cx">
</span><del>- m_webPageProxy.drawingArea()->adjustTransientZoom(m_magnification, scaledMagnificationOrigin(origin, m_magnification));
-
- m_activeGestureType = ViewGestureType::Magnification;
</del><ins>+ if (m_frameHandlesMagnificationGesture)
+ m_webPageProxy.scalePage(m_magnification, roundedIntPoint(origin));
+ else
+ m_webPageProxy.drawingArea()->adjustTransientZoom(m_magnification, scaledMagnificationOrigin(origin, m_magnification));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ViewGestureController::endMagnificationGesture()
</span><span class="lines">@@ -128,7 +133,11 @@
</span><span class="cx"> ASSERT(m_activeGestureType == ViewGestureType::Magnification);
</span><span class="cx">
</span><span class="cx"> double newMagnification = std::min(std::max(m_magnification, minMagnification), maxMagnification);
</span><del>- m_webPageProxy.drawingArea()->commitTransientZoom(newMagnification, scaledMagnificationOrigin(m_magnificationOrigin, newMagnification));
</del><ins>+
+ if (m_frameHandlesMagnificationGesture)
+ m_webPageProxy.scalePage(newMagnification, roundedIntPoint(m_magnificationOrigin));
+ else
+ m_webPageProxy.drawingArea()->commitTransientZoom(newMagnification, scaledMagnificationOrigin(m_magnificationOrigin, newMagnification));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ViewGestureController::handleSmartMagnificationGesture(FloatPoint origin)
</span><span class="lines">@@ -144,8 +153,11 @@
</span><span class="cx"> return std::max(fabs(a.x() - b.x()), std::max(fabs(a.y() - b.y()), std::max(fabs(a.width() - b.width()), fabs(a.height() - b.height()))));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewGestureController::didCollectGeometryForSmartMagnificationGesture(FloatPoint origin, FloatRect renderRect, FloatRect visibleContentRect, bool isReplacedElement)
</del><ins>+void ViewGestureController::didCollectGeometryForSmartMagnificationGesture(FloatPoint origin, FloatRect renderRect, FloatRect visibleContentRect, bool isReplacedElement, bool frameHandlesMagnificationGesture)
</ins><span class="cx"> {
</span><ins>+ if (frameHandlesMagnificationGesture)
+ return;
+
</ins><span class="cx"> double currentScaleFactor = m_webPageProxy.pageScaleFactor();
</span><span class="cx">
</span><span class="cx"> FloatRect unscaledTargetRect = renderRect;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (161570 => 161571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-01-09 20:20:26 UTC (rev 161570)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-01-09 20:20:28 UTC (rev 161571)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><del>- void didCollectGeometryForMagnificationGesture(WebCore::FloatRect visibleContentBounds);
- void didCollectGeometryForSmartMagnificationGesture(WebCore::FloatPoint origin, WebCore::FloatRect renderRect, WebCore::FloatRect visibleContentBounds, bool isReplacedElement);
</del><ins>+ void didCollectGeometryForMagnificationGesture(WebCore::FloatRect visibleContentBounds, bool frameHandlesMagnificationGesture);
+ void didCollectGeometryForSmartMagnificationGesture(WebCore::FloatPoint origin, WebCore::FloatRect renderRect, WebCore::FloatRect visibleContentBounds, bool isReplacedElement, bool frameHandlesMagnificationGesture);
</ins><span class="cx">
</span><span class="cx"> void endMagnificationGesture();
</span><span class="cx"> WebCore::FloatPoint scaledMagnificationOrigin(WebCore::FloatPoint origin, double scale);
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore::FloatRect m_visibleContentRect;
</span><span class="cx"> bool m_visibleContentRectIsValid;
</span><ins>+ bool m_frameHandlesMagnificationGesture;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.messages.in (161570 => 161571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.messages.in 2014-01-09 20:20:26 UTC (rev 161570)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.messages.in 2014-01-09 20:20:28 UTC (rev 161571)
</span><span class="lines">@@ -21,6 +21,6 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> messages -> ViewGestureController {
</span><del>- DidCollectGeometryForMagnificationGesture(WebCore::FloatRect visibleContentBounds)
- DidCollectGeometryForSmartMagnificationGesture(WebCore::FloatPoint origin, WebCore::FloatRect renderRect, WebCore::FloatRect visibleContentBounds, bool isReplacedElement)
</del><ins>+ DidCollectGeometryForMagnificationGesture(WebCore::FloatRect visibleContentBounds, bool frameHandlesMagnificationGesture)
+ DidCollectGeometryForSmartMagnificationGesture(WebCore::FloatPoint origin, WebCore::FloatRect renderRect, WebCore::FloatRect visibleContentBounds, bool isReplacedElement, bool frameHandlesMagnificationGesture)
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp (161570 => 161571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2014-01-09 20:20:26 UTC (rev 161570)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2014-01-09 20:20:28 UTC (rev 161571)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "ViewGestureControllerMessages.h"
</span><span class="cx"> #include "ViewGestureGeometryCollectorMessages.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><ins>+#include "WebFrame.h"
</ins><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include <WebCore/FrameView.h>
</span><span class="lines">@@ -53,12 +54,14 @@
</span><span class="cx"> void ViewGestureGeometryCollector::collectGeometryForMagnificationGesture()
</span><span class="cx"> {
</span><span class="cx"> FloatRect visibleContentRect = m_webPage.mainFrameView()->visibleContentRect(ScrollableArea::IncludeScrollbars);
</span><del>- m_webPage.send(Messages::ViewGestureController::DidCollectGeometryForMagnificationGesture(visibleContentRect));
</del><ins>+ bool frameHandlesMagnificationGesture = m_webPage.mainWebFrame()->handlesPageScaleGesture();
+ m_webPage.send(Messages::ViewGestureController::DidCollectGeometryForMagnificationGesture(visibleContentRect, frameHandlesMagnificationGesture));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ViewGestureGeometryCollector::collectGeometryForSmartMagnificationGesture(FloatPoint origin)
</span><span class="cx"> {
</span><span class="cx"> FloatRect visibleContentRect = m_webPage.mainFrameView()->visibleContentRect(ScrollableArea::IncludeScrollbars);
</span><ins>+ bool frameHandlesMagnificationGesture = m_webPage.mainWebFrame()->handlesPageScaleGesture();
</ins><span class="cx">
</span><span class="cx"> FloatPoint scrolledOrigin = origin;
</span><span class="cx"> scrolledOrigin.moveBy(m_webPage.mainFrameView()->scrollPosition());
</span><span class="lines">@@ -70,7 +73,7 @@
</span><span class="cx"> if (hitTestResult.innerNode()) {
</span><span class="cx"> bool isReplaced;
</span><span class="cx"> FloatRect renderRect = hitTestResult.innerNode()->renderRect(&isReplaced);
</span><del>- m_webPage.send(Messages::ViewGestureController::DidCollectGeometryForSmartMagnificationGesture(origin, renderRect, visibleContentRect, isReplaced));
</del><ins>+ m_webPage.send(Messages::ViewGestureController::DidCollectGeometryForSmartMagnificationGesture(origin, renderRect, visibleContentRect, isReplaced, frameHandlesMagnificationGesture));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>