<!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>[167253] 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/167253">167253</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-14 10:27:59 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make WK(Web)View magnification setters actually use view-relative positions
https://bugs.webkit.org/show_bug.cgi?id=131611
<rdar://problem/15965239>
Reviewed by Darin Adler.
* UIProcess/API/mac/WKView.mm:
(-[WKView setMagnification:centeredAtPoint:]):
(-[WKView setMagnification:]):
Use scalePageInViewCoordinates instead.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::scalePageInViewCoordinates):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::scalePageInViewCoordinates):
(WebKit::WebPage::pageScaleFactor):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
Add scalePageInViewCoordinates, which turns the scale centerpoint within the view
into what scalePage expects: a post-scale scroll offset.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</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="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.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 (167252 => 167253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-14 17:26:28 UTC (rev 167252)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-14 17:27:59 UTC (rev 167253)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-04-14 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Make WK(Web)View magnification setters actually use view-relative positions
+ https://bugs.webkit.org/show_bug.cgi?id=131611
+ <rdar://problem/15965239>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView setMagnification:centeredAtPoint:]):
+ (-[WKView setMagnification:]):
+ Use scalePageInViewCoordinates instead.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::scalePageInViewCoordinates):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::scalePageInViewCoordinates):
+ (WebKit::WebPage::pageScaleFactor):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ Add scalePageInViewCoordinates, which turns the scale centerpoint within the view
+ into what scalePage expects: a post-scale scroll offset.
+
+2014-04-14 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Support setting a background color on page overlays
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131600
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (167252 => 167253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-04-14 17:26:28 UTC (rev 167252)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-04-14 17:27:59 UTC (rev 167253)
</span><span class="lines">@@ -3869,13 +3869,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)setMagnification:(double)magnification centeredAtPoint:(NSPoint)point
</span><span class="cx"> {
</span><del>- _data->_page->scalePage(magnification, roundedIntPoint(point));
</del><ins>+ _data->_page->scalePageInViewCoordinates(magnification, roundedIntPoint(point));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setMagnification:(double)magnification
</span><span class="cx"> {
</span><span class="cx"> FloatPoint viewCenter(NSMidX([self bounds]), NSMidY([self bounds]));
</span><del>- _data->_page->scalePage(magnification, roundedIntPoint(viewCenter));
</del><ins>+ _data->_page->scalePageInViewCoordinates(magnification, roundedIntPoint(viewCenter));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (double)magnification
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (167252 => 167253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-14 17:26:28 UTC (rev 167252)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-14 17:27:59 UTC (rev 167253)
</span><span class="lines">@@ -1730,6 +1730,15 @@
</span><span class="cx"> m_process->send(Messages::WebPage::ScalePage(scale, origin), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::scalePageInViewCoordinates(double scale, const IntPoint& centerInViewCoordinates)
+{
+ if (!isValid())
+ return;
+
+ m_pageScaleFactor = scale;
+ m_process->send(Messages::WebPage::ScalePageInViewCoordinates(scale, centerInViewCoordinates), m_pageID);
+}
+
</ins><span class="cx"> void WebPageProxy::setIntrinsicDeviceScaleFactor(float scaleFactor)
</span><span class="cx"> {
</span><span class="cx"> if (m_intrinsicDeviceScaleFactor == scaleFactor)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (167252 => 167253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-14 17:26:28 UTC (rev 167252)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-14 17:27:59 UTC (rev 167253)
</span><span class="lines">@@ -731,6 +731,7 @@
</span><span class="cx"> void setPageAndTextZoomFactors(double pageZoomFactor, double textZoomFactor);
</span><span class="cx">
</span><span class="cx"> void scalePage(double scale, const WebCore::IntPoint& origin);
</span><ins>+ void scalePageInViewCoordinates(double scale, const WebCore::IntPoint& centerInViewCoordinates);
</ins><span class="cx"> double pageScaleFactor() const { return m_pageScaleFactor; }
</span><span class="cx">
</span><span class="cx"> float deviceScaleFactor() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167252 => 167253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-14 17:26:28 UTC (rev 167252)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-14 17:27:59 UTC (rev 167253)
</span><span class="lines">@@ -1298,12 +1298,23 @@
</span><span class="cx"> send(Messages::WebPageProxy::PageScaleFactorDidChange(scale));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::scalePageInViewCoordinates(double scale, IntPoint centerInViewCoordinates)
+{
+ if (scale == pageScaleFactor())
+ return;
+
+ IntPoint scrollPositionAtNewScale = mainFrameView()->rootViewToContents(-centerInViewCoordinates);
+ double scaleRatio = scale / pageScaleFactor();
+ scrollPositionAtNewScale.scale(scaleRatio, scaleRatio);
+ scalePage(scale, scrollPositionAtNewScale);
+}
+
</ins><span class="cx"> double WebPage::pageScaleFactor() const
</span><span class="cx"> {
</span><span class="cx"> PluginView* pluginView = pluginViewForFrame(&m_page->mainFrame());
</span><span class="cx"> if (pluginView && pluginView->handlesPageScaleFactor())
</span><span class="cx"> return pluginView->pageScaleFactor();
</span><del>-
</del><ins>+
</ins><span class="cx"> return m_page->pageScaleFactor();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (167252 => 167253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-14 17:26:28 UTC (rev 167252)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-14 17:27:59 UTC (rev 167253)
</span><span class="lines">@@ -349,6 +349,7 @@
</span><span class="cx"> void windowScreenDidChange(uint64_t);
</span><span class="cx">
</span><span class="cx"> void scalePage(double scale, const WebCore::IntPoint& origin);
</span><ins>+ void scalePageInViewCoordinates(double scale, WebCore::IntPoint centerInViewCoordinates);
</ins><span class="cx"> double pageScaleFactor() const;
</span><span class="cx">
</span><span class="cx"> void setUseFixedLayout(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (167252 => 167253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-04-14 17:26:28 UTC (rev 167252)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-04-14 17:27:59 UTC (rev 167253)
</span><span class="lines">@@ -167,6 +167,7 @@
</span><span class="cx"> WindowScreenDidChange(uint64_t displayID)
</span><span class="cx">
</span><span class="cx"> ScalePage(double scale, WebCore::IntPoint origin)
</span><ins>+ ScalePageInViewCoordinates(double scale, WebCore::IntPoint centerInViewCoordinates)
</ins><span class="cx">
</span><span class="cx"> SetUseFixedLayout(bool fixed)
</span><span class="cx"> SetFixedLayoutSize(WebCore::IntSize size)
</span></span></pre>
</div>
</div>
</body>
</html>