Changeset 87187 in webkit


Ignore:
Timestamp:
May 24, 2011 12:23:17 PM (13 years ago)
Author:
weinig@apple.com
Message:

2011-05-24 Sam Weinig <​sam@webkit.org>

Reviewed by Beth Dakin.

Can't scroll scaled page that has overflow:hidden on its root
<rdar://problem/9029189>
​https://bugs.webkit.org/show_bug.cgi?id=61339

Test: fast/events/scroll-in-scaled-page-with-overflow-hidden.html

  • page/FrameView.cpp: (WebCore::FrameView::applyOverflowToViewport): Scrollbars should be enabled for the viewport when scaled, even if overflow:hidden is specified.

2011-05-24 Sam Weinig <​sam@webkit.org>

Reviewed by Beth Dakin.

Can't scroll scaled page that has overflow:hidden on its root
<rdar://problem/9029189>
​https://bugs.webkit.org/show_bug.cgi?id=61339

  • fast/events/scroll-in-scaled-page-with-overflow-hidden-expected.txt: Added.
  • fast/events/scroll-in-scaled-page-with-overflow-hidden.html: Added.
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r87181 r87187  
     12011-05-24  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Beth Dakin.
     4
     5        Can't scroll scaled page that has overflow:hidden on its root
     6        <rdar://problem/9029189>
     7        https://bugs.webkit.org/show_bug.cgi?id=61339
     8
     9        * fast/events/scroll-in-scaled-page-with-overflow-hidden-expected.txt: Added.
     10        * fast/events/scroll-in-scaled-page-with-overflow-hidden.html: Added.
     11
    1122011-05-24  Jian Li  <jianli@chromium.org>
    213

  • trunk/Source/WebCore/ChangeLog

    r87182 r87187  
     12011-05-24  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Beth Dakin.
     4
     5        Can't scroll scaled page that has overflow:hidden on its root
     6        <rdar://problem/9029189>
     7        https://bugs.webkit.org/show_bug.cgi?id=61339
     8
     9        Test: fast/events/scroll-in-scaled-page-with-overflow-hidden.html
     10
     11        * page/FrameView.cpp:
     12        (WebCore::FrameView::applyOverflowToViewport):
     13        Scrollbars should be enabled for the viewport when scaled, even if overflow:hidden
     14        is specified.
     15
    1162011-05-24  Adam Roben  <aroben@apple.com>
    217

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

    r87102 r87187  
    516516    // scrollbars.  The CSS2.1 draft states that HTML UAs should use the <html> or <body> element and XML/XHTML UAs should
    517517    // use the root element.
     518
     519    // To combat the inability to scroll on a page with overflow:hidden on the root when scaled, disregard hidden when
     520    // there is a pageScaleFactor that is greater than one on the main frame.
     521
     522    bool overrideHidden = m_frame->page() && m_frame->page()->mainFrame() == m_frame && m_frame->pageScaleFactor() > 1;
     523
    518524    switch (o->style()->overflowX()) {
    519525        case OHIDDEN:
    520             hMode = ScrollbarAlwaysOff;
     526            if (overrideHidden)
     527                hMode = ScrollbarAuto;
     528            else
     529                hMode = ScrollbarAlwaysOff;
    521530            break;
    522531        case OSCROLL:
    … …  
    533542     switch (o->style()->overflowY()) {
    534543        case OHIDDEN:
    535             vMode = ScrollbarAlwaysOff;
     544            if (overrideHidden)
     545                vMode = ScrollbarAuto;
     546            else
     547                vMode = ScrollbarAlwaysOff;
    536548            break;
    537549        case OSCROLL:
Note: See TracChangeset for help on using the changeset viewer.