<!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>[163908] 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/163908">163908</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-11 13:56:24 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Rename screenToWindow to screenToRootView and windowToScreen to rootViewToScreen
https://bugs.webkit.org/show_bug.cgi?id=128575
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-02-11
Reviewed by Darin Adler.
In WebKit2, screenToRootView and rootViewToScreen were named screenToWindow and windowToScreen.
Those names were fine on ports were FrameView correspond to the scrollview, but they do not apply on iOS.
This patch renames screenToWindow and windowToScreen to their more generic WebCore counterpart.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::screenToRootView):
(WebKit::PageClientImpl::rootViewToScreen):
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/API/ios/PageClientImplIOS.h:
* UIProcess/API/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::screenToRootView):
(WebKit::PageClientImpl::rootViewToScreen):
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::screenToRootView):
(WebKit::PageClientImpl::rootViewToScreen):
* UIProcess/CoordinatedGraphics/WebView.cpp:
(WebKit::WebView::screenToRootView):
(WebKit::WebView::rootViewToScreen):
* UIProcess/CoordinatedGraphics/WebView.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::screenToRootView):
(WebKit::WebPageProxy::rootViewToScreen):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::screenToRootView):
(WebKit::WebChromeClient::rootViewToScreen):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::screenToRootView):
(WebKit::WebPage::rootViewToScreen):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:
(-[WKAccessibilityWebPageObject _convertScreenPointToRootView:]):
(-[WKAccessibilityWebPageObject accessibilityAttributeValue:forParameter:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplh">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacPageClientImplh">trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacPageClientImplmm">trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</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="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</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="#trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-02-11 Benjamin Poulain <bpoulain@apple.com>
+
+ [WK2] Rename screenToWindow to screenToRootView and windowToScreen to rootViewToScreen
+ https://bugs.webkit.org/show_bug.cgi?id=128575
+
+ Reviewed by Darin Adler.
+
+ In WebKit2, screenToRootView and rootViewToScreen were named screenToWindow and windowToScreen.
+ Those names were fine on ports were FrameView correspond to the scrollview, but they do not apply on iOS.
+
+ This patch renames screenToWindow and windowToScreen to their more generic WebCore counterpart.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::screenToRootView):
+ (WebKit::PageClientImpl::rootViewToScreen):
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/API/ios/PageClientImplIOS.h:
+ * UIProcess/API/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::screenToRootView):
+ (WebKit::PageClientImpl::rootViewToScreen):
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::screenToRootView):
+ (WebKit::PageClientImpl::rootViewToScreen):
+ * UIProcess/CoordinatedGraphics/WebView.cpp:
+ (WebKit::WebView::screenToRootView):
+ (WebKit::WebView::rootViewToScreen):
+ * UIProcess/CoordinatedGraphics/WebView.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::screenToRootView):
+ (WebKit::WebPageProxy::rootViewToScreen):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::screenToRootView):
+ (WebKit::WebChromeClient::rootViewToScreen):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::screenToRootView):
+ (WebKit::WebPage::rootViewToScreen):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:
+ (-[WKAccessibilityWebPageObject _convertScreenPointToRootView:]):
+ (-[WKAccessibilityWebPageObject accessibilityAttributeValue:forParameter:]):
+
</ins><span class="cx"> 2014-02-11 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] connection:willStopBufferingData: no longer exists in NSURLConnectionDelegate
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> return viewRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint PageClientImpl::screenToWindow(const IntPoint& point)
</del><ins>+IntPoint PageClientImpl::screenToRootView(const IntPoint& point)
</ins><span class="cx"> {
</span><span class="cx"> IntPoint widgetPositionOnScreen = convertWidgetPointToScreenPoint(m_viewWidget, IntPoint());
</span><span class="cx"> IntPoint result(point);
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect PageClientImpl::windowToScreen(const IntRect& rect)
</del><ins>+IntRect PageClientImpl::rootViewToScreen(const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return IntRect(convertWidgetPointToScreenPoint(m_viewWidget, rect.location()), rect.size());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> virtual void executeUndoRedo(WebPageProxy::UndoOrRedo) override;
</span><span class="cx"> virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) override;
</span><span class="cx"> virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) override;
</span><del>- virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) override;
- virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) override;
</del><ins>+ virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) override;
+ virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) override;
</ins><span class="cx"> virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
</span><span class="cx"> virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
</span><span class="cx"> virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> virtual void makeFirstResponder() override;
</span><span class="cx"> virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) override;
</span><span class="cx"> virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) override;
</span><del>- virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) override;
- virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) override;
</del><ins>+ virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) override;
+ virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) override;
</ins><span class="cx"> virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -258,12 +258,12 @@
</span><span class="cx"> return FloatRect();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint PageClientImpl::screenToWindow(const IntPoint& point)
</del><ins>+IntPoint PageClientImpl::screenToRootView(const IntPoint& point)
</ins><span class="cx"> {
</span><span class="cx"> return IntPoint([m_view convertPoint:point fromView:nil]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect PageClientImpl::windowToScreen(const IntRect& rect)
</del><ins>+IntRect PageClientImpl::rootViewToScreen(const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return enclosingIntRect([m_view convertRect:rect toView:nil]);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -97,8 +97,8 @@
</span><span class="cx">
</span><span class="cx"> virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
</span><span class="cx"> virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
</span><del>- virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&);
- virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&);
</del><ins>+ virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&);
+ virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> return [m_wkView _convertToUserSpace:rect];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint PageClientImpl::screenToWindow(const IntPoint& point)
</del><ins>+IntPoint PageClientImpl::screenToRootView(const IntPoint& point)
</ins><span class="cx"> {
</span><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> return IntPoint([m_wkView convertPoint:windowCoord fromView:nil]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect PageClientImpl::windowToScreen(const IntRect& rect)
</del><ins>+IntRect PageClientImpl::rootViewToScreen(const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> NSRect tempRect = rect;
</span><span class="cx"> tempRect = [m_wkView convertRect:tempRect toView:nil];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -407,13 +407,13 @@
</span><span class="cx"> m_undoController.executeUndoRedo(undoOrRedo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint WebView::screenToWindow(const IntPoint& point)
</del><ins>+IntPoint WebView::screenToRootView(const IntPoint& point)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return point;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect WebView::windowToScreen(const IntRect&)
</del><ins>+IntRect WebView::rootViewToScreen(const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return IntRect();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -168,8 +168,8 @@
</span><span class="cx">
</span><span class="cx"> virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) override;
</span><span class="cx"> virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) override;
</span><del>- virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) override;
- virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) override;
</del><ins>+ virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) override;
+ virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void updateTextInputState() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -192,8 +192,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) = 0;
</span><span class="cx"> virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) = 0;
</span><del>- virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) = 0;
- virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) = 0;
</del><ins>+ virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) = 0;
+ virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) = 0;
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -2790,14 +2790,14 @@
</span><span class="cx"> newWindowFrame = m_pageClient.convertToUserSpace(m_uiClient->windowFrame(this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::screenToWindow(const IntPoint& screenPoint, IntPoint& windowPoint)
</del><ins>+void WebPageProxy::screenToRootView(const IntPoint& screenPoint, IntPoint& windowPoint)
</ins><span class="cx"> {
</span><del>- windowPoint = m_pageClient.screenToWindow(screenPoint);
</del><ins>+ windowPoint = m_pageClient.screenToRootView(screenPoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::windowToScreen(const IntRect& viewRect, IntRect& result)
</del><ins>+void WebPageProxy::rootViewToScreen(const IntRect& viewRect, IntRect& result)
</ins><span class="cx"> {
</span><del>- result = m_pageClient.windowToScreen(viewRect);
</del><ins>+ result = m_pageClient.rootViewToScreen(viewRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, bool& shouldClose)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -981,8 +981,8 @@
</span><span class="cx"> void getIsResizable(bool& isResizable);
</span><span class="cx"> void setWindowFrame(const WebCore::FloatRect&);
</span><span class="cx"> void getWindowFrame(WebCore::FloatRect&);
</span><del>- void screenToWindow(const WebCore::IntPoint& screenPoint, WebCore::IntPoint& windowPoint);
- void windowToScreen(const WebCore::IntRect& viewRect, WebCore::IntRect& result);
</del><ins>+ void screenToRootView(const WebCore::IntPoint& screenPoint, WebCore::IntPoint& windowPoint);
+ void rootViewToScreen(const WebCore::IntRect& viewRect, WebCore::IntRect& result);
</ins><span class="cx"> void runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, bool& shouldClose);
</span><span class="cx"> void didChangeViewportProperties(const WebCore::ViewportAttributes&);
</span><span class="cx"> void pageDidScroll();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> GetIsResizable() -> (bool isResizable)
</span><span class="cx"> SetWindowFrame(WebCore::FloatRect windowFrame)
</span><span class="cx"> GetWindowFrame() -> (WebCore::FloatRect windowFrame)
</span><del>- ScreenToWindow(WebCore::IntPoint screenPoint) -> (WebCore::IntPoint windowPoint)
- WindowToScreen(WebCore::IntRect rect) -> (WebCore::IntRect screenFrame)
</del><ins>+ ScreenToRootView(WebCore::IntPoint screenPoint) -> (WebCore::IntPoint windowPoint)
+ RootViewToScreen(WebCore::IntRect rect) -> (WebCore::IntRect screenFrame)
</ins><span class="cx"> RunBeforeUnloadConfirmPanel(String message, uint64_t frameID) -> (bool shouldClose)
</span><span class="cx"> PageDidScroll()
</span><span class="cx"> RunOpenPanel(uint64_t frameID, WebCore::FileChooserSettings parameters)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -472,12 +472,12 @@
</span><span class="cx">
</span><span class="cx"> IntPoint WebChromeClient::screenToRootView(const IntPoint& point) const
</span><span class="cx"> {
</span><del>- return m_page->screenToWindow(point);
</del><ins>+ return m_page->screenToRootView(point);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect WebChromeClient::rootViewToScreen(const IntRect& rect) const
</span><span class="cx"> {
</span><del>- return m_page->windowToScreen(rect);
</del><ins>+ return m_page->rootViewToScreen(rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PlatformPageClient WebChromeClient::platformPageClient() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -2163,17 +2163,17 @@
</span><span class="cx"> m_page->resumeActiveDOMObjectsAndAnimations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint WebPage::screenToWindow(const IntPoint& point)
</del><ins>+IntPoint WebPage::screenToRootView(const IntPoint& point)
</ins><span class="cx"> {
</span><span class="cx"> IntPoint windowPoint;
</span><del>- sendSync(Messages::WebPageProxy::ScreenToWindow(point), Messages::WebPageProxy::ScreenToWindow::Reply(windowPoint));
</del><ins>+ sendSync(Messages::WebPageProxy::ScreenToRootView(point), Messages::WebPageProxy::ScreenToRootView::Reply(windowPoint));
</ins><span class="cx"> return windowPoint;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect WebPage::windowToScreen(const IntRect& rect)
</del><ins>+IntRect WebPage::rootViewToScreen(const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect screenRect;
</span><del>- sendSync(Messages::WebPageProxy::WindowToScreen(rect), Messages::WebPageProxy::WindowToScreen::Reply(screenRect));
</del><ins>+ sendSync(Messages::WebPageProxy::RootViewToScreen(rect), Messages::WebPageProxy::RootViewToScreen::Reply(screenRect));
</ins><span class="cx"> return screenRect;
</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 (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -404,8 +404,8 @@
</span><span class="cx"> void showPageBanners();
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><del>- WebCore::IntPoint screenToWindow(const WebCore::IntPoint&);
- WebCore::IntRect windowToScreen(const WebCore::IntRect&);
</del><ins>+ WebCore::IntPoint screenToRootView(const WebCore::IntPoint&);
+ WebCore::IntRect rootViewToScreen(const WebCore::IntRect&);
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<WebImage> scaledSnapshotWithOptions(const WebCore::IntRect&, double scaleFactor, SnapshotOptions);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm (163907 => 163908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm 2014-02-11 21:50:21 UTC (rev 163907)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm 2014-02-11 21:56:24 UTC (rev 163908)
</span><span class="lines">@@ -188,9 +188,9 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSPoint)_convertScreenPointToWindow:(NSPoint)point
</del><ins>+- (NSPoint)_convertScreenPointToRootView:(NSPoint)point
</ins><span class="cx"> {
</span><del>- return m_page->screenToWindow(IntPoint(point.x, point.y));
</del><ins>+ return m_page->screenToRootView(IntPoint(point.x, point.y));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)accessibilityAttributeValue:(NSString *)attribute forParameter:(id)parameter
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> WKRetainPtr<WKTypeRef> pageOverlayParameter = 0;
</span><span class="cx">
</span><span class="cx"> if ([parameter isKindOfClass:[NSValue class]] && strcmp([(NSValue*)parameter objCType], @encode(NSPoint)) == 0) {
</span><del>- NSPoint point = [self _convertScreenPointToWindow:[(NSValue *)parameter pointValue]];
</del><ins>+ NSPoint point = [self _convertScreenPointToRootView:[(NSValue *)parameter pointValue]];
</ins><span class="cx"> pageOverlayParameter = WKPointCreate(WKPointMake(point.x, point.y));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>