⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 246603 in webkit


Ignore:
Timestamp:
Jun 19, 2019, 12:00:49 PM (7 years ago)
Author:
Kocsen Chung
Message:

Revert r246538. rdar://problem/51905737

Location:
tags/Safari-608.1.30
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • tags/Safari-608.1.30/LayoutTests/ChangeLog

    r246584 r246603  
     12019-06-19  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Revert r246538. rdar://problem/51905737
     4
    152019-06-19  Cathie Chen  <cathiechen@igalia.com>
    26

  • tags/Safari-608.1.30/LayoutTests/compositing/iframes/scrolling-iframe-expected.txt

    r246538 r246603  
    1717              (children 1
    1818                (GraphicsLayer
    19                   (bounds origin 80.00 80.00)
    2019                  (anchor 0.00 0.00)
    2120                  (bounds 285.00 135.00)
    2221                  (children 1
    2322                    (GraphicsLayer
     23                      (position -80.00 -80.00)
    2424                      (anchor 0.00 0.00)
    2525                      (children 1

  • tags/Safari-608.1.30/LayoutTests/compositing/overflow/textarea-scroll-touch-expected.txt

    r246538 r246603  
    1717              (offsetFromRenderer width=1 height=1)
    1818              (position 1.00 1.00)
    19               (bounds origin 0.00 50.00)
    2019              (bounds 189.00 124.00)
    2120              (children 1
    … …  
    2322                  (offsetFromRenderer width=1 height=1)
    2423                  (scrollOffset (0,50))
     24                  (position 0.00 -50.00)
    2525                  (anchor 0.00 0.00)
    2626                  (bounds 189.00 270.00)
    … …  
    4040              (offsetFromRenderer width=1 height=1)
    4141              (position 1.00 1.00)
    42               (bounds origin 0.00 50.00)
    4342              (bounds 189.00 124.00)
    4443              (children 1
    … …  
    4645                  (offsetFromRenderer width=1 height=1)
    4746                  (scrollOffset (0,50))
     47                  (position 0.00 -50.00)
    4848                  (anchor 0.00 0.00)
    4949                  (bounds 189.00 270.00)

  • tags/Safari-608.1.30/LayoutTests/compositing/repaint/iframes/compositing-iframe-scroll-repaint-expected.txt

    r246538 r246603  
    1818              (children 1
    1919                (GraphicsLayer
    20                   (bounds origin 0.00 100.00)
    2120                  (anchor 0.00 0.00)
    2221                  (bounds 400.00 300.00)
    2322                  (children 1
    2423                    (GraphicsLayer
     24                      (position 0.00 -100.00)
    2525                      (anchor 0.00 0.00)
    2626                      (children 1

  • tags/Safari-608.1.30/LayoutTests/compositing/repaint/iframes/compositing-iframe-with-fixed-background-doc-repaint-expected.txt

    r246538 r246603  
    1818              (children 1
    1919                (GraphicsLayer
    20                   (bounds origin 0.00 100.00)
    2120                  (anchor 0.00 0.00)
    2221                  (bounds 400.00 300.00)
    2322                  (children 1
    2423                    (GraphicsLayer
     24                      (position 0.00 -100.00)
    2525                      (anchor 0.00 0.00)
    2626                      (children 1

  • tags/Safari-608.1.30/LayoutTests/compositing/repaint/scroller-with-foreground-layer-repaints-expected.txt

    r246538 r246603  
    2121              (offsetFromRenderer width=1 height=1)
    2222              (position 1.00 1.00)
    23               (bounds origin 0.00 200.00)
    2423              (bounds 305.00 305.00)
    2524              (children 1
    … …  
    2726                  (offsetFromRenderer width=1 height=1)
    2827                  (scrollOffset (0,200))
     28                  (position 0.00 -200.00)
    2929                  (anchor 0.00 0.00)
    3030                  (bounds 305.00 1020.00)

  • tags/Safari-608.1.30/LayoutTests/compositing/rtl/rtl-scrolling-with-transformed-descendants-expected.txt

    r246538 r246603  
    1616              (offsetFromRenderer width=2 height=2)
    1717              (position 2.00 2.00)
    18               (bounds origin 366.00 0.00)
    1918              (bounds 400.00 204.00)
    2019              (children 1
    … …  
    2221                  (offsetFromRenderer width=2 height=2)
    2322                  (scrollOffset (366,0))
     23                  (position -366.00 0.00)
    2424                  (anchor 0.00 0.00)
    2525                  (bounds 766.00 204.00)

  • tags/Safari-608.1.30/LayoutTests/platform/ios-wk2/compositing/iframes/scrolling-iframe-expected.txt

    r246538 r246603  
    1717              (children 1
    1818                (GraphicsLayer
    19                   (bounds origin 80.00 80.00)
    2019                  (anchor 0.00 0.00)
    2120                  (bounds 300.00 150.00)

  • tags/Safari-608.1.30/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt

    r246538 r246603  
    6464              (children 1
    6565                (GraphicsLayer
    66                   (bounds origin 0.00 120.00)
    6766                  (anchor 0.00 0.00)
    6867                  (bounds 480.00 400.00)

  • tags/Safari-608.1.30/LayoutTests/platform/mac-highsierra-wk1/compositing/repaint/iframes/compositing-iframe-scroll-repaint-expected.txt

    r246538 r246603  
    2222              (children 1
    2323                (GraphicsLayer
    24                   (bounds origin 0.00 100.00)
    2524                  (anchor 0.00 0.00)
    2625                  (bounds 400.00 300.00)
    2726                  (children 1
    2827                    (GraphicsLayer
     28                      (position 0.00 -100.00)
    2929                      (anchor 0.00 0.00)
    3030                      (children 1

  • tags/Safari-608.1.30/LayoutTests/platform/mac-highsierra-wk1/compositing/repaint/iframes/compositing-iframe-with-fixed-background-doc-repaint-expected.txt

    r246538 r246603  
    2222              (children 1
    2323                (GraphicsLayer
    24                   (bounds origin 0.00 100.00)
    2524                  (anchor 0.00 0.00)
    2625                  (bounds 400.00 300.00)
    2726                  (children 1
    2827                    (GraphicsLayer
     28                      (position 0.00 -100.00)
    2929                      (anchor 0.00 0.00)
    3030                      (children 1

  • tags/Safari-608.1.30/LayoutTests/platform/mac-sierra-wk1/compositing/repaint/iframes/compositing-iframe-scroll-repaint-expected.txt

    r246538 r246603  
    2121              (children 1
    2222                (GraphicsLayer
    23                   (bounds origin 0.00 100.00)
    2423                  (anchor 0.00 0.00)
    2524                  (bounds 400.00 300.00)
    2625                  (children 1
    2726                    (GraphicsLayer
     27                      (position 0.00 -100.00)
    2828                      (children 1
    2929                        (GraphicsLayer

  • tags/Safari-608.1.30/LayoutTests/platform/mac-wk1/compositing/repaint/iframes/compositing-iframe-scroll-repaint-expected.txt

    r246538 r246603  
    2121              (children 1
    2222                (GraphicsLayer
    23                   (bounds origin 0.00 100.00)
    2423                  (anchor 0.00 0.00)
    2524                  (bounds 400.00 300.00)
    2625                  (children 1
    2726                    (GraphicsLayer
     27                      (position 0.00 -100.00)
    2828                      (anchor 0.00 0.00)
    2929                      (children 1
    … …  
    3535                              (bounds 400.00 1016.00)
    3636                              (drawsContent 1)
    37                               (repaint rects
    38                                 (rect 0.00 0.00 400.00 1016.00)
    39                                 (rect 0.00 0.00 400.00 1016.00)
    40                                 (rect 8.00 8.00 384.00 1000.00)
    41                                 (rect 0.00 0.00 400.00 1016.00)
    42                               )
    4337                              (children 1
    4438                                (GraphicsLayer

  • tags/Safari-608.1.30/LayoutTests/platform/mac-wk1/compositing/repaint/iframes/compositing-iframe-with-fixed-background-doc-repaint-expected.txt

    r246538 r246603  
    2121              (children 1
    2222                (GraphicsLayer
    23                   (bounds origin 0.00 100.00)
    2423                  (anchor 0.00 0.00)
    2524                  (bounds 400.00 300.00)
    2625                  (children 1
    2726                    (GraphicsLayer
     27                      (position 0.00 -100.00)
    2828                      (anchor 0.00 0.00)
    2929                      (children 1

  • tags/Safari-608.1.30/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt

    r246538 r246603  
    6666              (children 1
    6767                (GraphicsLayer
    68                   (bounds origin 0.00 120.00)
    6968                  (anchor 0.00 0.00)
    7069                  (bounds 465.00 400.00)
    7170                  (children 1
    7271                    (GraphicsLayer
     72                      (position 0.00 -120.00)
    7373                      (anchor 0.00 0.00)
    7474                      (children 1

  • tags/Safari-608.1.30/LayoutTests/tiled-drawing/scrolling/overflow/overflow-scrolled-down-tile-coverage-expected.txt

    r246538 r246603  
    3131              (offsetFromRenderer width=1 height=1)
    3232              (position 1.00 1.00)
    33               (bounds origin 0.00 1800.00)
    3433              (bounds 385.00 512.00)
    35               (visible rect 0.00, 1800.00 385.00 x 512.00)
    36               (coverage rect 0.00, 1800.00 385.00 x 512.00)
     34              (visible rect 0.00, 0.00 385.00 x 512.00)
     35              (coverage rect 0.00, 0.00 385.00 x 512.00)
    3736              (intersects coverage rect 1)
    3837              (contentsScale 1.00)
    … …  
    4140                  (offsetFromRenderer width=1 height=1)
    4241                  (scrollOffset (0,1800))
     42                  (position 0.00 -1800.00)
    4343                  (anchor 0.00 0.00)
    4444                  (bounds 385.00 3000.00)

  • tags/Safari-608.1.30/LayoutTests/tiled-drawing/scrolling/overflow/overflow-scrolled-up-tile-coverage-expected.txt

    r246538 r246603  
    3131              (offsetFromRenderer width=1 height=1)
    3232              (position 1.00 1.00)
    33               (bounds origin 0.00 200.00)
    3433              (bounds 385.00 512.00)
    35               (visible rect 0.00, 200.00 385.00 x 512.00)
    36               (coverage rect 0.00, 200.00 385.00 x 512.00)
     34              (visible rect 0.00, 0.00 385.00 x 512.00)
     35              (coverage rect 0.00, 0.00 385.00 x 512.00)
    3736              (intersects coverage rect 1)
    3837              (contentsScale 1.00)
    … …  
    4140                  (offsetFromRenderer width=1 height=1)
    4241                  (scrollOffset (0,200))
     42                  (position 0.00 -200.00)
    4343                  (anchor 0.00 0.00)
    4444                  (bounds 385.00 3000.00)

  • tags/Safari-608.1.30/Source/WebCore/ChangeLog

    r246579 r246603  
     12019-06-19  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Revert r246538. rdar://problem/51905737
     4
    152019-06-18  Saam Barati  <sbarati@apple.com>
    26

  • tags/Safari-608.1.30/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp

    r246538 r246603  
    447447void AsyncScrollingCoordinator::reconcileScrollPosition(FrameView& frameView, ScrollingLayerPositionAction scrollingLayerPositionAction)
    448448{
     449#if PLATFORM(IOS_FAMILY)
     450    // Doing all scrolling like this (UIScrollView style) would simplify code.
    449451    auto* scrollContainerLayer = scrollContainerLayerForFrameView(frameView);
    450452    if (!scrollContainerLayer)
    451453        return;
    452 
    453     // This uses scrollPosition because the root content layer accounts for scrollOrigin (see FrameView::positionForRootContentLayer()).
    454454    if (scrollingLayerPositionAction == ScrollingLayerPositionAction::Set)
    455455        scrollContainerLayer->setBoundsOrigin(frameView.scrollPosition());
    456456    else
    457457        scrollContainerLayer->syncBoundsOrigin(frameView.scrollPosition());
     458#else
     459    auto* scrolledContentsLayer = scrolledContentsLayerForFrameView(frameView);
     460    if (!scrolledContentsLayer)
     461        return;
     462    if (scrollingLayerPositionAction == ScrollingLayerPositionAction::Set)
     463        scrolledContentsLayer->setPosition(-frameView.scrollPosition());
     464    else
     465        scrolledContentsLayer->syncPosition(-frameView.scrollPosition());
     466#endif
    458467}
    459468

  • tags/Safari-608.1.30/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

    r246538 r246603  
    273273{
    274274    if (auto* renderView = frameView.frame().contentRenderer())
    275         return renderView->compositor().scrollContainerLayer();
     275        return renderView->compositor().clipLayer();
    276276    return nullptr;
    277277}

  • tags/Safari-608.1.30/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm

    r246538 r246603  
    200200void ScrollingTreeFrameScrollingNodeMac::repositionScrollingLayers()
    201201{
    202     // We use scroll position here because the root content layer is offset to account for scrollOrigin (see FrameView::positionForRootContentLayer).
    203     [scrollContainerLayer() _web_setLayerBoundsOrigin:currentScrollPosition()];
     202    scrolledContentsLayer().position = -currentScrollPosition();
    204203}
    205204

  • tags/Safari-608.1.30/Source/WebCore/page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.mm

    r246538 r246603  
    3232#import "ScrollingStateOverflowScrollingNode.h"
    3333#import "ScrollingTree.h"
    34 #import "WebCoreCALayerExtras.h"
    3534#import <wtf/text/TextStream.h>
    3635
    … …  
    9392{
    9493    auto scrollOffset = ScrollableArea::scrollOffsetFromPosition(currentScrollPosition(), toFloatSize(scrollOrigin()));
    95     [scrollContainerLayer() _web_setLayerBoundsOrigin:scrollOffset];
     94    scrolledContentsLayer().position = -scrollOffset;
    9695}
    9796

  • tags/Safari-608.1.30/Source/WebCore/platform/graphics/cocoa/WebCoreCALayerExtras.h

    r246538 r246603  
    2929
    3030- (void)web_disableAllActions;
    31 - (void)_web_setLayerBoundsOrigin:(CGPoint)origin;
    3231- (void)_web_setLayerTopLeftPosition:(CGPoint)position;
    3332+ (CALayer *)_web_renderLayerWithContextID:(uint32_t)contextID;

  • tags/Safari-608.1.30/Source/WebCore/platform/graphics/cocoa/WebCoreCALayerExtras.mm

    r246538 r246603  
    5757}
    5858
    59 - (void)_web_setLayerBoundsOrigin:(CGPoint)origin
    60 {
    61     CGRect bounds = [self bounds];
    62     bounds.origin = origin;
    63     [self setBounds:bounds];
    64 }
    65 
    6659- (void)_web_setLayerTopLeftPosition:(CGPoint)position
    6760{

  • tags/Safari-608.1.30/Source/WebCore/rendering/RenderLayerBacking.cpp

    r246538 r246603  
    12261226        ScrollOffset scrollOffset = m_owningLayer.scrollOffset();
    12271227        updateScrollOffset(scrollOffset);
     1228#if PLATFORM(IOS_FAMILY)
     1229        m_scrolledContentsLayer->setPosition({ }); // FIXME: necessary?
     1230#endif
    12281231
    12291232        FloatSize oldScrollingLayerOffset = m_scrollContainerLayer->offsetFromRenderer();
    … …  
    13041307void RenderLayerBacking::setLocationOfScrolledContents(ScrollOffset scrollOffset, ScrollingLayerPositionAction setOrSync)
    13051308{
     1309#if PLATFORM(IOS_FAMILY)
    13061310    if (setOrSync == ScrollingLayerPositionAction::Sync)
    13071311        m_scrollContainerLayer->syncBoundsOrigin(scrollOffset);
    13081312    else
    13091313        m_scrollContainerLayer->setBoundsOrigin(scrollOffset);
     1314#else
     1315    if (setOrSync == ScrollingLayerPositionAction::Sync)
     1316        m_scrolledContentsLayer->syncPosition(-scrollOffset);
     1317    else
     1318        m_scrolledContentsLayer->setPosition(-scrollOffset);
     1319#endif
    13101320}
    13111321
    … …  
    13211331        m_owningLayer.setRequiresScrollPositionReconciliation(false);
    13221332    }
    1323 
    1324     ASSERT(m_scrolledContentsLayer->position().isZero());
    13251333}
    13261334

  • tags/Safari-608.1.30/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r246538 r246603  
    302302    GraphicsLayer::unparentAndClear(m_rootContentsLayer);
    303303   
     304    GraphicsLayer::unparentAndClear(m_clipLayer);
    304305    GraphicsLayer::unparentAndClear(m_scrollContainerLayer);
    305306    GraphicsLayer::unparentAndClear(m_scrolledContentsLayer);
    … …  
    521522        if (layersLogEnabled()) {
    522523            LOG(Layers, "RenderLayerCompositor::flushPendingLayerChanges");
    523             showGraphicsLayerTree(m_overflowControlsHostLayer.get());
     524            showGraphicsLayerTree(m_rootContentsLayer.get());
    524525        }
    525526#endif
    … …  
    19691970
    19701971    if (m_scrolledContentsLayer) {
    1971         updateScrollContainerGeometry();
     1972        updateScrollLayerClipping();
    19721973        frameViewDidScroll();
    19731974        updateOverflowControlsLayers();
    … …  
    19891990}
    19901991
    1991 void RenderLayerCompositor::updateLayersForScrollPosition()
     1992void RenderLayerCompositor::updateScrollLayerPosition()
    19921993{
    19931994    ASSERT(!hasCoordinatedScrolling());
    1994     ASSERT(m_scrollContainerLayer);
     1995    ASSERT(m_scrolledContentsLayer);
    19951996
    19961997    auto& frameView = m_renderView.frameView();
    1997     // This uses scrollPosition because the root content layer accounts for scrollOrigin (see FrameView::positionForRootContentLayer()).
    1998     m_scrollContainerLayer->setBoundsOrigin(frameView.scrollPosition());
     1998    IntPoint scrollPosition = frameView.scrollPosition();
     1999
     2000    m_scrolledContentsLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y()));
    19992001
    20002002    if (auto* fixedBackgroundLayer = fixedRootBackgroundLayer())
    … …  
    20022004}
    20032005
    2004 void RenderLayerCompositor::updateScrollContainerGeometry()
    2005 {
    2006     if (!m_scrollContainerLayer)
     2006void RenderLayerCompositor::updateScrollLayerClipping()
     2007{
     2008    auto* layerForClipping = this->layerForClipping();
     2009    if (!layerForClipping)
    20072010        return;
    20082011
    2009     m_scrollContainerLayer->setSize(m_renderView.frameView().sizeForVisibleContent());
    2010     m_scrollContainerLayer->setPosition(positionForClipLayer());
     2012    layerForClipping->setSize(m_renderView.frameView().sizeForVisibleContent());
     2013    layerForClipping->setPosition(positionForClipLayer());
    20112014}
    20122015
    … …  
    20332036    }
    20342037
    2035     updateLayersForScrollPosition();
     2038    updateScrollLayerPosition();
    20362039}
    20372040
    … …  
    22502253        m_rootContentsLayer->setSize(m_renderView.frameView().contentsSize());
    22512254        m_rootContentsLayer->setPosition(m_renderView.frameView().positionForRootContentLayer());
    2252         m_rootContentsLayer->setAnchorPoint({ });
    2253     }
    2254 
    2255     updateScrollContainerGeometry();
     2255        m_rootContentsLayer->setAnchorPoint(FloatPoint3D());
     2256    }
     2257
     2258    updateScrollLayerClipping();
    22562259
    22572260#if ENABLE(RUBBER_BANDING)
    … …  
    36803683            // We want the overhang areas layer to be positioned below the frame contents,
    36813684            // so insert it below the clip layer.
    3682             m_overflowControlsHostLayer->addChildBelow(*m_layerForOverhangAreas, m_scrollContainerLayer.get());
     3685            m_overflowControlsHostLayer->addChildBelow(*m_layerForOverhangAreas, layerForClipping());
    36833686        }
    36843687    } else
    … …  
    37703773        IntRect overflowRect = snappedIntRect(m_renderView.layoutOverflowRect());
    37713774        m_rootContentsLayer->setSize(FloatSize(overflowRect.maxX(), overflowRect.maxY()));
    3772         m_rootContentsLayer->setPosition({ });
     3775        m_rootContentsLayer->setPosition(FloatPoint());
    37733776
    37743777#if PLATFORM(IOS_FAMILY)
    … …  
    37863789        if (!m_overflowControlsHostLayer) {
    37873790            ASSERT(!m_scrolledContentsLayer);
     3791            ASSERT(!m_clipLayer);
    37883792
    37893793            // Create a layer to host the clipping layer and the overflow controls layers.
    … …  
    37913795            m_overflowControlsHostLayer->setName("overflow controls host");
    37923796
    3793             m_scrollContainerLayer = GraphicsLayer::create(graphicsLayerFactory(), *this, GraphicsLayer::Type::ScrollContainer);
    3794             m_scrollContainerLayer->setName("scroll container");
    3795             m_scrollContainerLayer->setMasksToBounds(true);
    3796             m_scrollContainerLayer->setAnchorPoint({ });
    3797 
    37983797            m_scrolledContentsLayer = GraphicsLayer::create(graphicsLayerFactory(), *this, GraphicsLayer::Type::ScrolledContents);
    37993798            m_scrolledContentsLayer->setName("scrolled contents");
    38003799            m_scrolledContentsLayer->setAnchorPoint({ });
    38013800
    3802             m_overflowControlsHostLayer->addChild(*m_scrollContainerLayer);
    3803             m_scrollContainerLayer->addChild(*m_scrolledContentsLayer);
     3801#if PLATFORM(IOS_FAMILY)
     3802            if (m_renderView.settings().asyncFrameScrollingEnabled()) {
     3803                m_scrollContainerLayer = GraphicsLayer::create(graphicsLayerFactory(), *this, GraphicsLayer::Type::ScrollContainer);
     3804
     3805                m_scrollContainerLayer->setName("scroll container");
     3806                m_scrollContainerLayer->setMasksToBounds(true);
     3807                m_scrollContainerLayer->setAnchorPoint({ });
     3808
     3809                m_scrollContainerLayer->addChild(*m_scrolledContentsLayer);
     3810                m_overflowControlsHostLayer->addChild(*m_scrollContainerLayer);
     3811            }
     3812#endif
     3813            if (!m_scrollContainerLayer) {
     3814                m_clipLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
     3815                m_clipLayer->setName("frame clipping");
     3816                m_clipLayer->setMasksToBounds(true);
     3817                m_clipLayer->setAnchorPoint({ });
     3818
     3819                m_clipLayer->addChild(*m_scrolledContentsLayer);
     3820                m_overflowControlsHostLayer->addChild(*m_clipLayer);
     3821            }
     3822
    38043823            m_scrolledContentsLayer->addChild(*m_rootContentsLayer);
    38053824
    3806             updateScrollContainerGeometry();
     3825            updateScrollLayerClipping();
    38073826            updateOverflowControlsLayers();
    38083827
    … …  
    38103829                scheduleLayerFlush(true);
    38113830            else
    3812                 updateLayersForScrollPosition();
     3831                updateScrollLayerPosition();
    38133832        }
    38143833    } else {
    38153834        if (m_overflowControlsHostLayer) {
    38163835            GraphicsLayer::unparentAndClear(m_overflowControlsHostLayer);
     3836            GraphicsLayer::unparentAndClear(m_clipLayer);
    38173837            GraphicsLayer::unparentAndClear(m_scrollContainerLayer);
    38183838            GraphicsLayer::unparentAndClear(m_scrolledContentsLayer);
    … …  
    38613881    if (m_overflowControlsHostLayer) {
    38623882        GraphicsLayer::unparentAndClear(m_overflowControlsHostLayer);
     3883        GraphicsLayer::unparentAndClear(m_clipLayer);
    38633884        GraphicsLayer::unparentAndClear(m_scrollContainerLayer);
    38643885        GraphicsLayer::unparentAndClear(m_scrolledContentsLayer);
    … …  
    43004321        scrollingCoordinator.setNodeLayers(nodeID, { nullptr,
    43014322            scrollContainerLayer(), scrolledContentsLayer(),
    4302             fixedRootBackgroundLayer(), nullptr, rootContentsLayer(),
     4323            fixedRootBackgroundLayer(), clipLayer(), rootContentsLayer(),
    43034324            frameView.layerForHorizontalScrollbar(), frameView.layerForVerticalScrollbar() });
    43044325    } else {

  • tags/Safari-608.1.30/Source/WebCore/rendering/RenderLayerCompositor.h

    r246538 r246603  
    247247    GraphicsLayer* scrollContainerLayer() const { return m_scrollContainerLayer.get(); }
    248248    GraphicsLayer* scrolledContentsLayer() const { return m_scrolledContentsLayer.get(); }
     249    GraphicsLayer* clipLayer() const { return m_clipLayer.get(); }
    249250    GraphicsLayer* rootContentsLayer() const { return m_rootContentsLayer.get(); }
     251
     252    GraphicsLayer* layerForClipping() const {  return m_clipLayer ? m_clipLayer.get() : m_scrollContainerLayer.get();  }
    250253
    251254#if ENABLE(RUBBER_BANDING)
    … …  
    438441    void updateOverflowControlsLayers();
    439442
    440     void updateLayersForScrollPosition();
    441     void updateScrollContainerGeometry();
     443    void updateScrollLayerPosition();
     444    void updateScrollLayerClipping();
    442445
    443446    FloatPoint positionForClipLayer() const;
    … …  
    572575
    573576    // Enclosing clipping layer for iframe content
     577    RefPtr<GraphicsLayer> m_clipLayer;
    574578    RefPtr<GraphicsLayer> m_scrollContainerLayer;
    575579    RefPtr<GraphicsLayer> m_scrolledContentsLayer;

  • tags/Safari-608.1.30/Source/WebKit/ChangeLog

    r246583 r246603  
     12019-06-19  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Revert r246538. rdar://problem/51905737
     4
    152019-06-18  Dean Jackson  <dino@apple.com>
    26

  • tags/Safari-608.1.30/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.mm

    r246538 r246603  
    123123    }
    124124
    125     // Main frame scrolling is handled by the main UIScrollView.
     125    auto scrollPosition = currentScrollPosition();
     126    // FIXME: This is always wrong on iOS. Maybe assert that we always have a delegate.
     127    [scrolledContentsLayer() setPosition:-scrollPosition];
    126128}
    127129
Note: See TracChangeset for help on using the changeset viewer.