<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212439] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212439">212439</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 09:32:34 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaWebTiledBackingLayermm">trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileGridTilemm">trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebInspectorWebNodeHighlighth">trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212438 => 212439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-16 17:32:12 UTC (rev 212438)
+++ trunk/Source/WebCore/ChangeLog 2017-02-16 17:32:34 UTC (rev 212439)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-16 Simon Fraser <simon.fraser@apple.com>
+
+ Clean up use of some CALayer-related SPI
+ https://bugs.webkit.org/show_bug.cgi?id=168401
+
+ Reviewed by Tim Horton.
+
+ 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:
+
</ins><span class="cx"> 2017-02-16 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: allow import() inside the inspector
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (212438 => 212439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2017-02-16 17:32:12 UTC (rev 212438)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2017-02-16 17:32:34 UTC (rev 212439)
</span><span class="lines">@@ -686,13 +686,13 @@
</span><span class="cx">
</span><span class="cx"> bool PlatformCALayerCocoa::acceleratesDrawing() const
</span><span class="cx"> {
</span><del>- return [m_layer acceleratesDrawing];
</del><ins>+ return [m_layer drawsAsynchronously];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerCocoa::setAcceleratesDrawing(bool acceleratesDrawing)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><del>- [m_layer setAcceleratesDrawing:acceleratesDrawing];
</del><ins>+ [m_layer setDrawsAsynchronously:acceleratesDrawing];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaWebTiledBackingLayermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.mm (212438 => 212439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.mm 2017-02-16 17:32:12 UTC (rev 212438)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.mm 2017-02-16 17:32:34 UTC (rev 212439)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> _tileController->setNeedsDisplayInRect(enclosingIntRect(rect));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setAcceleratesDrawing:(BOOL)acceleratesDrawing
</del><ins>+- (void)setDrawsAsynchronously:(BOOL)acceleratesDrawing
</ins><span class="cx"> {
</span><span class="cx"> _tileController->setAcceleratesDrawing(acceleratesDrawing);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileGridTilemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm (212438 => 212439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2017-02-16 17:32:12 UTC (rev 212438)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2017-02-16 17:32:34 UTC (rev 212439)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> [layer setEdgeAntialiasingMask:0];
</span><span class="cx"> [layer setNeedsLayoutOnGeometryChange:NO];
</span><span class="cx"> [layer setContentsScale:screenScale];
</span><del>- [layer setAcceleratesDrawing:m_tileGrid->tileCache().acceleratedDrawingEnabled()];
</del><ins>+ [layer setDrawsAsynchronously:m_tileGrid->tileCache().acceleratedDrawingEnabled()];
</ins><span class="cx">
</span><span class="cx"> // Host layer may have other sublayers. Keep the tile layers at the beginning of the array
</span><span class="cx"> // so they are painted behind everything else.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (212438 => 212439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2017-02-16 17:32:12 UTC (rev 212438)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2017-02-16 17:32:34 UTC (rev 212439)
</span><span class="lines">@@ -78,7 +78,6 @@
</span><span class="cx"> - (CGSize)size;
</span><span class="cx"> - (void *)regionBeingDrawn;
</span><span class="cx"> - (void)setContentsChanged;
</span><del>-@property BOOL acceleratesDrawing;
</del><span class="cx"> @property BOOL allowsGroupBlending;
</span><span class="cx"> @property BOOL canDrawConcurrently;
</span><span class="cx"> @property BOOL contentsOpaque;
</span><span class="lines">@@ -90,11 +89,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface CATiledLayer ()
-- (void)displayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
-- (void)setNeedsDisplayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
-@end
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> @interface CADisplay : NSObject
</span><span class="cx"> @end
</span><span class="lines">@@ -197,8 +191,6 @@
</span><span class="cx">
</span><span class="cx"> WTF_EXTERN_C_END
</span><span class="cx">
</span><del>-extern NSString * const kCATiledLayerRemoveImmediately;
-
</del><span class="cx"> extern NSString * const kCAFilterColorInvert;
</span><span class="cx"> extern NSString * const kCAFilterColorMatrix;
</span><span class="cx"> extern NSString * const kCAFilterColorMonochrome;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (212438 => 212439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-02-16 17:32:12 UTC (rev 212438)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-02-16 17:32:34 UTC (rev 212439)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-16 Simon Fraser <simon.fraser@apple.com>
+
+ Clean up use of some CALayer-related SPI
+ https://bugs.webkit.org/show_bug.cgi?id=168401
+
+ Reviewed by Tim Horton.
+
+ Include CALayer.h not CATiledLayer.h.
+
+ * WebInspector/WebNodeHighlight.h:
+
</ins><span class="cx"> 2017-02-15 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the build after r212379
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebInspectorWebNodeHighlighth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.h (212438 => 212439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.h 2017-02-16 17:32:12 UTC (rev 212438)
+++ trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.h 2017-02-16 17:32:34 UTC (rev 212439)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import <QuartzCore/CATiledLayer.h>
</del><ins>+#import <QuartzCore/CALayer.h>
</ins><span class="cx"> #import <WebKitLegacy/WAKAppKitStubs.h>
</span><span class="cx"> #import <WebKitLegacy/WAKView.h>
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>