<!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>[170373] trunk/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/170373">170373</a></dd>
<dt>Author</dt> <dd>mhock@apple.com</dd>
<dt>Date</dt> <dd>2014-06-24 10:44:48 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.
Also, revert <a href="http://trac.webkit.org/projects/webkit/changeset/169281">r169281</a>.
https://bugs.webkit.org/show_bug.cgi?id=134233
<rdar://problem/17060183>
Reviewed by Benjamin Poulain.
Source/WebCore:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::outerHeight):
(WebCore::DOMWindow::outerWidth):
Source/WebKit2:
* UIProcess/Cocoa/UIDelegate.h:
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::UIClient::windowFrame): Deleted.
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::convertToUserSpace):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegateh">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegatemm">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170372 => 170373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebCore/ChangeLog 2014-06-24 17:44:48 UTC (rev 170373)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-24 Martin Hock <mhock@apple.com>
+
+ [iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.
+ Also, revert r169281.
+ https://bugs.webkit.org/show_bug.cgi?id=134233
+ <rdar://problem/17060183>
+
+ Reviewed by Benjamin Poulain.
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::outerHeight):
+ (WebCore::DOMWindow::outerWidth):
+
</ins><span class="cx"> 2014-06-24 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't set AudioSession active while interrupted.
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (170372 => 170373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-06-24 17:44:48 UTC (rev 170373)
</span><span class="lines">@@ -1156,6 +1156,9 @@
</span><span class="cx">
</span><span class="cx"> int DOMWindow::outerHeight() const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ return 0;
+#else
</ins><span class="cx"> if (!m_frame)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -1164,10 +1167,14 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> return static_cast<int>(page->chrome().windowRect().height());
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int DOMWindow::outerWidth() const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ return 0;
+#else
</ins><span class="cx"> if (!m_frame)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -1176,6 +1183,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> return static_cast<int>(page->chrome().windowRect().width());
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int DOMWindow::innerHeight() const
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170372 => 170373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-24 17:44:48 UTC (rev 170373)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-06-24 Martin Hock <mhock@apple.com>
+
+ [iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.
+ Also, revert r169281.
+ https://bugs.webkit.org/show_bug.cgi?id=134233
+ <rdar://problem/17060183>
+
+ Reviewed by Benjamin Poulain.
+
+ * UIProcess/Cocoa/UIDelegate.h:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::UIClient::windowFrame): Deleted.
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::convertToUserSpace):
+
</ins><span class="cx"> 2014-06-24 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Initialize WKWebViewConfiguration properties to their default values.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (170372 => 170373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2014-06-24 17:44:48 UTC (rev 170373)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) override;
</span><span class="cx"> virtual void didNotHandleTapAsClick(const WebCore::IntPoint&) override;
</span><del>- virtual WebCore::FloatRect windowFrame(WebKit::WebPageProxy*) override;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> UIDelegate& m_uiDelegate;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (170372 => 170373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2014-06-24 17:44:48 UTC (rev 170373)
</span><span class="lines">@@ -252,17 +252,6 @@
</span><span class="cx">
</span><span class="cx"> [static_cast<id <WKUIDelegatePrivate>>(delegate) _webView:m_uiDelegate.m_webView didNotHandleTapAsClickAtPoint:point];
</span><span class="cx"> }
</span><del>-
-WebCore::FloatRect UIDelegate::UIClient::windowFrame(WebKit::WebPageProxy*)
-{
- if (!m_uiDelegate.m_webView)
- return WebCore::FloatRect();
-
- if (UIWindow* window = m_uiDelegate.m_webView.window)
- return WebCore::enclosingIntRect(window.frame);
-
- return WebCore::enclosingIntRect(m_uiDelegate.m_webView.bounds);
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (170372 => 170373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-06-24 17:44:48 UTC (rev 170373)
</span><span class="lines">@@ -317,7 +317,8 @@
</span><span class="cx">
</span><span class="cx"> FloatRect PageClientImpl::convertToUserSpace(const FloatRect& rect)
</span><span class="cx"> {
</span><del>- return rect;
</del><ins>+ notImplemented();
+ return FloatRect();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntPoint PageClientImpl::screenToRootView(const IntPoint& point)
</span></span></pre>
</div>
</div>
</body>
</html>