Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (194910 => 194911)
--- 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)
@@ -1,5 +1,23 @@
2016-01-11 Matthew Hanson <matthew_han...@apple.com>
+ Merge r194667. rdar://problem/24074334
+
+ 2016-01-06 Simon Fraser <simon.fra...@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_han...@apple.com>
+
Merge r194666. rdar://problem/24101185
2016-01-06 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (194910 => 194911)
--- 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)
@@ -1,5 +1,27 @@
2016-01-11 Matthew Hanson <matthew_han...@apple.com>
+ Merge r194667. rdar://problem/24074334
+
+ 2016-01-06 Simon Fraser <simon.fra...@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_han...@apple.com>
+
Merge r194666. rdar://problem/24101185
2016-01-06 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.cpp (194910 => 194911)
--- 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)
@@ -616,30 +616,6 @@
setContentsSize(size);
}
-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());
-}
-
void FrameView::applyOverflowToViewport(const RenderElement& renderer, ScrollbarMode& hMode, ScrollbarMode& vMode)
{
// Handle the overflow:hidden/scroll case for the body/html elements. WinIE treats
Modified: branches/safari-601.1.46-branch/Source/WebCore/page/FrameView.h (194910 => 194911)
--- 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)
@@ -105,8 +105,6 @@
virtual void setContentsSize(const IntSize&) override;
virtual void updateContentsSize() override;
- WEBCORE_EXPORT IntSize contentsSizeRespectingOverflow() const;
-
void layout(bool allowSubtree = true);
WEBCORE_EXPORT bool didFirstLayout() const;
void layoutTimerFired();
Modified: branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog (194910 => 194911)
--- 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)
@@ -1,3 +1,19 @@
+2016-01-11 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r194667. rdar://problem/24074334
+
+ 2016-01-06 Simon Fraser <simon.fra...@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.
+
2015-12-14 Matthew Hanson <matthew_han...@apple.com>
Merge r193997. rdar://problem/23814333
Modified: branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm (194910 => 194911)
--- 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)
@@ -1562,11 +1562,9 @@
return _private->page->renderTreeSize();
}
+// FIXME: This is incorrectly named, and should be removed <rdar://problem/22242515>.
- (NSSize)_contentsSizeRespectingOverflow
{
- if (FrameView* view = [self _mainCoreFrame]->view())
- return view->contentsSizeRespectingOverflow();
-
return [[[[self mainFrame] frameView] documentView] bounds].size;
}
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (194910 => 194911)
--- 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)
@@ -1,3 +1,24 @@
+2016-01-11 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r194667. rdar://problem/24074334
+
+ 2016-01-06 Simon Fraser <simon.fra...@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.
+
2016-01-07 Matthew Hanson <matthew_han...@apple.com>
Merge r194557. rdar://problem/24042908
Modified: branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (194910 => 194911)
--- 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)
@@ -3511,7 +3511,7 @@
#endif
#if PLATFORM(IOS)
if (FrameView* frameView = mainFrameView()) {
- IntSize newContentSize = frameView->contentsSizeRespectingOverflow();
+ IntSize newContentSize = frameView->contentsSize();
if (m_viewportConfiguration.setContentsSize(newContentSize))
viewportConfigurationChanged();
}
