<!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>[165580] tags/Safari-538.23/Source</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/165580">165580</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-03-13 17:40:30 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/165577">r165577</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari53823SourceWebCoreChangeLog">tags/Safari-538.23/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari53823SourceWebCoredomDocumentcpp">tags/Safari-538.23/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#tagsSafari53823SourceWebCoredomViewportArgumentscpp">tags/Safari-538.23/Source/WebCore/dom/ViewportArguments.cpp</a></li>
<li><a href="#tagsSafari53823SourceWebCoredomViewportArgumentsh">tags/Safari-538.23/Source/WebCore/dom/ViewportArguments.h</a></li>
<li><a href="#tagsSafari53823SourceWebCorepageChromeClienth">tags/Safari-538.23/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#tagsSafari53823SourceWebKitiosChangeLog">tags/Safari-538.23/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#tagsSafari53823SourceWebKitiosWebCoreSupportWebChromeClientIOSh">tags/Safari-538.23/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h</a></li>
<li><a href="#tagsSafari53823SourceWebKitiosWebCoreSupportWebChromeClientIOSmm">tags/Safari-538.23/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm</a></li>
<li><a href="#tagsSafari53823SourceWebKit2ChangeLog">tags/Safari-538.23/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari53823SourceWebKit2SharedWebPageCreationParameterscpp">tags/Safari-538.23/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#tagsSafari53823SourceWebKit2SharedWebPageCreationParametersh">tags/Safari-538.23/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#tagsSafari53823SourceWebKit2UIProcessWebPageProxycpp">tags/Safari-538.23/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#tagsSafari53823SourceWebKit2UIProcessWebPageProxyh">tags/Safari-538.23/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#tagsSafari53823SourceWebKit2UIProcessiosWebPageProxyIOSmm">tags/Safari-538.23/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#tagsSafari53823SourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">tags/Safari-538.23/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#tagsSafari53823SourceWebKit2WebProcessWebCoreSupportWebChromeClienth">tags/Safari-538.23/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#tagsSafari53823SourceWebKit2WebProcessWebPageWebPagecpp">tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#tagsSafari53823SourceWebKit2WebProcessWebPageWebPageh">tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#tagsSafari53823SourceWebKit2WebProcessWebPageiosWebPageIOSmm">tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari53823SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebCore/ChangeLog (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebCore/ChangeLog 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebCore/ChangeLog 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-03-13 Lucas Forschler <lforschler@apple.com>
+
+ Merge r165577
+
+ 2014-03-13 Benjamin Poulain <bpoulain@apple.com>
+
+ The viewport code should not depend on WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=130218
+
+ Reviewed by Tim Horton.
+
+ The viewport code cannot be generalized to other ports because it relies
+ on WebKit system interface to get the device screen size.
+ This patch fixes that by going through ChromeClient to get the data.
+
+ * dom/Document.cpp:
+ (WebCore::Document::processViewport):
+ Get the screensize from chrome client.
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::computeViewportAttributes):
+ This is dead code. Nothing should ever use computeViewportAttributes().
+
+ (WebCore::finalizeViewportArguments):
+ * dom/ViewportArguments.h:
+ * page/ChromeClient.h:
+ (WebCore::ChromeClient::viewportScreenSize):
+
</ins><span class="cx"> 2014-03-12 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Replay: add infrastructure for memoizing nondeterministic DOM APIs
</span></span></pre></div>
<a id="tagsSafari53823SourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebCore/dom/Document.cpp (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebCore/dom/Document.cpp 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebCore/dom/Document.cpp 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -2940,7 +2940,8 @@
</span><span class="cx"> // Moving to ToT's implementation would mean calling findConfigurationForViewportData, which does
</span><span class="cx"> // bounds checking and determining concrete values for ValueAuto which we already do in UIKit.
</span><span class="cx"> // To maintain old behavior, we just need to update a few values, leaving Auto's for UIKit.
</span><del>- finalizeViewportArguments(m_viewportArguments);
</del><ins>+ if (Page* page = this->page())
+ finalizeViewportArguments(m_viewportArguments, page->chrome().client().viewportScreenSize());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> updateViewportArguments();
</span></span></pre></div>
<a id="tagsSafari53823SourceWebCoredomViewportArgumentscpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebCore/dom/ViewportArguments.cpp (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebCore/dom/ViewportArguments.cpp 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebCore/dom/ViewportArguments.cpp 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -34,10 +34,6 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ScriptableDocumentParser.h"
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#include "WebCoreSystemInterface.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="lines">@@ -264,13 +260,6 @@
</span><span class="cx">
</span><span class="cx"> ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, float devicePixelRatio, IntSize visibleViewport)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
- // FIXME: This should probably be fixed elsewhere on iOS. iOS may only use computeViewportAttributes for tests.
- CGSize screenSize = wkGetViewportScreenSize();
- visibleViewport.setWidth(screenSize.width);
- visibleViewport.setHeight(screenSize.height);
-#endif
-
</del><span class="cx"> FloatSize initialViewportSize = convertToUserSpace(visibleViewport, devicePixelRatio);
</span><span class="cx"> FloatSize deviceSize = convertToUserSpace(FloatSize(deviceWidth, deviceHeight), devicePixelRatio);
</span><span class="cx">
</span><span class="lines">@@ -413,19 +402,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-void finalizeViewportArguments(ViewportArguments& arguments)
</del><ins>+void finalizeViewportArguments(ViewportArguments& arguments, const FloatSize& screenSize)
</ins><span class="cx"> {
</span><del>- CGSize screenSize = wkGetViewportScreenSize();
-
</del><span class="cx"> if (arguments.width == ViewportArguments::ValueDeviceWidth)
</span><del>- arguments.width = screenSize.width;
</del><ins>+ arguments.width = screenSize.width();
</ins><span class="cx"> else if (arguments.width == ViewportArguments::ValueDeviceHeight)
</span><del>- arguments.width = screenSize.height;
</del><ins>+ arguments.width = screenSize.height();
</ins><span class="cx">
</span><span class="cx"> if (arguments.height == ViewportArguments::ValueDeviceWidth)
</span><del>- arguments.height = screenSize.width;
</del><ins>+ arguments.height = screenSize.width();
</ins><span class="cx"> else if (arguments.height == ViewportArguments::ValueDeviceHeight)
</span><del>- arguments.height = screenSize.height;
</del><ins>+ arguments.height = screenSize.height();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari53823SourceWebCoredomViewportArgumentsh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebCore/dom/ViewportArguments.h (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebCore/dom/ViewportArguments.h 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebCore/dom/ViewportArguments.h 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> void reportViewportWarning(Document*, ViewportErrorCode, const String& replacement1, const String& replacement2);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-void finalizeViewportArguments(ViewportArguments&);
</del><ins>+void finalizeViewportArguments(ViewportArguments&, const FloatSize& screenSize);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="tagsSafari53823SourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebCore/page/ChromeClient.h (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebCore/page/ChromeClient.h 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebCore/page/ChromeClient.h 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -176,6 +176,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> // End methods used by HostWindow.
</span><span class="cx">
</span><ins>+ virtual FloatSize viewportScreenSize() const { return const_cast<ChromeClient*>(this)->windowRect().size(); }
</ins><span class="cx"> virtual void dispatchViewportPropertiesDidChange(const ViewportArguments&) const { }
</span><span class="cx">
</span><span class="cx"> virtual void contentsSizeChanged(Frame*, const IntSize&) const = 0;
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit/ios/ChangeLog (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit/ios/ChangeLog 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit/ios/ChangeLog 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-13 Lucas Forschler <lforschler@apple.com>
+
+ Merge r165577
+
+ 2014-03-13 Benjamin Poulain <bpoulain@apple.com>
+
+ The viewport code should not depend on WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=130218
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebChromeClientIOS.h:
+ * WebCoreSupport/WebChromeClientIOS.mm:
+ (WebChromeClientIOS::viewportScreenSize):
+ Get the viewport size from WebKitSystemInterface.
+
</ins><span class="cx"> 2014-03-12 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Incorrect reference counting of Range in WebFrame.
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKitiosWebCoreSupportWebChromeClientIOSh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> virtual void setNeedsScrollNotifications(WebCore::Frame*, bool) override;
</span><span class="cx"> virtual void observedContentChange(WebCore::Frame*) override;
</span><span class="cx"> virtual void clearContentChangeObservers(WebCore::Frame*) override;
</span><ins>+ virtual WebCore::FloatSize viewportScreenSize() const override;
</ins><span class="cx"> virtual void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const override;
</span><span class="cx"> virtual void notifyRevealedSelectionByScrollingFrame(WebCore::Frame*) override;
</span><span class="cx"> virtual bool isStopping() override;
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKitiosWebCoreSupportWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -60,6 +60,10 @@
</span><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadMessage.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#include "WebKitSystemInterface.h"
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> void WebChromeClientIOS::setWindowRect(const WebCore::FloatRect& r)
</span><span class="lines">@@ -167,6 +171,11 @@
</span><span class="cx"> @"minimal-ui":@(arguments.minimalUI) };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FloatSize WebChromeClientIOS::viewportScreenSize() const
+{
+ return FloatSize(WKGetViewportScreenSize());
+}
+
</ins><span class="cx"> void WebChromeClientIOS::dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments& arguments) const
</span><span class="cx"> {
</span><span class="cx"> [[webView() _UIKitDelegateForwarder] webView:webView() didReceiveViewportArguments:dictionaryForViewportArguments(arguments)];
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/ChangeLog (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/ChangeLog 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/ChangeLog 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-03-13 Lucas Forschler <lforschler@apple.com>
+
+ Merge r165577
+
+ 2014-03-13 Benjamin Poulain <bpoulain@apple.com>
+
+ The viewport code should not depend on WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=130218
+
+ Reviewed by Tim Horton.
+
+ Get the viewport size from the UIProcess when creating a new WebProcess.
+ From there, the value is stored in WebPage and used whenever we need to update
+ the viewport parameters.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::viewportScreenSize):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::viewportScreenSize):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::viewportScreenSize):
+
</ins><span class="cx"> 2014-03-12 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] WebKit1 + WebKit2 iOS clients should check load policy
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/Shared/WebPageCreationParameters.cpp (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -66,6 +66,9 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> encoder << colorSpace;
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(IOS)
+ encoder << viewportScreenSize;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCreationParameters& parameters)
</span><span class="lines">@@ -134,6 +137,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ if (!decoder.decode(parameters.viewportScreenSize))
+ return false;
+#endif
+
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/Shared/WebPageCreationParameters.h (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "WebPageGroupData.h"
</span><span class="cx"> #include "WebPreferencesStore.h"
</span><span class="cx"> #include <WebCore/Color.h>
</span><ins>+#include <WebCore/FloatSize.h>
</ins><span class="cx"> #include <WebCore/IntSize.h>
</span><span class="cx"> #include <WebCore/Pagination.h>
</span><span class="cx"> #include <WebCore/ScrollTypes.h>
</span><span class="lines">@@ -105,6 +106,9 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> ColorSpaceData colorSpace;
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(IOS)
+ WebCore::FloatSize viewportScreenSize;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/UIProcess/WebPageProxy.cpp (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -4012,6 +4012,9 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> parameters.colorSpace = m_pageClient.colorSpace();
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(IOS)
+ parameters.viewportScreenSize = viewportScreenSize();
+#endif
</ins><span class="cx">
</span><span class="cx"> return parameters;
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/UIProcess/WebPageProxy.h (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/UIProcess/WebPageProxy.h 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/UIProcess/WebPageProxy.h 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -1184,6 +1184,8 @@
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ WebCore::FloatSize viewportScreenSize();
+
</ins><span class="cx"> void didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color& color, const Vector<WebCore::FloatQuad>& geometries, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius);
</span><span class="cx">
</span><span class="cx"> void startAssistingNode(const AssistedNodeInformation&);
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -493,6 +493,11 @@
</span><span class="cx"> process().send(Messages::WebPage::BlurAssistedNode(), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FloatSize WebPageProxy::viewportScreenSize()
+{
+ return FloatSize(WKGetViewportScreenSize());
+}
+
</ins><span class="cx"> void WebPageProxy::didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color& color, const Vector<WebCore::FloatQuad>& highlightedQuads, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius)
</span><span class="cx"> {
</span><span class="cx"> m_pageClient.didGetTapHighlightGeometries(requestID, color, highlightedQuads, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -841,6 +841,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+FloatSize WebChromeClient::viewportScreenSize() const
+{
+ return m_page->viewportScreenSize();
+}
+#endif
+
</ins><span class="cx"> void WebChromeClient::dispatchViewportPropertiesDidChange(const ViewportArguments& viewportArguments) const
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(viewportArguments);
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -248,7 +248,10 @@
</span><span class="cx">
</span><span class="cx"> virtual void enableSuddenTermination() override;
</span><span class="cx"> virtual void disableSuddenTermination() override;
</span><del>-
</del><ins>+
+#if PLATFORM(IOS)
+ virtual WebCore::FloatSize viewportScreenSize() const override;
+#endif
</ins><span class="cx"> virtual void dispatchViewportPropertiesDidChange(const WebCore::ViewportArguments&) const override;
</span><span class="cx">
</span><span class="cx"> virtual void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&) override;
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -285,6 +285,7 @@
</span><span class="cx"> , m_lastVisibleContentRectUpdateID(0)
</span><span class="cx"> , m_scaleWasSetByUIProcess(false)
</span><span class="cx"> , m_userHasChangedPageScaleFactor(false)
</span><ins>+ , m_viewportScreenSize(parameters.viewportScreenSize)
</ins><span class="cx"> #endif
</span><span class="cx"> , m_inspectorClient(0)
</span><span class="cx"> , m_backgroundColor(Color::white)
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/WebPage.h (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -431,6 +431,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ WebCore::FloatSize viewportScreenSize() const;
</ins><span class="cx"> void viewportPropertiesDidChange(const WebCore::ViewportArguments&);
</span><span class="cx"> void didReceiveMobileDocType(bool);
</span><span class="cx">
</span><span class="lines">@@ -1102,6 +1103,7 @@
</span><span class="cx"> uint64_t m_lastVisibleContentRectUpdateID;
</span><span class="cx"> bool m_scaleWasSetByUIProcess;
</span><span class="cx"> bool m_userHasChangedPageScaleFactor;
</span><ins>+ WebCore::FloatSize m_viewportScreenSize;
</ins><span class="cx"> WebCore::IntSize m_blockSelectionDesiredSize;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari53823SourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (165579 => 165580)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-14 00:31:18 UTC (rev 165579)
+++ tags/Safari-538.23/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-14 00:40:30 UTC (rev 165580)
</span><span class="lines">@@ -115,6 +115,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FloatSize WebPage::viewportScreenSize() const
+{
+ return m_viewportScreenSize;
+}
+
</ins><span class="cx"> void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArguments)
</span><span class="cx"> {
</span><span class="cx"> m_viewportConfiguration.setViewportArguments(viewportArguments);
</span></span></pre>
</div>
</div>
</body>
</html>