Changeset 183794 in webkit


Ignore:
Timestamp:
May 4, 2015 9:29:30 PM (9 years ago)
Author:
Simon Fraser
Message:

Fix assertions in WK1 tests after r183777.

Source/WebCore:

Two issues with the original change:

If not in compositing mode, we shouldn't schedule layer flushes, since
Document::documentWillSuspendForPageCache() only only calls cancelCompositingLayerUpdate()
if in compositing mode.

Second, RenderLayerCompositor::rootBackgroundTransparencyChanged() never stored the
new color, resulting in too many triggered compositing updates.

  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::rootBackgroundTransparencyChanged):

LayoutTests:

Behavior difference with the change to RenderLayerCompositor::rootBackgroundTransparencyChanged().

  • platform/mac-wk2/tiled-drawing/background-transparency-toggle-expected.txt:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r183783 r183794  
     12015-05-04  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Fix assertions in WK1 tests after r183777.
     4       
     5        Behavior difference with the change to RenderLayerCompositor::rootBackgroundTransparencyChanged().
     6
     7        * platform/mac-wk2/tiled-drawing/background-transparency-toggle-expected.txt:
     8
    192015-05-04  Doug Russell  <d_russell@apple.com>
    210
  • trunk/LayoutTests/platform/mac-wk2/tiled-drawing/background-transparency-toggle-expected.txt

    r183775 r183794  
    4747      (bounds 785.00 648.00)
    4848      (contentsOpaque 1)
    49       (backgroundColor #CCCCCC)
    5049      (tile cache coverage 0, 0 785 x 648)
    5150      (tile size 512 x 512)
  • trunk/Source/WebCore/ChangeLog

    r183788 r183794  
     12015-05-04  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Fix assertions in WK1 tests after r183777.
     4       
     5        Two issues with the original change:
     6       
     7        If not in compositing mode, we shouldn't schedule layer flushes, since
     8        Document::documentWillSuspendForPageCache() only only calls cancelCompositingLayerUpdate()
     9        if in compositing mode.
     10       
     11        Second, RenderLayerCompositor::rootBackgroundTransparencyChanged() never stored the
     12        new color, resulting in too many triggered compositing updates.
     13
     14        * rendering/RenderLayerCompositor.cpp:
     15        (WebCore::RenderLayerCompositor::rootBackgroundTransparencyChanged):
     16
    1172015-05-04  Zalan Bujtas  <zalan@apple.com>
    218
  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r183775 r183794  
    32173217void RenderLayerCompositor::rootBackgroundTransparencyChanged()
    32183218{
     3219    if (!inCompositingMode())
     3220        return;
     3221
    32193222    Color documentBackgroundColor = m_renderView.frameView().documentBackgroundColor();
    32203223    if (m_lastDocumentBackgroundColor.isValid() && documentBackgroundColor.hasAlpha() == m_lastDocumentBackgroundColor.hasAlpha())
    32213224        return;
     3225
     3226    m_lastDocumentBackgroundColor = documentBackgroundColor;
    32223227
    32233228    // FIXME: We should do something less expensive than a full layer rebuild.
Note: See TracChangeset for help on using the changeset viewer.