Changeset 212439 in webkit


Ignore:
Timestamp:
Feb 16, 2017 9:32:34 AM (7 years ago)
Author:
Simon Fraser
Message:

Clean up use of some CALayer-related SPI
​https://bugs.webkit.org/show_bug.cgi?id=168401

Reviewed by Tim Horton.

Source/WebCore:

Use -setDrawsAsynchronously: rather than the old -setAcceleratesDrawing: SPI.

Remove CATiledLayer-related stuff from QuartzCoreSPI.h, since we don't use it any more.

  • platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:

(PlatformCALayerCocoa::acceleratesDrawing):
(PlatformCALayerCocoa::setAcceleratesDrawing):

  • platform/graphics/ca/cocoa/WebTiledBackingLayer.mm:

(-[WebTiledBackingLayer setDrawsAsynchronously:]): This override passes the state
onto the TileController.
(-[WebTiledBackingLayer setAcceleratesDrawing:]): Deleted.

  • platform/ios/LegacyTileGridTile.mm:

(WebCore::LegacyTileGridTile::LegacyTileGridTile):

  • platform/spi/cocoa/QuartzCoreSPI.h:

Source/WebKit/mac:

Include CALayer.h not CATiledLayer.h.

  • WebInspector/WebNodeHighlight.h:
Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r212438 r212439  
     12017-02-16  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Clean up use of some CALayer-related SPI
     4        https://bugs.webkit.org/show_bug.cgi?id=168401
     5
     6        Reviewed by Tim Horton.
     7
     8        Use -setDrawsAsynchronously: rather than the old -setAcceleratesDrawing: SPI.
     9
     10        Remove CATiledLayer-related stuff from QuartzCoreSPI.h, since we don't use it any more.
     11
     12        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
     13        (PlatformCALayerCocoa::acceleratesDrawing):
     14        (PlatformCALayerCocoa::setAcceleratesDrawing):
     15        * platform/graphics/ca/cocoa/WebTiledBackingLayer.mm:
     16        (-[WebTiledBackingLayer setDrawsAsynchronously:]): This override passes the state
     17        onto the TileController.
     18        (-[WebTiledBackingLayer setAcceleratesDrawing:]): Deleted.
     19        * platform/ios/LegacyTileGridTile.mm:
     20        (WebCore::LegacyTileGridTile::LegacyTileGridTile):
     21        * platform/spi/cocoa/QuartzCoreSPI.h:
     22
    1232017-02-16  Yusuke Suzuki  <utatane.tea@gmail.com>
    224

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

    r210105 r212439  
    687687bool PlatformCALayerCocoa::acceleratesDrawing() const
    688688{
    689     return [m_layer acceleratesDrawing];
     689    return [m_layer drawsAsynchronously];
    690690}
    691691
    … …  
    693693{
    694694    BEGIN_BLOCK_OBJC_EXCEPTIONS
    695     [m_layer setAcceleratesDrawing:acceleratesDrawing];
     695    [m_layer setDrawsAsynchronously:acceleratesDrawing];
    696696    END_BLOCK_OBJC_EXCEPTIONS
    697697}

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.mm

    r185856 r212439  
    104104}
    105105
    106 - (void)setAcceleratesDrawing:(BOOL)acceleratesDrawing
     106- (void)setDrawsAsynchronously:(BOOL)acceleratesDrawing
    107107{
    108108    _tileController->setAcceleratesDrawing(acceleratesDrawing);

  • trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm

    r204466 r212439  
    7171    [layer setNeedsLayoutOnGeometryChange:NO];
    7272    [layer setContentsScale:screenScale];
    73     [layer setAcceleratesDrawing:m_tileGrid->tileCache().acceleratedDrawingEnabled()];
     73    [layer setDrawsAsynchronously:m_tileGrid->tileCache().acceleratedDrawingEnabled()];
    7474
    7575    // Host layer may have other sublayers. Keep the tile layers at the beginning of the array

  • trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h

    r212260 r212439  
    7979- (void *)regionBeingDrawn;
    8080- (void)setContentsChanged;
    81 @property BOOL acceleratesDrawing;
    8281@property BOOL allowsGroupBlending;
    8382@property BOOL canDrawConcurrently;
    … …  
    8988@property (copy) NSString *contentsFormat;
    9089#endif
    91 @end
    92 
    93 @interface CATiledLayer ()
    94 - (void)displayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
    95 - (void)setNeedsDisplayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
    9690@end
    9791
    … …  
    198192WTF_EXTERN_C_END
    199193
    200 extern NSString * const kCATiledLayerRemoveImmediately;
    201 
    202194extern NSString * const kCAFilterColorInvert;
    203195extern NSString * const kCAFilterColorMatrix;

  • trunk/Source/WebKit/mac/ChangeLog

    r212386 r212439  
     12017-02-16  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Clean up use of some CALayer-related SPI
     4        https://bugs.webkit.org/show_bug.cgi?id=168401
     5
     6        Reviewed by Tim Horton.
     7
     8        Include CALayer.h not CATiledLayer.h.
     9
     10        * WebInspector/WebNodeHighlight.h:
     11
    1122017-02-15  Wenson Hsieh  <wenson_hsieh@apple.com>
    213

  • trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.h

    r168047 r212439  
    2828
    2929#if PLATFORM(IOS)
    30 #import <QuartzCore/CATiledLayer.h>
     30#import <QuartzCore/CALayer.h>
    3131#import <WebKitLegacy/WAKAppKitStubs.h>
    3232#import <WebKitLegacy/WAKView.h>
Note: See TracChangeset for help on using the changeset viewer.