<!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>[211949] trunk</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/211949">211949</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 05:55:41 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disallow accelerated rendering for ginormous 2D canvases.
<https://webkit.org/b/167968>
<rdar://problem/30119483>
Reviewed by Antti Koivisto.
Source/WebCore:
Add a "maximumAccelerated2dCanvasSize" setting that defaults to 5120x2880
which is the 5K resolution for 16:9.
Also added a way to include the "accelerates drawing" flag in layer tree dumps.
Test: compositing/canvas/accelerated-canvas-compositing-size-limit.html
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::shouldAccelerate):
* page/Frame.h:
* page/Settings.in:
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::dumpProperties):
* platform/graphics/GraphicsLayerClient.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::layerTreeAsText):
* testing/Internals.cpp:
(WebCore::toLayerTreeFlags):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
Add a simple test that documents the fact that we no longer accelerate canvases
larger than 5120x2880.
* compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt: Added.
* compositing/canvas/accelerated-canvas-compositing-size-limit.html: Added.
* platform/ios-simulator/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameh">trunk/Source/WebCore/page/Frame.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerClienth">trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingcanvasacceleratedcanvascompositingsizelimitexpectedtxt">trunk/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingcanvasacceleratedcanvascompositingsizelimithtml">trunk/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit.html</a></li>
<li>trunk/LayoutTests/platform/ios-simulator/compositing/canvas/</li>
<li><a href="#trunkLayoutTestsplatformiossimulatorcompositingcanvasacceleratedcanvascompositingsizelimitexpectedtxt">trunk/LayoutTests/platform/ios-simulator/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/LayoutTests/ChangeLog 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-09 Andreas Kling <akling@apple.com>
+
+ Disallow accelerated rendering for ginormous 2D canvases.
+ <https://webkit.org/b/167968>
+ <rdar://problem/30119483>
+
+ Reviewed by Antti Koivisto.
+
+ Add a simple test that documents the fact that we no longer accelerate canvases
+ larger than 5120x2880.
+
+ * compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt: Added.
+ * compositing/canvas/accelerated-canvas-compositing-size-limit.html: Added.
+ * platform/ios-simulator/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt: Added.
+
</ins><span class="cx"> 2017-02-09 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK+ gardening. Add expectations for more tests that require drag and drop.
</span></span></pre></div>
<a id="trunkLayoutTestscompositingcanvasacceleratedcanvascompositingsizelimitexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt (0 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Verifies that 2D canvases with higher than 5120x2880 resolution don't create accelerated backing stores.
+
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 5208.00 6171.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 5208.00 6171.00)
+ (contentsOpaque 1)
+ (children 3
+ (GraphicsLayer
+ (position 8.00 50.00)
+ (bounds 512.00 288.00)
+ (drawsContent 1)
+ (acceleratesDrawing 1)
+ )
+ (GraphicsLayer
+ (position 8.00 342.00)
+ (bounds 5120.00 2880.00)
+ (usingTiledLayer 1)
+ (drawsContent 1)
+ (acceleratesDrawing 1)
+ )
+ (GraphicsLayer
+ (position 8.00 3226.00)
+ (bounds 5200.00 2900.00)
+ (usingTiledLayer 1)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingcanvasacceleratedcanvascompositingsizelimithtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit.html (0 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit.html (rev 0)
+++ trunk/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit.html 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html><html>
+<head>
+<style>
+canvas {
+ -webkit-transform: translateZ(0);
+}
+</style>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doTest() {
+ var canvases = document.getElementsByTagName("canvas");
+ for (var i = 0; i < canvases.length; ++i) {
+ var c = canvases[i];
+ var ctx = c.getContext('2d');
+ if (!ctx)
+ continue;
+ ctx.fillStyle = 'rgba(255,0,0,1)';
+ ctx.fillRect(0,0,c.width, c.height);
+ }
+ if (window.testRunner) {
+ document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_ACCELERATES_DRAWING);
+ testRunner.notifyDone();
+ }
+ }
+
+ window.addEventListener('load', doTest, false);
+</script>
+</head>
+<body>
+<p>Verifies that 2D canvases with higher than 5120x2880 resolution don't create accelerated backing stores.</p>
+<canvas id="c1" width="512" height="288"></canvas>
+<canvas id="c2" width="5120" height="2880"></canvas>
+<canvas id="c3" width="5200" height="2900"></canvas>
+<pre id="layers">Layer tree goes here in DRT</pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorcompositingcanvasacceleratedcanvascompositingsizelimitexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt (0 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+Verifies that 2D canvases with higher than 5120x2880 resolution don't create accelerated backing stores.
+
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 5208.00 6175.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 5208.00 6175.00)
+ (contentsOpaque 1)
+ (children 3
+ (GraphicsLayer
+ (position 8.00 52.00)
+ (bounds 512.00 288.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 8.00 345.00)
+ (bounds 5120.00 2880.00)
+ (usingTiledLayer 1)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 8.00 3230.00)
+ (bounds 5200.00 2900.00)
+ (usingTiledLayer 1)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/ChangeLog 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2017-02-09 Andreas Kling <akling@apple.com>
+
+ Disallow accelerated rendering for ginormous 2D canvases.
+ <https://webkit.org/b/167968>
+ <rdar://problem/30119483>
+
+ Reviewed by Antti Koivisto.
+
+ Add a "maximumAccelerated2dCanvasSize" setting that defaults to 5120x2880
+ which is the 5K resolution for 16:9.
+
+ Also added a way to include the "accelerates drawing" flag in layer tree dumps.
+
+ Test: compositing/canvas/accelerated-canvas-compositing-size-limit.html
+
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::shouldAccelerate):
+ * page/Frame.h:
+ * page/Settings.in:
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::dumpProperties):
+ * platform/graphics/GraphicsLayerClient.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::layerTreeAsText):
+ * testing/Internals.cpp:
+ (WebCore::toLayerTreeFlags):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2017-02-09 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove most cases of #if ENABLE(CACHE_PARTITIONING)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -540,19 +540,27 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLCanvasElement::shouldAccelerate(const IntSize& size) const
</span><span class="cx"> {
</span><ins>+ if (!document().settings())
+ return false;
+ auto& settings = *document().settings();
+
+ auto area = size.area<RecordOverflow>();
+ if (area.hasOverflowed())
+ return false;
+
+ if (area > settings.maximumAccelerated2dCanvasSize())
+ return false;
+
</ins><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><del>- UNUSED_PARAM(size);
- return document().settings() && document().settings()->canvasUsesAcceleratedDrawing();
</del><ins>+ return settings.canvasUsesAcceleratedDrawing();
</ins><span class="cx"> #elif ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> if (m_context && !m_context->is2d())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- Settings* settings = document().settings();
- if (!settings || !settings->accelerated2dCanvasEnabled())
</del><ins>+ if (!settings.accelerated2dCanvasEnabled())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Do not use acceleration for small canvas.
- if (size.width() * size.height() < settings->minimumAccelerated2dCanvasSize())
</del><ins>+ if (area < settings.minimumAccelerated2dCanvasSize())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.h (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.h 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/page/Frame.h 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -105,7 +105,8 @@
</span><span class="cx"> LayerTreeFlagsIncludeTileCaches = 1 << 2,
</span><span class="cx"> LayerTreeFlagsIncludeRepaintRects = 1 << 3,
</span><span class="cx"> LayerTreeFlagsIncludePaintingPhases = 1 << 4,
</span><del>- LayerTreeFlagsIncludeContentLayers = 1 << 5
</del><ins>+ LayerTreeFlagsIncludeContentLayers = 1 << 5,
+ LayerTreeFlagsIncludeAcceleratesDrawing = 1 << 6,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned LayerTreeFlags;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/page/Settings.in 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> # draw canvas in software.
</span><span class="cx"> minimumAccelerated2dCanvasSize type=int, initial=257*256
</span><span class="cx">
</span><ins>+maximumAccelerated2dCanvasSize type=unsigned, initial=5120*2880
+
</ins><span class="cx"> layoutFallbackWidth type=int, initial=980
</span><span class="cx"> deviceWidth type=int, initial=0
</span><span class="cx"> deviceHeight type=int, initial=0
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -783,6 +783,11 @@
</span><span class="cx"> ts << "(backgroundColor " << m_backgroundColor.nameForRenderTreeAsText() << ")\n";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (behavior & LayerTreeAsTextIncludeAcceleratesDrawing && m_acceleratesDrawing) {
+ writeIndent(ts, indent + 1);
+ ts << "(acceleratesDrawing " << m_acceleratesDrawing << ")\n";
+ }
+
</ins><span class="cx"> if (!m_transform.isIdentity()) {
</span><span class="cx"> writeIndent(ts, indent + 1);
</span><span class="cx"> ts << "(transform ";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> LayerTreeAsTextIncludePaintingPhases = 1 << 4,
</span><span class="cx"> LayerTreeAsTextIncludeContentLayers = 1 << 5,
</span><span class="cx"> LayerTreeAsTextIncludePageOverlayLayers = 1 << 6,
</span><ins>+ LayerTreeAsTextIncludeAcceleratesDrawing = 1 << 7,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned LayerTreeAsTextBehavior;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -1799,6 +1799,8 @@
</span><span class="cx"> layerTreeBehavior |= LayerTreeAsTextIncludePaintingPhases;
</span><span class="cx"> if (flags & LayerTreeFlagsIncludeContentLayers)
</span><span class="cx"> layerTreeBehavior |= LayerTreeAsTextIncludeContentLayers;
</span><ins>+ if (flags & LayerTreeFlagsIncludeAcceleratesDrawing)
+ layerTreeBehavior |= LayerTreeAsTextIncludeAcceleratesDrawing;
</ins><span class="cx">
</span><span class="cx"> // We skip dumping the scroll and clip layers to keep layerTreeAsText output
</span><span class="cx"> // similar between platforms.
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -2044,6 +2044,8 @@
</span><span class="cx"> layerTreeFlags |= LayerTreeFlagsIncludePaintingPhases;
</span><span class="cx"> if (flags & Internals::LAYER_TREE_INCLUDES_CONTENT_LAYERS)
</span><span class="cx"> layerTreeFlags |= LayerTreeFlagsIncludeContentLayers;
</span><ins>+ if (flags & Internals::LAYER_TREE_INCLUDES_ACCELERATES_DRAWING)
+ layerTreeFlags |= LayerTreeFlagsIncludeAcceleratesDrawing;
</ins><span class="cx">
</span><span class="cx"> return layerTreeFlags;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/testing/Internals.h 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -262,7 +262,8 @@
</span><span class="cx"> LAYER_TREE_INCLUDES_TILE_CACHES = 2,
</span><span class="cx"> LAYER_TREE_INCLUDES_REPAINT_RECTS = 4,
</span><span class="cx"> LAYER_TREE_INCLUDES_PAINTING_PHASES = 8,
</span><del>- LAYER_TREE_INCLUDES_CONTENT_LAYERS = 16
</del><ins>+ LAYER_TREE_INCLUDES_CONTENT_LAYERS = 16,
+ LAYER_TREE_INCLUDES_ACCELERATES_DRAWING = 32,
</ins><span class="cx"> };
</span><span class="cx"> ExceptionOr<String> layerTreeAsText(Document&, unsigned short flags) const;
</span><span class="cx"> ExceptionOr<String> repaintRectsAsText() const;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (211948 => 211949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2017-02-09 13:52:56 UTC (rev 211948)
+++ trunk/Source/WebCore/testing/Internals.idl 2017-02-09 13:55:41 UTC (rev 211949)
</span><span class="lines">@@ -254,6 +254,7 @@
</span><span class="cx"> const unsigned short LAYER_TREE_INCLUDES_REPAINT_RECTS = 4;
</span><span class="cx"> const unsigned short LAYER_TREE_INCLUDES_PAINTING_PHASES = 8;
</span><span class="cx"> const unsigned short LAYER_TREE_INCLUDES_CONTENT_LAYERS = 16;
</span><ins>+ const unsigned short LAYER_TREE_INCLUDES_ACCELERATES_DRAWING = 32;
</ins><span class="cx"> [MayThrowException] DOMString layerTreeAsText(Document document, optional unsigned short flags = 0);
</span><span class="cx">
</span><span class="cx"> [MayThrowException] DOMString scrollingStateTreeAsText();
</span></span></pre>
</div>
</div>
</body>
</html>