Changeset 154030 in webkit


Ignore:
Timestamp:
Aug 13, 2013 4:37:00 PM (11 years ago)
Author:
Brent Fulgham
Message:

[Windows] Windows is incorrectly using a LayerTypeTiledBackingLayer
https://bugs.webkit.org/show_bug.cgi?id=119772

Reviewed by Simon Fraser.

  • platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::swapFromOrToTiledLayer): Ensure that we use
the correct (supported) tiled layer type for Windows.

  • platform/graphics/ca/win/PlatformCALayerWin.cpp:

(PlatformCALayer::PlatformCALayer): Add an assertion to notify us if
we introduce this mistake again in the future.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r154028 r154030  
     12013-08-13  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Windows] Windows is incorrectly using a LayerTypeTiledBackingLayer
     4        https://bugs.webkit.org/show_bug.cgi?id=119772
     5
     6        Reviewed by Simon Fraser.
     7
     8        * platform/graphics/ca/GraphicsLayerCA.cpp:
     9        (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer): Ensure that we use
     10        the correct (supported) tiled layer type for Windows.
     11        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
     12        (PlatformCALayer::PlatformCALayer): Add an assertion to notify us if
     13        we introduce this mistake again in the future.
     14
    1152013-08-13  Anders Carlsson  <andersca@apple.com>
    216
  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r153875 r154030  
    26832683    ASSERT(useTiledLayer != m_usingTiledBacking);
    26842684    RefPtr<PlatformCALayer> oldLayer = m_layer;
    2685    
    2686     m_layer = PlatformCALayer::create(useTiledLayer ? PlatformCALayer::LayerTypeTiledBackingLayer : PlatformCALayer::LayerTypeWebLayer, this);
     2685
     2686#if PLATFORM(WIN)
     2687    PlatformCALayer::LayerType layerType = useTiledLayer ? PlatformCALayer::LayerTypeWebTiledLayer : PlatformCALayer::LayerTypeWebLayer;
     2688#else
     2689    PlatformCALayer::LayerType layerType = useTiledLayer ? PlatformCALayer::LayerTypeTiledBackingLayer : PlatformCALayer::LayerTypeWebLayer;
     2690#endif
     2691
     2692    m_layer = PlatformCALayer::create(layerType, this);
     2693
    26872694    m_usingTiledBacking = useTiledLayer;
    26882695   
  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

    r153771 r154030  
    117117    } else {
    118118        m_layerType = layerType;
     119        ASSERT((layerType != LayerTypeTiledBackingLayer) && (layerType != LayerTypePageTiledBackingLayer));
    119120        m_layer = adoptCF(CACFLayerCreate(toCACFLayerType(layerType)));
    120121
Note: See TracChangeset for help on using the changeset viewer.