<!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>[194911] branches/safari-601.1.46-branch</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/194911">194911</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-12 11:31:33 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194667">r194667</a>. rdar://problem/24074334</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCorepageFrameViewcpp">branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorepageFrameViewh">branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKitmacChangeLog">branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKitmacWebViewWebViewmm">branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (194910 => 194911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-12 19:31:29 UTC (rev 194910)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-12 19:31:33 UTC (rev 194911)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194667. rdar://problem/24074334
+
+ 2016-01-06 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Revert overflow:hidden on the body affecting viewport scale (r186786)
+ https://bugs.webkit.org/show_bug.cgi?id=152803
+ rdar://problem/22242515
+
+ Reviewed by Tim Horton.
+
+ Keep the tests, but update their expected results.
+
+ * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-expected.txt:
+ * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall-expected.txt:
+ * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-expected.txt:
+
+2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194666. rdar://problem/24101185
</span><span class="cx">
</span><span class="cx"> 2016-01-06 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (194910 => 194911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-12 19:31:29 UTC (rev 194910)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-12 19:31:33 UTC (rev 194911)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194667. rdar://problem/24074334
+
+ 2016-01-06 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Revert overflow:hidden on the body affecting viewport scale (r186786)
+ https://bugs.webkit.org/show_bug.cgi?id=152803
+ rdar://problem/22242515
+
+ Reviewed by Tim Horton.
+
+ You can't assume that if an author uses overflow:hidden on the body, they have no
+ content outside the body that is important. Sites like Google Translate put
+ abspos elements outside the body.
+
+ So revert the change.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::contentsSizeRespectingOverflow): Deleted.
+ * page/FrameView.h:
+
+2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194666. rdar://problem/24101185
</span><span class="cx">
</span><span class="cx"> 2016-01-06 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.cpp (194910 => 194911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.cpp 2016-01-12 19:31:29 UTC (rev 194910)
+++ branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.cpp 2016-01-12 19:31:33 UTC (rev 194911)
</span><span class="lines">@@ -616,30 +616,6 @@
</span><span class="cx"> setContentsSize(size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntSize FrameView::contentsSizeRespectingOverflow() const
-{
- RenderView* renderView = this->renderView();
- auto* viewportRenderer = this->viewportRenderer();
- if (!renderView || !is<RenderBox>(viewportRenderer) || !frame().isMainFrame())
- return contentsSize();
-
- ASSERT(frame().view() == this);
-
- FloatRect contentRect = renderView->unscaledDocumentRect();
- RenderBox& viewportRendererBox = downcast<RenderBox>(*viewportRenderer);
-
- if (viewportRendererBox.style().overflowX() == OHIDDEN)
- contentRect.setWidth(std::min<float>(contentRect.width(), viewportRendererBox.frameRect().width()));
-
- if (viewportRendererBox.style().overflowY() == OHIDDEN)
- contentRect.setHeight(std::min<float>(contentRect.height(), viewportRendererBox.frameRect().height()));
-
- if (renderView->hasTransform())
- contentRect = renderView->layer()->currentTransform().mapRect(contentRect);
-
- return IntSize(contentRect.size());
-}
-
</del><span class="cx"> void FrameView::applyOverflowToViewport(const RenderElement& renderer, ScrollbarMode& hMode, ScrollbarMode& vMode)
</span><span class="cx"> {
</span><span class="cx"> // Handle the overflow:hidden/scroll case for the body/html elements. WinIE treats
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.h (194910 => 194911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.h 2016-01-12 19:31:29 UTC (rev 194910)
+++ branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.h 2016-01-12 19:31:33 UTC (rev 194911)
</span><span class="lines">@@ -105,8 +105,6 @@
</span><span class="cx"> virtual void setContentsSize(const IntSize&) override;
</span><span class="cx"> virtual void updateContentsSize() override;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT IntSize contentsSizeRespectingOverflow() const;
-
</del><span class="cx"> void layout(bool allowSubtree = true);
</span><span class="cx"> WEBCORE_EXPORT bool didFirstLayout() const;
</span><span class="cx"> void layoutTimerFired();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog (194910 => 194911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog 2016-01-12 19:31:29 UTC (rev 194910)
+++ branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog 2016-01-12 19:31:33 UTC (rev 194911)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r194667. rdar://problem/24074334
+
+ 2016-01-06 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Revert overflow:hidden on the body affecting viewport scale (r186786)
+ https://bugs.webkit.org/show_bug.cgi?id=152803
+ rdar://problem/22242515
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebView.mm:
+ (-[WebView _contentsSizeRespectingOverflow]): Keep this function which is used
+ by UIKit, but change the implementation to just return the document size.
+
</ins><span class="cx"> 2015-12-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r193997. rdar://problem/23814333
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm (194910 => 194911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm 2016-01-12 19:31:29 UTC (rev 194910)
+++ branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm 2016-01-12 19:31:33 UTC (rev 194911)
</span><span class="lines">@@ -1562,11 +1562,9 @@
</span><span class="cx"> return _private->page->renderTreeSize();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: This is incorrectly named, and should be removed <rdar://problem/22242515>.
</ins><span class="cx"> - (NSSize)_contentsSizeRespectingOverflow
</span><span class="cx"> {
</span><del>- if (FrameView* view = [self _mainCoreFrame]->view())
- return view->contentsSizeRespectingOverflow();
-
</del><span class="cx"> return [[[[self mainFrame] frameView] documentView] bounds].size;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (194910 => 194911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-12 19:31:29 UTC (rev 194910)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-12 19:31:33 UTC (rev 194911)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r194667. rdar://problem/24074334
+
+ 2016-01-06 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Revert overflow:hidden on the body affecting viewport scale (r186786)
+ https://bugs.webkit.org/show_bug.cgi?id=152803
+ rdar://problem/22242515
+
+ Reviewed by Tim Horton.
+
+ You can't assume that if an author uses overflow:hidden on the body, they have no
+ content outside the body that is important. Sites like Google Translate put
+ abspos elements outside the body.
+
+ So revert the change.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::mainFrameDidLayout): Go back to using contents size.
+
</ins><span class="cx"> 2016-01-07 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r194557. rdar://problem/24042908
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (194910 => 194911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-01-12 19:31:29 UTC (rev 194910)
+++ branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-01-12 19:31:33 UTC (rev 194911)
</span><span class="lines">@@ -3511,7 +3511,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (FrameView* frameView = mainFrameView()) {
</span><del>- IntSize newContentSize = frameView->contentsSizeRespectingOverflow();
</del><ins>+ IntSize newContentSize = frameView->contentsSize();
</ins><span class="cx"> if (m_viewportConfiguration.setContentsSize(newContentSize))
</span><span class="cx"> viewportConfigurationChanged();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>