Changeset 194667 in webkit


Ignore:
Timestamp:
Jan 6, 2016, 2:08:43 PM (9 years ago)
Author:
Simon Fraser
Message:

[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.
Source/WebCore:

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:

Source/WebKit/mac:

  • WebView/WebView.mm:

(-[WebView _contentsSizeRespectingOverflow]): Keep this function which is used
by UIKit, but change the implementation to just return the document size.

Source/WebKit2:

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.

LayoutTests:

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:
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r194666 r194667  
     12016-01-06  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS] Revert overflow:hidden on the body affecting viewport scale (r186786)
     4        https://bugs.webkit.org/show_bug.cgi?id=152803
     5        rdar://problem/22242515
     6
     7        Reviewed by Tim Horton.
     8       
     9        Keep the tests, but update their expected results.
     10
     11        * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-expected.txt:
     12        * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall-expected.txt:
     13        * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-expected.txt:
     14
    1152016-01-06  Brent Fulgham  <bfulgham@apple.com>
    216

  • trunk/LayoutTests/platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-expected.txt

    r194129 r194667  
    11Viewport: width=device-width
    22
    3 scale   5.00000
     3scale   1.00000
    44maxScale        5.00000
    5 minScale        5.00000
    6 visibleRect     {"left":"0.00000","top":"0.00000","width":"64.00000","height":"96.00000"}
     5minScale        1.00000
     6visibleRect     {"left":"0.00000","top":"0.00000","width":"320.00000","height":"480.00000"}
    77

  • trunk/LayoutTests/platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall-expected.txt

    r194129 r194667  
    11Viewport: width=device-width
    22
    3 scale   1.05263
     3scale   0.46875
    44maxScale        5.00000
    5 minScale        1.05263
    6 visibleRect     {"left":"0.00000","top":"0.00000","width":"303.99999","height":"455.99998"}
     5minScale        0.46875
     6visibleRect     {"left":"0.00000","top":"0.00000","width":"682.66667","height":"1024.00000"}
    77

  • trunk/LayoutTests/platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-expected.txt

    r194129 r194667  
    11Viewport: width=device-width
    22
    3 scale   0.31746
     3scale   1.00000
    44maxScale        5.00000
    5 minScale        0.31746
    6 visibleRect     {"left":"0.00000","top":"0.00000","width":"1007.99997","height":"1511.99995"}
     5minScale        1.00000
     6visibleRect     {"left":"0.00000","top":"0.00000","width":"320.00000","height":"480.00000"}
    77

  • trunk/Source/WebCore/ChangeLog

    r194666 r194667  
     12016-01-06  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS] Revert overflow:hidden on the body affecting viewport scale (r186786)
     4        https://bugs.webkit.org/show_bug.cgi?id=152803
     5        rdar://problem/22242515
     6
     7        Reviewed by Tim Horton.
     8
     9        You can't assume that if an author uses overflow:hidden on the body, they have no
     10        content outside the body that is important. Sites like Google Translate put
     11        abspos elements outside the body.
     12       
     13        So revert the change.
     14
     15        * page/FrameView.cpp:
     16        (WebCore::FrameView::contentsSizeRespectingOverflow): Deleted.
     17        * page/FrameView.h:
     18
    1192016-01-06  Brent Fulgham  <bfulgham@apple.com>
    220

  • trunk/Source/WebCore/page/FrameView.cpp

    r194496 r194667  
    647647}
    648648
    649 IntSize FrameView::contentsSizeRespectingOverflow() const
    650 {
    651     RenderView* renderView = this->renderView();
    652     auto* viewportRenderer = this->viewportRenderer();
    653     if (!renderView || !is<RenderBox>(viewportRenderer) || !frame().isMainFrame())
    654         return contentsSize();
    655 
    656     ASSERT(frame().view() == this);
    657 
    658     FloatRect contentRect = renderView->unscaledDocumentRect();
    659     RenderBox& viewportRendererBox = downcast<RenderBox>(*viewportRenderer);
    660 
    661     if (viewportRendererBox.style().overflowX() == OHIDDEN)
    662         contentRect.setWidth(std::min<float>(contentRect.width(), viewportRendererBox.frameRect().width()));
    663 
    664     if (viewportRendererBox.style().overflowY() == OHIDDEN)
    665         contentRect.setHeight(std::min<float>(contentRect.height(), viewportRendererBox.frameRect().height()));
    666 
    667     if (renderView->hasTransform())
    668         contentRect = renderView->layer()->currentTransform().mapRect(contentRect);
    669 
    670     return IntSize(contentRect.size());
    671 }
    672 
    673649void FrameView::applyOverflowToViewport(const RenderElement& renderer, ScrollbarMode& hMode, ScrollbarMode& vMode)
    674650{

  • trunk/Source/WebCore/page/FrameView.h

    r194463 r194667  
    106106    virtual void updateContentsSize() override;
    107107
    108     WEBCORE_EXPORT IntSize contentsSizeRespectingOverflow() const;
    109 
    110108    void layout(bool allowSubtree = true);
    111109    WEBCORE_EXPORT bool didFirstLayout() const;

  • trunk/Source/WebKit/mac/ChangeLog

    r194559 r194667  
     12016-01-06  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS] Revert overflow:hidden on the body affecting viewport scale (r186786)
     4        https://bugs.webkit.org/show_bug.cgi?id=152803
     5        rdar://problem/22242515
     6
     7        Reviewed by Tim Horton.
     8
     9        * WebView/WebView.mm:
     10        (-[WebView _contentsSizeRespectingOverflow]): Keep this function which is used
     11        by UIKit, but change the implementation to just return the document size.
     12
    1132016-01-04  Tim Horton  <timothy_horton@apple.com>
    214

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r194496 r194667  
    15681568}
    15691569
     1570// FIXME: This is incorrectly named, and should be removed <rdar://problem/22242515>.
    15701571- (NSSize)_contentsSizeRespectingOverflow
    15711572{
    1572     if (FrameView* view = [self _mainCoreFrame]->view())
    1573         return view->contentsSizeRespectingOverflow();
    1574    
    15751573    return [[[[self mainFrame] frameView] documentView] bounds].size;
    15761574}

  • trunk/Source/WebKit2/ChangeLog

    r194665 r194667  
     12016-01-06  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS] Revert overflow:hidden on the body affecting viewport scale (r186786)
     4        https://bugs.webkit.org/show_bug.cgi?id=152803
     5        rdar://problem/22242515
     6
     7        Reviewed by Tim Horton.
     8
     9        You can't assume that if an author uses overflow:hidden on the body, they have no
     10        content outside the body that is important. Sites like Google Translate put
     11        abspos elements outside the body.
     12       
     13        So revert the change.
     14
     15        * WebProcess/WebPage/WebPage.cpp:
     16        (WebKit::WebPage::mainFrameDidLayout): Go back to using contents size.
     17
    1182016-01-06  Anders Carlsson  <andersca@apple.com>
    219

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r194496 r194667  
    35373537#if PLATFORM(IOS)
    35383538    if (FrameView* frameView = mainFrameView()) {
    3539         IntSize newContentSize = frameView->contentsSizeRespectingOverflow();
     3539        IntSize newContentSize = frameView->contentsSize();
    35403540        if (m_viewportConfiguration.setContentsSize(newContentSize))
    35413541            viewportConfigurationChanged();
Note: See TracChangeset for help on using the changeset viewer.