Changeset 207082 in webkit


Ignore:
Timestamp:
Oct 11, 2016 3:42:59 AM (7 years ago)
Author:
Carlos Garcia Campos
Message:

Merge r206100 - ASSERTION FAILED: clipRectsContext.rootLayer == m_clipRectsCache->m_clipRectsRoot[clipRectsType] while loading guardian.co.uk
https://bugs.webkit.org/show_bug.cgi?id=162129
<rdar://problem/28353350>

Reviewed by Antti Koivisto.

Source/WebCore:

Neither ::localClipRect() nor ::selfClipRect() accounts for paginated context while computing the cliprects (See FIXMEs).
This patch ensures that we don't end up caching these invalid cliprects.

Test: fast/multicol/assert-on-cliprect-caching-when-paginated.html

  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects):

LayoutTests:

  • fast/multicol/assert-on-cliprect-caching-when-paginated-expected.txt: Added.
  • fast/multicol/assert-on-cliprect-caching-when-paginated.html: Added.
Location:
releases/WebKitGTK/webkit-2.14
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog

    r207080 r207082  
     12016-09-19  Zalan Bujtas  <zalan@apple.com>
     2
     3        ASSERTION FAILED: clipRectsContext.rootLayer == m_clipRectsCache->m_clipRectsRoot[clipRectsType] while loading guardian.co.uk
     4        https://bugs.webkit.org/show_bug.cgi?id=162129
     5        <rdar://problem/28353350>
     6
     7        Reviewed by Antti Koivisto.
     8
     9        * fast/multicol/assert-on-cliprect-caching-when-paginated-expected.txt: Added.
     10        * fast/multicol/assert-on-cliprect-caching-when-paginated.html: Added.
     11
    1122016-09-16  Chris Dumez  <cdumez@apple.com>
    213
  • releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog

    r207081 r207082  
     12016-09-19  Zalan Bujtas  <zalan@apple.com>
     2
     3        ASSERTION FAILED: clipRectsContext.rootLayer == m_clipRectsCache->m_clipRectsRoot[clipRectsType] while loading guardian.co.uk
     4        https://bugs.webkit.org/show_bug.cgi?id=162129
     5        <rdar://problem/28353350>
     6
     7        Reviewed by Antti Koivisto.
     8
     9        Neither ::localClipRect() nor ::selfClipRect() accounts for paginated context while computing the cliprects (See FIXMEs).
     10        This patch ensures that we don't end up caching these invalid cliprects.
     11
     12        Test: fast/multicol/assert-on-cliprect-caching-when-paginated.html
     13
     14        * rendering/RenderLayer.cpp:
     15        (WebCore::RenderLayer::calculateClipRects):
     16
    1172016-09-17  David Kilzer  <ddkilzer@apple.com>
    218
  • releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp

    r207078 r207082  
    57275727    ClipRect backgroundRect;
    57285728    ClipRect foregroundRect;
    5729     ClipRectsContext clipRectsContext(clippingRootLayer, PaintingClipRects);
     5729    auto clipRectType = !m_enclosingPaginationLayer || m_enclosingPaginationLayer == clippingRootLayer ? PaintingClipRects : TemporaryClipRects;
     5730    ClipRectsContext clipRectsContext(clippingRootLayer, clipRectType);
    57305731    calculateRects(clipRectsContext, renderer().view().documentRect(), layerBounds, backgroundRect, foregroundRect, offsetFromAncestor(clippingRootLayer));
    57315732    return clippingRootLayer->renderer().localToAbsoluteQuad(FloatQuad(backgroundRect.rect())).enclosingBoundingBox();
     
    57435744    ClipRect backgroundRect;
    57445745    ClipRect foregroundRect;
    5745     ClipRectsContext clipRectsContext(clippingRootLayer, PaintingClipRects);
     5746    auto clipRectType = !m_enclosingPaginationLayer || m_enclosingPaginationLayer == clippingRootLayer ? PaintingClipRects : TemporaryClipRects;
     5747    ClipRectsContext clipRectsContext(clippingRootLayer, clipRectType);
    57465748    calculateRects(clipRectsContext, LayoutRect::infiniteRect(), layerBounds, backgroundRect, foregroundRect, offsetFromRoot);
    57475749
Note: See TracChangeset for help on using the changeset viewer.