<!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>[160818] 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/160818">160818</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 18:33:33 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit2 View Gestures: Move WebProcess-side geometry collection into its own class
https://bugs.webkit.org/show_bug.cgi?id=125967
Reviewed by Anders Carlsson.
Move the messages dispatched by ViewGestureController that grab geometry
from the WebProcess out of the DrawingArea and into ViewGestureGeometryCollector.
This class will grow when smart magnification is implemented.
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/DrawingArea.messages.in:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
Remove BeginTransientZoom() message.
* DerivedSources.make:
* UIProcess/DrawingAreaProxy.h:
* UIProcess/mac/ViewGestureController.cpp:
(WebKit::ViewGestureController::didCollectGeometryForMagnificationGesture):
(WebKit::ViewGestureController::handleMagnificationGesture):
* UIProcess/mac/ViewGestureController.h:
* UIProcess/mac/ViewGestureController.messages.in:
Make use of ViewGestureGeometryCollector and rename didBeginTransientZoom to didCollectGeometryForMagnificationGesture.
* WebKit2.xcodeproj/project.pbxproj:
Add new files.
* WebProcess/WebPage/ViewGestureGeometryCollector.cpp: Added.
(WebKit::ViewGestureGeometryCollector::ViewGestureGeometryCollector):
(WebKit::ViewGestureGeometryCollector::~ViewGestureGeometryCollector):
(WebKit::ViewGestureGeometryCollector::collectGeometryForMagnificationGesture):
* WebProcess/WebPage/ViewGestureGeometryCollector.h: Added.
* WebProcess/WebPage/ViewGestureGeometryCollector.messages.in: Added.
Move the code to collect the visible content rect and return it to the ViewGestureController into its own class.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
* WebProcess/WebPage/WebPage.h:
Move m_pageID to the top of WebPage's initialization list so that
it can be safely used from other members' constructors.
Add a ViewGestureGeometryCollector member and construct it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DerivedSourcesmake">trunk/Source/WebKit2/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm</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="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorh">trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectormessagesin">trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2013-12-18 Tim Horton <timothy_horton@apple.com>
+
+ WebKit2 View Gestures: Move WebProcess-side geometry collection into its own class
+ https://bugs.webkit.org/show_bug.cgi?id=125967
+
+ Reviewed by Anders Carlsson.
+
+ Move the messages dispatched by ViewGestureController that grab geometry
+ from the WebProcess out of the DrawingArea and into ViewGestureGeometryCollector.
+ This class will grow when smart magnification is implemented.
+
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ Remove BeginTransientZoom() message.
+
+ * DerivedSources.make:
+ * UIProcess/DrawingAreaProxy.h:
+
+ * UIProcess/mac/ViewGestureController.cpp:
+ (WebKit::ViewGestureController::didCollectGeometryForMagnificationGesture):
+ (WebKit::ViewGestureController::handleMagnificationGesture):
+ * UIProcess/mac/ViewGestureController.h:
+ * UIProcess/mac/ViewGestureController.messages.in:
+ Make use of ViewGestureGeometryCollector and rename didBeginTransientZoom to didCollectGeometryForMagnificationGesture.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
+ * WebProcess/WebPage/ViewGestureGeometryCollector.cpp: Added.
+ (WebKit::ViewGestureGeometryCollector::ViewGestureGeometryCollector):
+ (WebKit::ViewGestureGeometryCollector::~ViewGestureGeometryCollector):
+ (WebKit::ViewGestureGeometryCollector::collectGeometryForMagnificationGesture):
+ * WebProcess/WebPage/ViewGestureGeometryCollector.h: Added.
+ * WebProcess/WebPage/ViewGestureGeometryCollector.messages.in: Added.
+ Move the code to collect the visible content rect and return it to the ViewGestureController into its own class.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ * WebProcess/WebPage/WebPage.h:
+ Move m_pageID to the top of WebPage's initialization list so that
+ it can be safely used from other members' constructors.
+
+ Add a ViewGestureGeometryCollector member and construct it.
+
</ins><span class="cx"> 2013-12-18 Gustavo Noronha Silva <gns@gnome.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed cmake build fix for GTK+.
</span></span></pre></div>
<a id="trunkSourceWebKit2DerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DerivedSources.make (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DerivedSources.make 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/DerivedSources.make 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> StorageAreaMap \
</span><span class="cx"> StorageManager \
</span><span class="cx"> ViewGestureController \
</span><ins>+ ViewGestureGeometryCollector \
</ins><span class="cx"> WebApplicationCacheManager \
</span><span class="cx"> WebApplicationCacheManagerProxy \
</span><span class="cx"> WebConnection \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> virtual void colorSpaceDidChange() { }
</span><span class="cx"> virtual void minimumLayoutSizeDidChange() { }
</span><span class="cx">
</span><del>- virtual void beginTransientZoom() { }
</del><span class="cx"> virtual void adjustTransientZoom(double, WebCore::FloatPoint) { }
</span><span class="cx"> virtual void commitTransientZoom(double, WebCore::FloatPoint) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> virtual void exitAcceleratedCompositingMode(uint64_t backingStoreStateID, const UpdateInfo&) OVERRIDE;
</span><span class="cx"> virtual void updateAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) OVERRIDE;
</span><span class="cx">
</span><del>- virtual void beginTransientZoom() OVERRIDE;
</del><span class="cx"> virtual void adjustTransientZoom(double scale, WebCore::FloatPoint origin) OVERRIDE;
</span><span class="cx"> virtual void commitTransientZoom(double scale, WebCore::FloatPoint origin) OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -148,11 +148,6 @@
</span><span class="cx"> m_isWaitingForDidUpdateGeometry = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledCoreAnimationDrawingAreaProxy::beginTransientZoom()
-{
- m_webPageProxy->process().send(Messages::DrawingArea::BeginTransientZoom(), m_webPageProxy->pageID());
-}
-
</del><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::adjustTransientZoom(double scale, FloatPoint origin)
</span><span class="cx"> {
</span><span class="cx"> m_webPageProxy->process().send(Messages::DrawingArea::AdjustTransientZoom(scale, origin), m_webPageProxy->pageID());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #import "ViewGestureController.h"
</span><span class="cx">
</span><span class="cx"> #import "ViewGestureControllerMessages.h"
</span><ins>+#import "ViewGestureGeometryCollectorMessages.h"
</ins><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx">
</span><span class="lines">@@ -84,7 +85,7 @@
</span><span class="cx"> return scaledMagnificationOrigin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewGestureController::didBeginTransientZoom(FloatRect visibleContentRect)
</del><ins>+void ViewGestureController::didCollectGeometryForMagnificationGesture(FloatRect visibleContentRect)
</ins><span class="cx"> {
</span><span class="cx"> m_activeGestureType = ViewGestureType::Magnification;
</span><span class="cx"> m_visibleContentRect = visibleContentRect;
</span><span class="lines">@@ -98,7 +99,8 @@
</span><span class="cx"> if (m_activeGestureType == ViewGestureType::None) {
</span><span class="cx"> // FIXME: We drop the first frame of the gesture on the floor, because we don't have the visible content bounds yet.
</span><span class="cx"> m_magnification = m_webPageProxy.pageScaleFactor();
</span><del>- m_webPageProxy.drawingArea()->beginTransientZoom();
</del><ins>+ m_webPageProxy.process().send(Messages::ViewGestureGeometryCollector::CollectGeometryForMagnificationGesture(), m_webPageProxy.pageID());
+
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><del>- void didBeginTransientZoom(WebCore::FloatRect visibleContentBounds);
</del><ins>+ void didCollectGeometryForMagnificationGesture(WebCore::FloatRect visibleContentBounds);
</ins><span class="cx">
</span><span class="cx"> void endMagnificationGesture();
</span><span class="cx"> WebCore::FloatPoint scaledMagnificationOrigin(WebCore::FloatPoint origin, double scale);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.messages.in (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.messages.in 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.messages.in 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -21,5 +21,5 @@
</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>- DidBeginTransientZoom(WebCore::FloatRect visibleContentBounds)
</del><ins>+ DidCollectGeometryForMagnificationGesture(WebCore::FloatRect visibleContentBounds)
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -382,6 +382,10 @@
</span><span class="cx"> 2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */; };
</span><span class="cx"> 2D47B56C1810714E003A3AEE /* RemoteLayerBackingStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */; };
</span><span class="cx"> 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */; };
</span><ins>+ 2D819B9D186275B3001F03D1 /* ViewGestureGeometryCollector.messages.in in Resources */ = {isa = PBXBuildFile; fileRef = 2D819B9B186275B3001F03D1 /* ViewGestureGeometryCollector.messages.in */; };
+ 2D819B9E18627EE9001F03D1 /* ViewGestureGeometryCollector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D819B99186275B3001F03D1 /* ViewGestureGeometryCollector.cpp */; };
+ 2D819BA11862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */; };
+ 2D819BA21862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */; };
</ins><span class="cx"> 2D870D1016234FFE000A3F20 /* PDFPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D870D0E1622B7F9000A3F20 /* PDFPlugin.mm */; };
</span><span class="cx"> 2D8710161828415D0018FA01 /* PlatformCALayerRemoteCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.cpp */; };
</span><span class="cx"> 2D8710171828415D0018FA01 /* PlatformCALayerRemoteCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8710151828415D0018FA01 /* PlatformCALayerRemoteCustom.h */; };
</span><span class="lines">@@ -1960,6 +1964,11 @@
</span><span class="cx"> 2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPluginPasswordField.mm; path = PDF/PDFPluginPasswordField.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerBackingStore.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerBackingStore.h; sourceTree = "<group>"; };
</span><ins>+ 2D819B99186275B3001F03D1 /* ViewGestureGeometryCollector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewGestureGeometryCollector.cpp; sourceTree = "<group>"; };
+ 2D819B9A186275B3001F03D1 /* ViewGestureGeometryCollector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewGestureGeometryCollector.h; sourceTree = "<group>"; };
+ 2D819B9B186275B3001F03D1 /* ViewGestureGeometryCollector.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ViewGestureGeometryCollector.messages.in; sourceTree = "<group>"; };
+ 2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewGestureGeometryCollectorMessageReceiver.cpp; path = ViewGestureGeometryCollectorMessageReceiver.cpp; sourceTree = "<group>"; };
+ 2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewGestureGeometryCollectorMessages.h; path = ViewGestureGeometryCollectorMessages.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2D870D0D1622B7F9000A3F20 /* PDFPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPlugin.h; path = PDF/PDFPlugin.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D870D0E1622B7F9000A3F20 /* PDFPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPlugin.mm; path = PDF/PDFPlugin.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D8710141828415D0018FA01 /* PlatformCALayerRemoteCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCALayerRemoteCustom.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4509,6 +4518,9 @@
</span><span class="cx"> 7CF47FF917275C57008ACB91 /* PageBanner.h */,
</span><span class="cx"> 1A90C23612650717003E44D4 /* PageOverlay.cpp */,
</span><span class="cx"> 1A90C23512650717003E44D4 /* PageOverlay.h */,
</span><ins>+ 2D819B99186275B3001F03D1 /* ViewGestureGeometryCollector.cpp */,
+ 2D819B9A186275B3001F03D1 /* ViewGestureGeometryCollector.h */,
+ 2D819B9B186275B3001F03D1 /* ViewGestureGeometryCollector.messages.in */,
</ins><span class="cx"> BC72B9F811E6476B001EB4EA /* WebBackForwardListProxy.cpp */,
</span><span class="cx"> BC72B9F911E6476B001EB4EA /* WebBackForwardListProxy.h */,
</span><span class="cx"> 51871B59127CB89D00F76232 /* WebContextMenu.cpp */,
</span><span class="lines">@@ -5485,6 +5497,8 @@
</span><span class="cx"> C0CE729D1247E71D00BC0EC4 /* Derived Sources */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */,
+ 2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */,
</ins><span class="cx"> 512F58A012A883AD00629530 /* AuthenticationManagerMessageReceiver.cpp */,
</span><span class="cx"> 512F58A112A883AD00629530 /* AuthenticationManagerMessages.h */,
</span><span class="cx"> E17AE2C216B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb */,
</span><span class="lines">@@ -6026,6 +6040,7 @@
</span><span class="cx"> BCEE7D0E12846F69009827DA /* WebContextMessages.h in Headers */,
</span><span class="cx"> BCF4DE25168FA44800C94AFC /* WebContextSupplement.h in Headers */,
</span><span class="cx"> BCB0B0DC12305A2500B1341E /* WebContextUserMessageCoders.h in Headers */,
</span><ins>+ 2D819BA21862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h in Headers */,
</ins><span class="cx"> 330934501315B94D0097A7BC /* WebCookieManager.h in Headers */,
</span><span class="cx"> 330934481315B9220097A7BC /* WebCookieManagerMessages.h in Headers */,
</span><span class="cx"> 330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */,
</span><span class="lines">@@ -6737,6 +6752,7 @@
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><ins>+ 2D819B9D186275B3001F03D1 /* ViewGestureGeometryCollector.messages.in in Resources */,
</ins><span class="cx"> E1D26A51175964D70095BFD1 /* WebContentProcess.xib in Resources */,
</span><span class="cx"> E133FD8A1423DD7F00FC7BFB /* WebKit.icns in Resources */,
</span><span class="cx"> );
</span><span class="lines">@@ -7382,6 +7398,7 @@
</span><span class="cx"> 51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */,
</span><span class="cx"> 512935D71288D19400A4B695 /* WebContextMenuItem.cpp in Sources */,
</span><span class="cx"> 510FBB9A1288C95E00AFFDF4 /* WebContextMenuItemData.cpp in Sources */,
</span><ins>+ 2D819BA11862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp in Sources */,
</ins><span class="cx"> 51A84CE3127F386B00CA6EA4 /* WebContextMenuProxy.cpp in Sources */,
</span><span class="cx"> 51ACBBA1127A8F2C00D203B9 /* WebContextMenuProxyMac.mm in Sources */,
</span><span class="cx"> BCEE7D0D12846F69009827DA /* WebContextMessageReceiver.cpp in Sources */,
</span><span class="lines">@@ -7658,6 +7675,7 @@
</span><span class="cx"> 512A9760180E031D0039A149 /* DatabaseProcessMessageReceiver.cpp in Sources */,
</span><span class="cx"> BC40760D124FF0270068F20A /* WKURLResponse.cpp in Sources */,
</span><span class="cx"> BC40762C124FF0400068F20A /* WKURLResponseNS.mm in Sources */,
</span><ins>+ 2D819B9E18627EE9001F03D1 /* ViewGestureGeometryCollector.cpp in Sources */,
</ins><span class="cx"> F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */,
</span><span class="cx"> BC8699B6116AADAA002A925B /* WKView.mm in Sources */,
</span><span class="cx"> C5E1AFE816B20B67006CC1F2 /* WKWebArchive.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -127,7 +127,6 @@
</span><span class="cx"> virtual void setDeviceScaleFactor(float) { }
</span><span class="cx"> virtual void setColorSpace(const ColorSpaceData&) { }
</span><span class="cx">
</span><del>- virtual void beginTransientZoom() { }
</del><span class="cx"> virtual void adjustTransientZoom(double scale, WebCore::FloatPoint origin) { }
</span><span class="cx"> virtual void commitTransientZoom(double scale, WebCore::FloatPoint origin) { }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> SetDeviceScaleFactor(float deviceScaleFactor)
</span><span class="cx"> SetColorSpace(WebKit::ColorSpaceData colorSpace)
</span><span class="cx">
</span><del>- BeginTransientZoom()
</del><span class="cx"> AdjustTransientZoom(double scale, WebCore::FloatPoint origin)
</span><span class="cx"> CommitTransientZoom(double scale, WebCore::FloatPoint origin)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp (0 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ViewGestureGeometryCollector.h"
+
+#include "ViewGestureControllerMessages.h"
+#include "ViewGestureGeometryCollectorMessages.h"
+#include "WebCoreArgumentCoders.h"
+#include "WebPage.h"
+#include "WebProcess.h"
+#include <WebCore/FrameView.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+ViewGestureGeometryCollector::ViewGestureGeometryCollector(WebPage& webPage)
+ : m_webPage(webPage)
+{
+ WebProcess::shared().addMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.pageID(), *this);
+}
+
+ViewGestureGeometryCollector::~ViewGestureGeometryCollector()
+{
+ WebProcess::shared().removeMessageReceiver(Messages::ViewGestureGeometryCollector::messageReceiverName(), m_webPage.pageID());
+}
+
+void ViewGestureGeometryCollector::collectGeometryForMagnificationGesture()
+{
+ FloatRect visibleContentRect = m_webPage.mainFrameView()->visibleContentRect(ScrollableArea::IncludeScrollbars);
+ m_webPage.send(Messages::ViewGestureController::DidCollectGeometryForMagnificationGesture(visibleContentRect));
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h (0 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ViewGestureGeometryCollector_h
+#define ViewGestureGeometryCollector_h
+
+#include "MessageReceiver.h"
+
+namespace WebKit {
+
+class WebPage;
+
+class ViewGestureGeometryCollector : private CoreIPC::MessageReceiver {
+public:
+ ViewGestureGeometryCollector(WebPage&);
+ ~ViewGestureGeometryCollector();
+
+private:
+ // CoreIPC::MessageReceiver.
+ virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+
+ // Message handlers.
+ void collectGeometryForMagnificationGesture();
+
+ WebPage& m_webPage;
+};
+
+} // namespace WebKit
+
+#endif // ViewGestureGeometryCollector
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectormessagesin"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.messages.in (0 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.messages.in (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.messages.in 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+# Copyright (C) 2013 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+messages -> ViewGestureGeometryCollector {
+
+CollectGeometryForMagnificationGesture()
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -220,7 +220,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
</span><del>- : m_viewSize(parameters.viewSize)
</del><ins>+ : m_pageID(pageID)
+ , m_viewSize(parameters.viewSize)
</ins><span class="cx"> , m_hasSeenPlugin(false)
</span><span class="cx"> , m_useFixedLayout(false)
</span><span class="cx"> , m_drawsBackground(true)
</span><span class="lines">@@ -245,6 +246,7 @@
</span><span class="cx"> , m_hasCachedWindowFrame(false)
</span><span class="cx"> , m_layerHostingMode(parameters.layerHostingMode)
</span><span class="cx"> , m_keyboardEventBeingInterpreted(0)
</span><ins>+ , m_viewGestureGeometryCollector(*this)
</ins><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> , m_accessibilityObject(0)
</span><span class="cx"> #endif
</span><span class="lines">@@ -257,7 +259,6 @@
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx"> , m_geolocationPermissionRequestManager(this)
</span><span class="cx"> #endif
</span><del>- , m_pageID(pageID)
</del><span class="cx"> , m_canRunBeforeUnloadConfirmPanel(parameters.canRunBeforeUnloadConfirmPanel)
</span><span class="cx"> , m_canRunModal(parameters.canRunModal)
</span><span class="cx"> , m_isRunningModal(false)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include "DictionaryPopupInfo.h"
</span><span class="cx"> #include "LayerHostingContext.h"
</span><ins>+#include "ViewGestureGeometryCollector.h"
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx"> OBJC_CLASS NSDictionary;
</span><span class="lines">@@ -859,6 +860,8 @@
</span><span class="cx">
</span><span class="cx"> void reportUsedFeatures();
</span><span class="cx">
</span><ins>+ uint64_t m_pageID;
+
</ins><span class="cx"> OwnPtr<WebCore::Page> m_page;
</span><span class="cx"> RefPtr<WebFrame> m_mainFrame;
</span><span class="cx"> RefPtr<InjectedBundleBackForwardList> m_backForwardList;
</span><span class="lines">@@ -932,6 +935,8 @@
</span><span class="cx">
</span><span class="cx"> WebCore::KeyboardEvent* m_keyboardEventBeingInterpreted;
</span><span class="cx">
</span><ins>+ ViewGestureGeometryCollector m_viewGestureGeometryCollector;
+
</ins><span class="cx"> #elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
</span><span class="cx"> GRefPtr<WebPageAccessibilityObject> m_accessibilityObject;
</span><span class="cx">
</span><span class="lines">@@ -997,7 +1002,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> SandboxExtensionTracker m_sandboxExtensionTracker;
</span><del>- uint64_t m_pageID;
</del><span class="cx">
</span><span class="cx"> RefPtr<SandboxExtension> m_pendingDropSandboxExtension;
</span><span class="cx"> Vector<RefPtr<SandboxExtension>> m_pendingDropExtensionsForFileUpload;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -104,7 +104,6 @@
</span><span class="cx"> virtual void setLayerHostingMode(uint32_t) OVERRIDE;
</span><span class="cx"> virtual void setColorSpace(const ColorSpaceData&) OVERRIDE;
</span><span class="cx">
</span><del>- virtual void beginTransientZoom() OVERRIDE;
</del><span class="cx"> virtual void adjustTransientZoom(double scale, WebCore::FloatPoint origin) OVERRIDE;
</span><span class="cx"> virtual void commitTransientZoom(double scale, WebCore::FloatPoint origin) OVERRIDE;
</span><span class="cx"> void applyTransientZoomToPage(double scale, WebCore::FloatPoint origin);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (160817 => 160818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-19 02:29:41 UTC (rev 160817)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-19 02:33:33 UTC (rev 160818)
</span><span class="lines">@@ -701,12 +701,6 @@
</span><span class="cx"> return frameView && frameView->frame().isMainFrame();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledCoreAnimationDrawingArea::beginTransientZoom()
-{
- FloatRect visibleContentRect = m_webPage->mainFrameView()->visibleContentRect(ScrollableArea::IncludeScrollbars);
- m_webPage->send(Messages::ViewGestureController::DidBeginTransientZoom(visibleContentRect));
-}
-
</del><span class="cx"> void TiledCoreAnimationDrawingArea::adjustTransientZoom(double scale, FloatPoint origin)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Scrollbars should stay in-place and change height while zooming.
</span></span></pre>
</div>
</div>
</body>
</html>