<!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>[212489] branches/safari-603-branch</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/212489">212489</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 16:55:51 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211662">r211662</a>. rdar://problem/30467322</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestscompositingtilingoffscreentiledlayerexpectedtxt">branches/safari-603-branch/LayoutTests/compositing/tiling/offscreen-tiled-layer-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestscompositingtilingtransformorigintiledexpectedtxt">branches/safari-603-branch/LayoutTests/compositing/tiling/transform-origin-tiled-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingoffscreentiledlayerexpectedtxt">branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/offscreen-tiled-layer-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingrotatedtiledclampedexpectedtxt">branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/rotated-tiled-clamped-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingrotatedtiledpreserve3dclampedexpectedtxt">branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingtilecachezoomedexpectedtxt">branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/tile-cache-zoomed-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingtiledlayerresizeexpectedtxt">branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/tiled-layer-resize-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingtransformorigintiledexpectedtxt">branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/transform-origin-tiled-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmaccompositingtilingrotatedtiledclampedexpectedtxt">branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmaccompositingtilingrotatedtiledpreserve3dclampedexpectedtxt">branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmaccompositingtilingtiledlayerresizeexpectedtxt">branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/tiled-layer-resize-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk1compositingtilingoffscreentiledlayerexpectedtxt">branches/safari-603-branch/LayoutTests/platform/mac-wk1/compositing/tiling/offscreen-tiled-layer-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk1compositingtilingtransformorigintiledexpectedtxt">branches/safari-603-branch/LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk2compositingtilingrotatedtiledclampedexpectedtxt">branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/rotated-tiled-clamped-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk2compositingtilingrotatedtiledpreserve3dclampedexpectedtxt">branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk2compositingtilingtilecachezoomedexpectedtxt">branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/tile-cache-zoomed-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk2compositingtilingtiledlayerresizeexpectedtxt">branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/tiled-layer-resize-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingbackgroundtransparencytoggleexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/background-transparency-toggle-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingbackgroundtransparencytogglehtml">branches/safari-603-branch/LayoutTests/tiled-drawing/background-transparency-toggle.html</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrolldivlatcheddivexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrolldivlatcheddivwithhandlerexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrolldivlatchedmainframeexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrolldivlatchedmainframewithhandlerexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrolliframelatchediframeexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrolliframelatchediframewithhandlerexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrolliframelatchedmainframeexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrolliframelatchedmainframewithhandlerexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrollselectlatchedmainframeexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrollselectlatchedmainframewithhandlerexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrollselectlatchedselectexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfastscrollselectlatchedselectwithhandlerexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedfourbarszoomedexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbackgroundnoimageexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-background-no-image-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundbodylayerexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-body-layer-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundopacityexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundpositionedexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-positioned-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundtransformedexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundzoomedexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-zoomed-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedhtmlbackgroundexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-html-background-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixednonpropagatedbodybackgroundexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-non-propagated-body-background-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingsimpledocumentwithmargintilesexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/simple-document-with-margin-tiles-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilecoverageafterscrollexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-after-scroll-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilecoverageafterscrollspeculativeexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-after-scroll-speculative-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilecoveragescrolltobottomexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilecoverageslowscrollingexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-slow-scrolling-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilecoveragespeculativeexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-speculative-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilecoverageviewexposedrectexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-view-exposed-rect-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilesizebothscrollableexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-both-scrollable-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilesizehorizontallyscrollableexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-horizontally-scrollable-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilesizeslowzoomedexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-slow-zoomed-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilesizeunscrollableexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-unscrollable-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilesizeverticallyscrollableexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-vertically-scrollable-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtilesizeviewexposedrectexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-view-exposed-rect-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtileddrawingscrollpositionpagecacherestorationexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtileddrawingzoomexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-zoom-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtileddrawingzoomscrolledexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-zoom-scrolled-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingusetileddrawingexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/use-tiled-drawing-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingvisiblerectcontentinsetexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/visible-rect-content-inset-expected.txt</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicsTiledBackingh">branches/safari-603-branch/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicscaTileControllerh">branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileController.h</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderLayerBackingcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderLayerBackingh">branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#branchessafari603branchToolsChangeLog">branches/safari-603-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari603branchToolsDumpRenderTreeiosUIScriptControllerIOSmm">branches/safari-603-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm</a></li>
<li><a href="#branchessafari603branchToolsDumpRenderTreemacDumpRenderTreemm">branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#branchessafari603branchToolsDumpRenderTreemacDumpRenderTreeMach">branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h</a></li>
<li><a href="#branchessafari603branchToolsDumpRenderTreemacUIScriptControllerMacmm">branches/safari-603-branch/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm</a></li>
<li><a href="#branchessafari603branchToolsTestRunnerSharedUIScriptContextBindingsUIScriptControlleridl">branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl</a></li>
<li><a href="#branchessafari603branchToolsTestRunnerSharedUIScriptContextUIScriptControllercpp">branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp</a></li>
<li><a href="#branchessafari603branchToolsTestRunnerSharedUIScriptContextUIScriptControllerh">branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunnerPlatformWebViewh">branches/safari-603-branch/Tools/WebKitTestRunner/PlatformWebView.h</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunnerTestControllercpp">branches/safari-603-branch/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunnereflPlatformWebViewEflcpp">branches/safari-603-branch/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunnergtkPlatformWebViewGtkcpp">branches/safari-603-branch/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunneriosPlatformWebViewIOSmm">branches/safari-603-branch/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunneriosUIScriptControllerIOSmm">branches/safari-603-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunnermacPlatformWebViewMacmm">branches/safari-603-branch/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm</a></li>
<li><a href="#branchessafari603branchToolsWebKitTestRunnermacUIScriptControllerMacmm">branches/safari-603-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtiledbackinginwindowexpectedtxt">branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTeststileddrawingtiledbackinginwindowhtml">branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -1,5 +1,77 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211662. rdar://problem/30467322
+
+ 2017-02-03 Simon Fraser <simon.fraser@apple.com>
+
+ Correctly set the "inWindow" flag for TileControllers that aren't the page tiles, and clarify "usingTiledBacking" logic
+ https://bugs.webkit.org/show_bug.cgi?id=167774
+
+ Reviewed by Tim Horton.
+
+ Rebase to include the "in window" output.
+
+ tiled-drawing/background-transparency-toggle.html was sensitive to the length of the output, so give the body
+ a fixed size.
+
+ * compositing/tiling/offscreen-tiled-layer-expected.txt:
+ * compositing/tiling/transform-origin-tiled-expected.txt:
+ * platform/mac-wk1/compositing/tiling/offscreen-tiled-layer-expected.txt:
+ * platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt:
+ * platform/mac-wk2/compositing/tiling/rotated-tiled-clamped-expected.txt:
+ * platform/mac-wk2/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt:
+ * platform/mac-wk2/compositing/tiling/tile-cache-zoomed-expected.txt:
+ * platform/mac-wk2/compositing/tiling/tiled-layer-resize-expected.txt:
+ * platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt:
+ * platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt:
+ * platform/mac/compositing/tiling/tiled-layer-resize-expected.txt:
+ * tiled-drawing/background-transparency-toggle-expected.txt:
+ * tiled-drawing/background-transparency-toggle.html:
+ * tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt:
+ * tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt:
+ * tiled-drawing/scrolling/fixed-background/fixed-background-no-image-expected.txt:
+ * tiled-drawing/scrolling/fixed-background/fixed-body-background-body-layer-expected.txt:
+ * tiled-drawing/scrolling/fixed-background/fixed-body-background-expected.txt:
+ * tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.txt:
+ * tiled-drawing/scrolling/fixed-background/fixed-body-background-positioned-expected.txt:
+ * tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.txt:
+ * tiled-drawing/scrolling/fixed-background/fixed-body-background-zoomed-expected.txt:
+ * tiled-drawing/scrolling/fixed-background/fixed-html-background-expected.txt:
+ * tiled-drawing/scrolling/fixed-background/fixed-non-propagated-body-background-expected.txt:
+ * tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt:
+ * tiled-drawing/simple-document-with-margin-tiles-expected.txt:
+ * tiled-drawing/tile-coverage-after-scroll-expected.txt:
+ * tiled-drawing/tile-coverage-after-scroll-speculative-expected.txt:
+ * tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt:
+ * tiled-drawing/tile-coverage-slow-scrolling-expected.txt:
+ * tiled-drawing/tile-coverage-speculative-expected.txt:
+ * tiled-drawing/tile-coverage-view-exposed-rect-expected.txt:
+ * tiled-drawing/tile-size-both-scrollable-expected.txt:
+ * tiled-drawing/tile-size-horizontally-scrollable-expected.txt:
+ * tiled-drawing/tile-size-slow-zoomed-expected.txt:
+ * tiled-drawing/tile-size-unscrollable-expected.txt:
+ * tiled-drawing/tile-size-vertically-scrollable-expected.txt:
+ * tiled-drawing/tile-size-view-exposed-rect-expected.txt:
+ * tiled-drawing/tiled-backing-in-window-expected.txt: Added.
+ * tiled-drawing/tiled-backing-in-window.html: Added.
+ * tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration-expected.txt:
+ * tiled-drawing/tiled-drawing-zoom-expected.txt:
+ * tiled-drawing/tiled-drawing-zoom-scrolled-expected.txt:
+ * tiled-drawing/use-tiled-drawing-expected.txt:
+ * tiled-drawing/visible-rect-content-inset-expected.txt:
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211501. rdar://problem/29904368
</span><span class="cx">
</span><span class="cx"> 2017-02-01 Antoine Quint <graouts@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestscompositingtilingoffscreentiledlayerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/compositing/tiling/offscreen-tiled-layer-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/compositing/tiling/offscreen-tiled-layer-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/compositing/tiling/offscreen-tiled-layer-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 1024 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 1800.00)
</span><span class="lines">@@ -30,6 +31,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 0 x 0)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 0 x 0)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestscompositingtilingtransformorigintiledexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/compositing/tiling/transform-origin-tiled-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/compositing/tiling/transform-origin-tiled-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/compositing/tiling/transform-origin-tiled-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 600)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 58.00 50.00)
</span><span class="lines">@@ -48,6 +49,7 @@
</span><span class="cx"> (tile cache coverage 1024, 0 1024 x 300)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 2, 0 tiles grid 2 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingoffscreentiledlayerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/offscreen-tiled-layer-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/offscreen-tiled-layer-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/offscreen-tiled-layer-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 1024 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 1800.00)
</span><span class="lines">@@ -30,6 +31,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 0 x 0)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 0 x 0)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingrotatedtiledclampedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/rotated-tiled-clamped-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/rotated-tiled-clamped-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/rotated-tiled-clamped-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 600)
</span><span class="cx"> (tile size 800 x 600)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 58.00 50.00)
</span><span class="lines">@@ -49,6 +50,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2800 x 300)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 6 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingrotatedtiledpreserve3dclampedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 600)
</span><span class="cx"> (tile size 800 x 600)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 58.00 50.00)
</span><span class="lines">@@ -56,6 +57,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2800 x 300)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 6 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingtilecachezoomedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/tile-cache-zoomed-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/tile-cache-zoomed-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/tile-cache-zoomed-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 1024 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 8.00)
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingtiledlayerresizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/tiled-layer-resize-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/tiled-layer-resize-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/tiled-layer-resize-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 808 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 8.00)
</span><span class="lines">@@ -19,6 +20,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformiossimulatorwk2compositingtilingtransformorigintiledexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/transform-origin-tiled-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/transform-origin-tiled-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/compositing/tiling/transform-origin-tiled-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 600)
</span><span class="cx"> (tile size 800 x 600)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 58.00 50.00)
</span><span class="lines">@@ -48,6 +49,7 @@
</span><span class="cx"> (tile cache coverage 1024, 0 1024 x 300)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 2, 0 tiles grid 2 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmaccompositingtilingrotatedtiledclampedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2800 x 300)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 6 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmaccompositingtilingrotatedtiledpreserve3dclampedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2800 x 300)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 6 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmaccompositingtilingtiledlayerresizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/tiled-layer-resize-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/tiled-layer-resize-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/mac/compositing/tiling/tiled-layer-resize-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk1compositingtilingoffscreentiledlayerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk1/compositing/tiling/offscreen-tiled-layer-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk1/compositing/tiling/offscreen-tiled-layer-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk1/compositing/tiling/offscreen-tiled-layer-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 0 x 0)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 0 x 0)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk1compositingtilingtransformorigintiledexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> (tile cache coverage 1024, 0 1024 x 300)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 2, 0 tiles grid 2 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk2compositingtilingrotatedtiledclampedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/rotated-tiled-clamped-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/rotated-tiled-clamped-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/rotated-tiled-clamped-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 600)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 58.00 50.00)
</span><span class="lines">@@ -49,6 +50,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2800 x 300)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 6 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk2compositingtilingrotatedtiledpreserve3dclampedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 600)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 58.00 50.00)
</span><span class="lines">@@ -56,6 +57,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2800 x 300)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 6 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk2compositingtilingtilecachezoomedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/tile-cache-zoomed-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/tile-cache-zoomed-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/tile-cache-zoomed-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 640 x 640)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 8.00)
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk2compositingtilingtiledlayerresizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/tiled-layer-resize-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/tiled-layer-resize-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk2/compositing/tiling/tiled-layer-resize-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 808 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 8.00)
</span><span class="lines">@@ -19,6 +20,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingbackgroundtransparencytoggleexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/background-transparency-toggle-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/background-transparency-toggle-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/background-transparency-toggle-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -2,53 +2,57 @@
</span><span class="cx">
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 800.00 600.00)
</del><ins>+ (bounds 785.00 1024.00)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 800.00 600.00)
</del><ins>+ (bounds 785.00 1024.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><del>- (tile cache coverage 0, 0 800 x 600)
- (tile size 800 x 600)
- (top left tile 0, 0 tiles grid 1 x 1)
</del><ins>+ (tile cache coverage 0, 0 785 x 1024)
+ (tile size 785 x 512)
+ (top left tile 0, 0 tiles grid 1 x 2)
+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 800.00 600.00)
</del><ins>+ (bounds 785.00 1024.00)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 800.00 600.00)
</del><ins>+ (bounds 785.00 1024.00)
</ins><span class="cx"> (backgroundColor #00000033)
</span><del>- (tile cache coverage 0, 0 800 x 600)
- (tile size 800 x 600)
- (top left tile 0, 0 tiles grid 1 x 1)
</del><ins>+ (tile cache coverage 0, 0 785 x 1024)
+ (tile size 785 x 512)
+ (top left tile 0, 0 tiles grid 1 x 2)
+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 800.00 600.00)
</del><ins>+ (bounds 785.00 1024.00)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 800.00 600.00)
</del><ins>+ (bounds 785.00 1024.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><del>- (tile cache coverage 0, 0 800 x 600)
- (tile size 800 x 600)
- (top left tile 0, 0 tiles grid 1 x 1)
</del><ins>+ (tile cache coverage 0, 0 785 x 1024)
+ (tile size 785 x 512)
+ (top left tile 0, 0 tiles grid 1 x 2)
+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 785.00 648.00)
</del><ins>+ (bounds 785.00 1024.00)
</ins><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 785.00 648.00)
</del><ins>+ (bounds 785.00 1024.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><del>- (tile cache coverage 0, 0 785 x 600)
- (tile size 800 x 600)
- (top left tile 0, 0 tiles grid 1 x 1)
</del><ins>+ (tile cache coverage 0, 0 785 x 1024)
+ (tile size 785 x 512)
+ (top left tile 0, 0 tiles grid 1 x 2)
+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingbackgroundtransparencytogglehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/background-transparency-toggle.html (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/background-transparency-toggle.html 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/background-transparency-toggle.html 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> <style>
</span><span class="cx"> body {
</span><span class="cx"> background-color: white;
</span><ins>+ height: 1000px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> body.transparent {
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrolldivlatcheddivexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2008 x 2048)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 4 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrolldivlatcheddivwithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2008 x 2048)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 4 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrolldivlatchedmainframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2008 x 2048)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 4 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrolldivlatchedmainframewithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2008 x 2048)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 4 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrolliframelatchediframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 2048)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrolliframelatchediframewithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 2048)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrolliframelatchedmainframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 2048)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrolliframelatchedmainframewithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 2048)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrollselectlatchedmainframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2008 x 2048)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 4 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrollselectlatchedmainframewithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2008 x 2048)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 4 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrollselectlatchedselectexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2008 x 2048)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 4 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfastscrollselectlatchedselectwithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 2008 x 2048)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 4 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedfourbarszoomedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 341 x 445)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> (children 4
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position -4.00 -4.00)
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbackgroundnoimageexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-background-no-image-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-background-no-image-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-background-no-image-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 1024)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundbodylayerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-body-layer-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-body-layer-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-body-layer-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 1024)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 1024)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundopacityexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 1024)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundpositionedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-positioned-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-positioned-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-positioned-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 1024)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundtransformedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 795 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedbodybackgroundzoomedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-zoomed-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-zoomed-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-body-background-zoomed-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 445 x 667)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 3)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixedhtmlbackgroundexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-html-background-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-html-background-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-html-background-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 1024)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingscrollingfixedbackgroundfixednonpropagatedbodybackgroundexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-non-propagated-body-background-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-non-propagated-body-background-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/scrolling/fixed-background/fixed-non-propagated-body-background-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 1024)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingsimpledocumentwithmargintilesexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/simple-document-with-margin-tiles-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/simple-document-with-margin-tiles-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/simple-document-with-margin-tiles-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage -512, -512 2048 x 2048)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile -1, -1 tiles grid 4 x 4)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilecoverageafterscrollexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-after-scroll-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-after-scroll-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-after-scroll-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 2560 785 x 1536)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 5 tiles grid 1 x 3)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilecoverageafterscrollspeculativeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-after-scroll-speculative-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-after-scroll-speculative-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-after-scroll-speculative-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 2560 785 x 1536)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 5 tiles grid 1 x 3)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilecoveragescrolltobottomexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 4096 785 x 925)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 8 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilecoverageslowscrollingexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-slow-scrolling-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-slow-scrolling-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-slow-scrolling-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 600)
</span><span class="cx"> (tile size 800 x 600)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilecoveragespeculativeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-speculative-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-speculative-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-speculative-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 1024)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilecoverageviewexposedrectexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-view-exposed-rect-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-view-exposed-rect-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-coverage-view-exposed-rect-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> (tile cache coverage 0, 1024 800 x 512)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 2 tiles grid 2 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilesizebothscrollableexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-both-scrollable-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-both-scrollable-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-both-scrollable-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 1024 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilesizehorizontallyscrollableexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-horizontally-scrollable-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-horizontally-scrollable-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-horizontally-scrollable-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 1024 x 585)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilesizeslowzoomedexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-slow-zoomed-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-slow-zoomed-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-slow-zoomed-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 602 x 584)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilesizeunscrollableexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-unscrollable-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-unscrollable-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-unscrollable-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 600)
</span><span class="cx"> (tile size 800 x 600)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilesizeverticallyscrollableexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-vertically-scrollable-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-vertically-scrollable-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-vertically-scrollable-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 785 x 1024)
</span><span class="cx"> (tile size 785 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtilesizeviewexposedrectexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-view-exposed-rect-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-view-exposed-rect-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tile-size-view-exposed-rect-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 512)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtiledbackinginwindowexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt (0 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+Tiled box
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 2208.00 1016.00)
+ (visible rect 0.00, 0.00 785.00 x 585.00)
+ (coverage rect 0.00, 0.00 785.00 x 585.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 2208.00 1016.00)
+ (contentsOpaque 1)
+ (visible rect 0.00, 0.00 785.00 x 585.00)
+ (coverage rect 0.00, 0.00 785.00 x 585.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (tile cache coverage 0, 0 1024 x 1016)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 2)
+ (in window 1)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 2200.00 200.00)
+ (usingTiledLayer 1)
+ (drawsContent 1)
+ (visible rect 0.00, 0.00 777.00 x 200.00)
+ (coverage rect -8.00, -8.00 785.00 x 585.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (tile cache coverage 0, 0 1024 x 200)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 1)
+ (in window 1)
+ )
+ )
+ )
+ )
+)
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 2208.00 1016.00)
+ (visible rect 0.00, 0.00 785.00 x 585.00)
+ (coverage rect 0.00, 0.00 785.00 x 585.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 2208.00 1016.00)
+ (contentsOpaque 1)
+ (visible rect 0.00, 0.00 785.00 x 585.00)
+ (coverage rect 0.00, 0.00 785.00 x 585.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (tile cache coverage 0, 0 1024 x 1016)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 2)
+ (in window 0)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 2200.00 200.00)
+ (usingTiledLayer 1)
+ (drawsContent 1)
+ (visible rect 0.00, 0.00 777.00 x 200.00)
+ (coverage rect -8.00, -8.00 785.00 x 585.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (tile cache coverage 0, 0 1024 x 200)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 1)
+ (in window 0)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtiledbackinginwindowhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window.html (0 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-backing-in-window.html 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ height: 1000px;
+ }
+
+ .box {
+ height: 200px;
+ width: 2200px;
+ background: repeating-linear-gradient(to right, white, blue 400px);
+ }
+
+ .composited {
+ transform: translateZ(0);
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function getUIScript()
+ {
+ return `
+ (function() {
+ uiController.removeViewFromWindow(function() {
+ uiController.uiScriptComplete('');
+ });
+ })();`
+ }
+
+ function dumpTiles(outputId)
+ {
+ if (window.internals) {
+ document.getElementById(outputId).innerText = internals.layerTreeAsText(document,
+ internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
+ }
+ }
+ function doTest()
+ {
+ if (!testRunner.runUIScript)
+ return;
+
+ dumpTiles('before-layers');
+
+ testRunner.runUIScript(getUIScript(), function(result) {
+ dumpTiles('after-layers');
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+ <div class="composited box">Tiled box</div>
+
+<pre id="before-layers">Layer tree goes here</pre>
+<pre id="after-layers">Layer tree goes here</pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtileddrawingscrollpositionpagecacherestorationexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 512, 0 2048 x 2560)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 1, 0 tiles grid 4 x 5)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtileddrawingzoomexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-zoom-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-zoom-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-zoom-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 445 x 445)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingtileddrawingzoomscrolledexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-zoom-scrolled-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-zoom-scrolled-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/tiled-drawing-zoom-scrolled-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> (tile cache coverage 667, 890 540 x 445)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 3, 4 tiles grid 3 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingusetileddrawingexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/use-tiled-drawing-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/use-tiled-drawing-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/use-tiled-drawing-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 1024 x 1024)
</span><span class="cx"> (tile size 512 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 2 x 2)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchLayoutTeststileddrawingvisiblerectcontentinsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/tiled-drawing/visible-rect-content-inset-expected.txt (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/tiled-drawing/visible-rect-content-inset-expected.txt 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/LayoutTests/tiled-drawing/visible-rect-content-inset-expected.txt 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> (tile cache coverage 0, 0 800 x 500)
</span><span class="cx"> (tile size 800 x 512)
</span><span class="cx"> (top left tile 0, 0 tiles grid 1 x 1)
</span><ins>+ (in window 1)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211662. rdar://problem/30467322
+
+ 2017-02-03 Simon Fraser <simon.fraser@apple.com>
+
+ Correctly set the "inWindow" flag for TileControllers that aren't the page tiles, and clarify "usingTiledBacking" logic
+ https://bugs.webkit.org/show_bug.cgi?id=167774
+
+ Reviewed by Tim Horton.
+
+ RenderLayerBacking had some very confusing "usingTiledCacheLayer" uses.
+
+ Its member variable, m_usingTiledCacheLayer, really meant "m_isMainFrameLayerWithTiledBacking" so make it so.
+ It had a usingTiledBacking(), which returned the same thing, which this patch replaces with isMainFrameLayerWithTiledBacking().
+
+ The fact that usingTiledBacking() was only true for the page tiled layer tripped up
+ RenderLayerCompositor::setIsInWindowForLayerIncludingDescendants(), which would only ever call setIsInWindow()
+ on the page tiled layer. These changes fix that.
+
+ Also make a way for tests to unparent the web view via UIScriptController, and dump out the "in window"
+ status of TileBackings when dumping tile caches.
+
+ Test: tiled-drawing/tiled-backing-in-window.html
+
+ * platform/graphics/TiledBacking.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::dumpAdditionalProperties):
+ * platform/graphics/ca/TileController.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::RenderLayerBacking):
+ (WebCore::computePageTiledBackingCoverage):
+ (WebCore::RenderLayerBacking::adjustTiledBackingCoverage):
+ (WebCore::RenderLayerBacking::setTiledBackingHasMargins):
+ (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+ (WebCore::RenderLayerBacking::shouldClipCompositedBounds):
+ (WebCore::RenderLayerBacking::updateDescendantClippingLayer):
+ (WebCore::RenderLayerBacking::updateRootLayerConfiguration):
+ (WebCore::RenderLayerBacking::paintsIntoWindow):
+ (WebCore::computeTileCoverage): Deleted.
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+ (WebCore::RenderLayerCompositor::rootFixedBackgroundsChanged):
+ (WebCore::RenderLayerCompositor::setIsInWindowForLayerIncludingDescendants):
+ (WebCore::RenderLayerCompositor::supportsFixedRootBackgroundCompositing):
+ (WebCore::RenderLayerCompositor::documentUsesTiledBacking):
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211501. rdar://problem/29904368
</span><span class="cx">
</span><span class="cx"> 2017-02-01 Antoine Quint <graouts@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/TiledBacking.h (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/TiledBacking.h 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/TiledBacking.h 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> virtual void prepopulateRect(const FloatRect&) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void setIsInWindow(bool) = 0;
</span><ins>+ virtual bool isInWindow() const = 0;
</ins><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> CoverageForVisibleArea = 0,
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -3510,6 +3510,9 @@
</span><span class="cx"> IntRect gridExtent = tiledBacking()->tileGridExtent();
</span><span class="cx"> writeIndent(textStream, indent + 1);
</span><span class="cx"> textStream << "(top left tile " << gridExtent.x() << ", " << gridExtent.y() << " tiles grid " << gridExtent.width() << " x " << gridExtent.height() << ")\n";
</span><ins>+
+ writeIndent(textStream, indent + 1);
+ textStream << "(in window " << tiledBacking()->isInWindow() << ")\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (behavior & LayerTreeAsTextIncludeContentLayers) {
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileController.h (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileController.h 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/ca/TileController.h 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -138,7 +138,6 @@
</span><span class="cx">
</span><span class="cx"> void scheduleTileRevalidation(double interval);
</span><span class="cx">
</span><del>- bool isInWindow() const { return m_isInWindow; }
</del><span class="cx"> float topContentInset() const { return m_topContentInset; }
</span><span class="cx">
</span><span class="cx"> // TiledBacking member functions.
</span><span class="lines">@@ -152,6 +151,7 @@
</span><span class="cx"> void setScrollability(Scrollability) override;
</span><span class="cx"> void prepopulateRect(const FloatRect&) override;
</span><span class="cx"> void setIsInWindow(bool) override;
</span><ins>+ bool isInWindow() const override { return m_isInWindow; }
</ins><span class="cx"> void setTileCoverage(TileCoverage) override;
</span><span class="cx"> void revalidateTiles() override;
</span><span class="cx"> void forceRepaint() override;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -107,37 +107,25 @@
</span><span class="cx">
</span><span class="cx"> RenderLayerBacking::RenderLayerBacking(RenderLayer& layer)
</span><span class="cx"> : m_owningLayer(layer)
</span><del>- , m_viewportConstrainedNodeID(0)
- , m_scrollingNodeID(0)
- , m_artificiallyInflatedBounds(false)
- , m_isMainFrameRenderViewLayer(false)
- , m_usingTiledCacheLayer(false)
- , m_requiresOwnBackingStore(true)
- , m_canCompositeFilters(false)
-#if ENABLE(FILTERS_LEVEL_2)
- , m_canCompositeBackdropFilters(false)
-#endif
- , m_backgroundLayerPaintsFixedRootBackground(false)
</del><span class="cx"> {
</span><span class="cx"> Page* page = renderer().frame().page();
</span><span class="cx">
</span><span class="cx"> if (layer.isRootLayer() && page) {
</span><span class="cx"> m_isMainFrameRenderViewLayer = renderer().frame().isMainFrame();
</span><del>- m_usingTiledCacheLayer = page->chrome().client().shouldUseTiledBackingForFrameView(renderer().frame().view());
</del><ins>+ m_isMainFrameLayerWithTiledBacking = page->chrome().client().shouldUseTiledBackingForFrameView(renderer().frame().view());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> createPrimaryGraphicsLayer();
</span><span class="cx">
</span><del>- if (m_usingTiledCacheLayer && page) {
- TiledBacking* tiledBacking = this->tiledBacking();
-
</del><ins>+ if (TiledBacking* tiledBacking = this->tiledBacking()) {
</ins><span class="cx"> tiledBacking->setIsInWindow(page->isInWindow());
</span><span class="cx">
</span><del>- if (m_isMainFrameRenderViewLayer)
</del><ins>+ if (m_isMainFrameLayerWithTiledBacking && page) {
</ins><span class="cx"> tiledBacking->setUnparentsOffscreenTiles(true);
</span><span class="cx">
</span><del>- tiledBacking->setScrollingPerformanceLoggingEnabled(page->settings().scrollingPerformanceLoggingEnabled());
- adjustTiledBackingCoverage();
</del><ins>+ tiledBacking->setScrollingPerformanceLoggingEnabled(page->settings().scrollingPerformanceLoggingEnabled());
+ adjustTiledBackingCoverage();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -215,7 +203,7 @@
</span><span class="cx"> return m_graphicsLayer->tiledBacking();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TiledBacking::TileCoverage computeTileCoverage(RenderLayerBacking* backing)
</del><ins>+static TiledBacking::TileCoverage computePageTiledBackingCoverage(RenderLayerBacking* backing)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: When we use TiledBacking for overflow, this should look at RenderView scrollability.
</span><span class="cx"> FrameView& frameView = backing->owningLayer().renderer().view().frameView();
</span><span class="lines">@@ -235,16 +223,16 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::adjustTiledBackingCoverage()
</span><span class="cx"> {
</span><del>- if (!m_usingTiledCacheLayer)
</del><ins>+ if (!m_isMainFrameLayerWithTiledBacking)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- TiledBacking::TileCoverage tileCoverage = computeTileCoverage(this);
</del><ins>+ TiledBacking::TileCoverage tileCoverage = computePageTiledBackingCoverage(this);
</ins><span class="cx"> tiledBacking()->setTileCoverage(tileCoverage);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::setTiledBackingHasMargins(bool hasExtendedBackgroundOnLeftAndRight, bool hasExtendedBackgroundOnTopAndBottom)
</span><span class="cx"> {
</span><del>- if (!m_usingTiledCacheLayer)
</del><ins>+ if (!m_isMainFrameLayerWithTiledBacking)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> tiledBacking()->setHasMargins(hasExtendedBackgroundOnTopAndBottom, hasExtendedBackgroundOnTopAndBottom, hasExtendedBackgroundOnLeftAndRight, hasExtendedBackgroundOnLeftAndRight);
</span><span class="lines">@@ -302,10 +290,10 @@
</span><span class="cx"> layerName.truncate(maxLayerNameLength);
</span><span class="cx"> layerName.append("...");
</span><span class="cx"> }
</span><del>- m_graphicsLayer = createGraphicsLayer(layerName, m_usingTiledCacheLayer ? GraphicsLayer::Type::PageTiledBacking : GraphicsLayer::Type::Normal);
</del><ins>+ m_graphicsLayer = createGraphicsLayer(layerName, m_isMainFrameLayerWithTiledBacking ? GraphicsLayer::Type::PageTiledBacking : GraphicsLayer::Type::Normal);
</ins><span class="cx">
</span><del>- if (m_usingTiledCacheLayer) {
- m_childContainmentLayer = createGraphicsLayer("TiledBacking containment");
</del><ins>+ if (m_isMainFrameLayerWithTiledBacking) {
+ m_childContainmentLayer = createGraphicsLayer("Page TiledBacking containment");
</ins><span class="cx"> m_graphicsLayer->addChild(m_childContainmentLayer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -486,7 +474,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (m_usingTiledCacheLayer)
</del><ins>+ if (m_isMainFrameLayerWithTiledBacking)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (layerOrAncestorIsTransformedOrUsingCompositedScrolling(m_owningLayer))
</span><span class="lines">@@ -1345,7 +1333,7 @@
</span><span class="cx"> bool layersChanged = false;
</span><span class="cx">
</span><span class="cx"> if (needsDescendantClip) {
</span><del>- if (!m_childContainmentLayer && !m_usingTiledCacheLayer) {
</del><ins>+ if (!m_childContainmentLayer && !m_isMainFrameLayerWithTiledBacking) {
</ins><span class="cx"> m_childContainmentLayer = createGraphicsLayer("child clipping");
</span><span class="cx"> m_childContainmentLayer->setMasksToBounds(true);
</span><span class="cx"> layersChanged = true;
</span><span class="lines">@@ -1850,7 +1838,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::updateRootLayerConfiguration()
</span><span class="cx"> {
</span><del>- if (!m_usingTiledCacheLayer)
</del><ins>+ if (!m_isMainFrameLayerWithTiledBacking)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Color backgroundColor;
</span><span class="lines">@@ -2234,7 +2222,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderLayerBacking::paintsIntoWindow() const
</span><span class="cx"> {
</span><del>- if (m_usingTiledCacheLayer)
</del><ins>+ if (m_isMainFrameLayerWithTiledBacking)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (m_owningLayer.isRootLayer()) {
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.h (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.h 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderLayerBacking.h 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> GraphicsLayer* graphicsLayer() const { return m_graphicsLayer.get(); }
</span><span class="cx">
</span><span class="cx"> // Layer to clip children
</span><del>- bool hasClippingLayer() const { return (m_childContainmentLayer && !m_usingTiledCacheLayer); }
- GraphicsLayer* clippingLayer() const { return !m_usingTiledCacheLayer ? m_childContainmentLayer.get() : nullptr; }
</del><ins>+ bool hasClippingLayer() const { return (m_childContainmentLayer && !m_isMainFrameLayerWithTiledBacking); }
+ GraphicsLayer* clippingLayer() const { return !m_isMainFrameLayerWithTiledBacking ? m_childContainmentLayer.get() : nullptr; }
</ins><span class="cx">
</span><span class="cx"> // Layer to get clipped by ancestor
</span><span class="cx"> bool hasAncestorClippingLayer() const { return m_ancestorClippingLayer != nullptr; }
</span><span class="lines">@@ -181,7 +181,8 @@
</span><span class="cx"> void positionOverflowControlsLayers();
</span><span class="cx"> bool hasUnpositionedOverflowControlsLayers() const;
</span><span class="cx">
</span><del>- bool usingTiledBacking() const { return m_usingTiledCacheLayer; }
</del><ins>+ bool isMainFrameLayerWithTiledBacking() const { return m_isMainFrameLayerWithTiledBacking; }
+
</ins><span class="cx"> WEBCORE_EXPORT TiledBacking* tiledBacking() const;
</span><span class="cx"> void adjustTiledBackingCoverage();
</span><span class="cx"> void setTiledBackingHasMargins(bool hasExtendedBackgroundOnLeftAndRight, bool hasExtendedBackgroundOnTopAndBottom);
</span><span class="lines">@@ -330,8 +331,8 @@
</span><span class="cx">
</span><span class="cx"> bool shouldClipCompositedBounds() const;
</span><span class="cx">
</span><del>- bool hasTiledBackingFlatteningLayer() const { return (m_childContainmentLayer && m_usingTiledCacheLayer); }
- GraphicsLayer* tileCacheFlatteningLayer() const { return m_usingTiledCacheLayer ? m_childContainmentLayer.get() : nullptr; }
</del><ins>+ bool hasTiledBackingFlatteningLayer() const { return (m_childContainmentLayer && m_isMainFrameLayerWithTiledBacking); }
+ GraphicsLayer* tileCacheFlatteningLayer() const { return m_isMainFrameLayerWithTiledBacking ? m_childContainmentLayer.get() : nullptr; }
</ins><span class="cx">
</span><span class="cx"> void paintIntoLayer(const GraphicsLayer*, GraphicsContext&, const IntRect& paintDirtyRect, PaintBehavior, GraphicsLayerPaintingPhase);
</span><span class="cx">
</span><span class="lines">@@ -363,22 +364,22 @@
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_scrollingLayer; // Only used if the layer is using composited scrolling.
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_scrollingContentsLayer; // Only used if the layer is using composited scrolling.
</span><span class="cx">
</span><del>- ScrollingNodeID m_viewportConstrainedNodeID;
- ScrollingNodeID m_scrollingNodeID;
-
</del><span class="cx"> LayoutRect m_compositedBounds;
</span><span class="cx"> LayoutSize m_subpixelOffsetFromRenderer; // This is the subpixel distance between the primary graphics layer and the associated renderer's bounds.
</span><span class="cx"> LayoutSize m_compositedBoundsOffsetFromGraphicsLayer; // This is the subpixel distance between the primary graphics layer and the render layer bounds.
</span><span class="cx">
</span><del>- bool m_artificiallyInflatedBounds; // bounds had to be made non-zero to make transform-origin work
- bool m_isMainFrameRenderViewLayer;
- bool m_usingTiledCacheLayer;
- bool m_requiresOwnBackingStore;
- bool m_canCompositeFilters;
</del><ins>+ ScrollingNodeID m_viewportConstrainedNodeID { 0 };
+ ScrollingNodeID m_scrollingNodeID { 0 };
+
+ bool m_artificiallyInflatedBounds { false }; // bounds had to be made non-zero to make transform-origin work
+ bool m_isMainFrameRenderViewLayer { false };
+ bool m_isMainFrameLayerWithTiledBacking { false };
+ bool m_requiresOwnBackingStore { true };
+ bool m_canCompositeFilters { false };
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><del>- bool m_canCompositeBackdropFilters;
</del><ins>+ bool m_canCompositeBackdropFilters { false };
</ins><span class="cx"> #endif
</span><del>- bool m_backgroundLayerPaintsFixedRootBackground;
</del><ins>+ bool m_backgroundLayerPaintsFixedRootBackground { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum CanvasCompositingStrategy {
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx"> if (GraphicsLayer* rootLayer = rootGraphicsLayer()) {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> FloatRect exposedRect = frameView.exposedContentRect();
</span><del>- LOG_WITH_STREAM(Compositing, stream << "RenderLayerCompositor " << this << " flushPendingLayerChanges (root " << isFlushRoot << ") exposedRect " << exposedRect);
</del><ins>+ LOG_WITH_STREAM(Compositing, stream << "\nRenderLayerCompositor " << this << " flushPendingLayerChanges (root " << isFlushRoot << ") exposedRect " << exposedRect);
</ins><span class="cx"> rootLayer->flushCompositingState(exposedRect);
</span><span class="cx"> #else
</span><span class="cx"> // Having a m_clipLayer indicates that we're doing scrolling via GraphicsLayers.
</span><span class="lines">@@ -462,8 +462,9 @@
</span><span class="cx"> if (frameView.viewExposedRect())
</span><span class="cx"> visibleRect.intersect(frameView.viewExposedRect().value());
</span><span class="cx">
</span><del>- LOG_WITH_STREAM(Compositing, stream << "RenderLayerCompositor " << this << " flushPendingLayerChanges(" << isFlushRoot << ") " << visibleRect);
</del><ins>+ LOG_WITH_STREAM(Compositing, stream << "\nRenderLayerCompositor " << this << " flushPendingLayerChanges(" << isFlushRoot << ") " << visibleRect);
</ins><span class="cx"> rootLayer->flushCompositingState(visibleRect);
</span><ins>+ LOG_WITH_STREAM(Compositing, stream << "RenderLayerCompositor " << this << " flush complete\n");
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1790,7 +1791,7 @@
</span><span class="cx"> void RenderLayerCompositor::rootFixedBackgroundsChanged()
</span><span class="cx"> {
</span><span class="cx"> RenderLayerBacking* renderViewBacking = m_renderView.layer()->backing();
</span><del>- if (renderViewBacking && renderViewBacking->usingTiledBacking())
</del><ins>+ if (renderViewBacking && renderViewBacking->isMainFrameLayerWithTiledBacking())
</ins><span class="cx"> setCompositingLayersNeedRebuild();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2061,11 +2062,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::setIsInWindowForLayerIncludingDescendants(RenderLayer& layer, bool isInWindow)
</span><span class="cx"> {
</span><del>- if (layer.isComposited() && layer.backing()->usingTiledBacking())
- layer.backing()->tiledBacking()->setIsInWindow(isInWindow);
</del><ins>+ if (layer.isComposited()) {
+ if (auto* backing = layer.backing()->tiledBacking())
+ backing->setIsInWindow(isInWindow);
+ }
</ins><span class="cx">
</span><span class="cx"> // No need to recurse if we don't have any other tiled layers.
</span><del>- if (hasNonMainLayersWithTiledBacking())
</del><ins>+ if (!hasNonMainLayersWithTiledBacking())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (RenderLayer* childLayer = layer.firstChild(); childLayer; childLayer = childLayer->nextSibling())
</span><span class="lines">@@ -2876,7 +2879,7 @@
</span><span class="cx"> bool RenderLayerCompositor::supportsFixedRootBackgroundCompositing() const
</span><span class="cx"> {
</span><span class="cx"> RenderLayerBacking* renderViewBacking = m_renderView.layer()->backing();
</span><del>- return renderViewBacking && renderViewBacking->usingTiledBacking();
</del><ins>+ return renderViewBacking && renderViewBacking->isMainFrameLayerWithTiledBacking();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerCompositor::needsFixedRootBackgroundLayer(const RenderLayer& layer) const
</span><span class="lines">@@ -2985,7 +2988,7 @@
</span><span class="cx"> if (!backing)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return backing->usingTiledBacking();
</del><ins>+ return backing->isMainFrameLayerWithTiledBacking();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerCompositor::isMainFrameCompositor() const
</span></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211662. rdar://problem/30467322
+
+ 2017-02-03 Simon Fraser <simon.fraser@apple.com>
+
+ Correctly set the "inWindow" flag for TileControllers that aren't the page tiles, and clarify "usingTiledBacking" logic
+ https://bugs.webkit.org/show_bug.cgi?id=167774
+
+ Reviewed by Tim Horton.
+
+ Implement UIScriptController removeViewFromWindow() and addViewToWindow(), and hook
+ up for Mac WK1 and WK2, and iOS WK2. It takes a callback because view state updates to the
+ web process are async, so the callback fires after the web process gets the new state.
+
+ * DumpRenderTree/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptController::removeViewFromWindow):
+ (WTR::UIScriptController::addViewToWindow):
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (createWebViewAndOffscreenWindow):
+ (resetWebViewToConsistentStateBeforeTesting):
+ * DumpRenderTree/mac/DumpRenderTreeMac.h:
+ * DumpRenderTree/mac/UIScriptControllerMac.mm:
+ (WTR::UIScriptController::removeViewFromWindow):
+ (WTR::UIScriptController::addViewToWindow):
+ * TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl:
+ * TestRunnerShared/UIScriptContext/UIScriptController.cpp:
+ (WTR::UIScriptController::removeViewFromWindow):
+ (WTR::UIScriptController::addViewToWindow):
+ * TestRunnerShared/UIScriptContext/UIScriptController.h:
+ * WebKitTestRunner/PlatformWebView.h:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues):
+ * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+ (WTR::PlatformWebView::removeFromWindow):
+ (WTR::PlatformWebView::addToWindow):
+ * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptController::removeViewFromWindow):
+ (WTR::UIScriptController::addViewToWindow):
+ * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+ (WTR::PlatformWebView::removeFromWindow):
+ (WTR::PlatformWebView::addToWindow):
+ * WebKitTestRunner/mac/UIScriptControllerMac.mm:
+ (WTR::UIScriptController::removeViewFromWindow):
+ (WTR::UIScriptController::addViewToWindow):
+
</ins><span class="cx"> 2017-02-10 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211910. rdar://problem/30358835
</span></span></pre></div>
<a id="branchessafari603branchToolsDumpRenderTreeiosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -289,6 +289,14 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIScriptController::removeViewFromWindow(JSValueRef)
+{
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIScriptController::addViewToWindow(JSValueRef)
+{
+}
+
+}
+
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="branchessafari603branchToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -179,13 +179,16 @@
</span><span class="cx"> NavigationController* gNavigationController = nullptr;
</span><span class="cx"> RefPtr<TestRunner> gTestRunner;
</span><span class="cx">
</span><del>-WebFrame *mainFrame = nullptr;
</del><ins>+WebFrame *mainFrame = nil;
</ins><span class="cx"> // This is the topmost frame that is loading, during a given load, or nil when no load is
</span><span class="cx"> // in progress. Usually this is the same as the main frame, but not always. In the case
</span><span class="cx"> // where a frameset is loaded, and then new content is loaded into one of the child frames,
</span><span class="cx"> // that child frame is the "topmost frame that is loading".
</span><del>-WebFrame *topLoadingFrame = nullptr; // !nil iff a load is in progress
</del><ins>+WebFrame *topLoadingFrame = nil; // !nil iff a load is in progress
</ins><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+NSWindow *mainWindow = nil;
+#endif
</ins><span class="cx">
</span><span class="cx"> CFMutableSetRef disallowedURLs= nullptr;
</span><span class="cx"> static CFRunLoopTimerRef waitToDumpWatchdog;
</span><span class="lines">@@ -798,6 +801,7 @@
</span><span class="cx"> NSScreen *firstScreen = [[NSScreen screens] firstObject];
</span><span class="cx"> NSRect windowRect = (showWebView) ? NSOffsetRect(rect, 100, 100) : NSOffsetRect(rect, -10000, [firstScreen frame].size.height - rect.size.height + 10000);
</span><span class="cx"> DumpRenderTreeWindow *window = [[DumpRenderTreeWindow alloc] initWithContentRect:windowRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
</span><ins>+ mainWindow = window;
</ins><span class="cx">
</span><span class="cx"> [window setColorSpace:[firstScreen colorSpace]];
</span><span class="cx"> [window setCollectionBehavior:NSWindowCollectionBehaviorStationary];
</span><span class="lines">@@ -1825,6 +1829,12 @@
</span><span class="cx"> static void resetWebViewToConsistentStateBeforeTesting(const TestOptions& options)
</span><span class="cx"> {
</span><span class="cx"> WebView *webView = [mainFrame webView];
</span><ins>+
+#if PLATFORM(MAC)
+ if (![webView superview])
+ [[mainWindow contentView] addSubview:webView];
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> adjustWebDocumentForStandardViewport(gWebBrowserView, gWebScrollView);
</span><span class="cx"> [webView _setAllowsMessaging:YES];
</span></span></pre></div>
<a id="branchessafari603branchToolsDumpRenderTreemacDumpRenderTreeMach"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -48,6 +48,14 @@
</span><span class="cx"> extern PolicyDelegate* policyDelegate;
</span><span class="cx"> extern DefaultPolicyDelegate *defaultPolicyDelegate;
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+OBJC_CLASS UIWindow;
+extern UIWindow *mainWindow;
+#else
+OBJC_CLASS NSWindow;
+extern NSWindow *mainWindow;
+#endif
+
</ins><span class="cx"> void setWaitToDumpWatchdog(CFRunLoopTimerRef);
</span><span class="cx"> bool shouldSetWaitToDumpWatchdog();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchToolsDumpRenderTreemacUIScriptControllerMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> WebView *webView = [mainFrame webView];
</span><span class="cx"> [webView _scaleWebView:scale atOrigin:NSZeroPoint];
</span><span class="cx">
</span><del>- dispatch_async(dispatch_get_main_queue(), ^ {
</del><ins>+ dispatch_async(dispatch_get_main_queue(), ^{
</ins><span class="cx"> if (!m_context)
</span><span class="cx"> return;
</span><span class="cx"> m_context->asyncTaskComplete(callbackID);
</span><span class="lines">@@ -94,6 +94,34 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIScriptController::removeViewFromWindow(JSValueRef callback)
+{
+ unsigned callbackID = m_context->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
+
+ WebView *webView = [mainFrame webView];
+ [webView removeFromSuperview];
+
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (!m_context)
+ return;
+ m_context->asyncTaskComplete(callbackID);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIScriptController::addViewToWindow(JSValueRef callback)
+{
+ unsigned callbackID = m_context->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
+
+ WebView *webView = [mainFrame webView];
+ [[mainWindow contentView] addSubview:webView];
+
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (!m_context)
+ return;
+ m_context->asyncTaskComplete(callbackID);
+ });
+}
+
+}
+
</ins><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="branchessafari603branchToolsTestRunnerSharedUIScriptContextBindingsUIScriptControlleridl"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> interface UIScriptController {
</span><span class="cx">
</span><span class="cx"> void doAsyncTask(object callback); // Used to test the harness.
</span><ins>+ void uiScriptComplete(DOMString result);
+
</ins><span class="cx"> void doAfterPresentationUpdate(object callback); // Call the callback after sending a message to the WebProcess and receiving a subsequent update.
</span><span class="cx"> void doAfterNextStablePresentationUpdate(object callback);
</span><span class="cx">
</span><span class="lines">@@ -213,5 +215,8 @@
</span><span class="cx">
</span><span class="cx"> readonly attribute DOMString scrollingTreeAsText;
</span><span class="cx">
</span><del>- void uiScriptComplete(DOMString result);
</del><ins>+ // Unparent and parent the web view, simulating, for example, tab switching.
+ void removeViewFromWindow(object callback);
+ void addViewToWindow(object callback);
+
</ins><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari603branchToolsTestRunnerSharedUIScriptContextUIScriptControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -377,6 +377,18 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
+
+void UIScriptController::removeViewFromWindow(JSValueRef)
+{
+}
+
+void UIScriptController::addViewToWindow(JSValueRef)
+{
+}
+
+#endif // !PLATFORM(COCOA)
+
</ins><span class="cx"> #if !PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> void UIScriptController::insertText(JSStringRef, int, int)
</span></span></pre></div>
<a id="branchessafari603branchToolsTestRunnerSharedUIScriptContextUIScriptControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -140,6 +140,10 @@
</span><span class="cx">
</span><span class="cx"> void uiScriptComplete(JSStringRef result);
</span><span class="cx">
</span><ins>+ // These use a callback to allow the client to know when view visibility state updates get to the web process.
+ void removeViewFromWindow(JSValueRef);
+ void addViewToWindow(JSValueRef);
+
</ins><span class="cx"> private:
</span><span class="cx"> UIScriptController(UIScriptContext&);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunnerPlatformWebViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/PlatformWebView.h (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/PlatformWebView.h 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/PlatformWebView.h 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -86,6 +86,9 @@
</span><span class="cx"> void makeWebViewFirstResponder();
</span><span class="cx"> void setWindowIsKey(bool);
</span><span class="cx"> bool windowIsKey() const { return m_windowIsKey; }
</span><ins>+
+ void removeFromWindow();
+ void addToWindow();
</ins><span class="cx">
</span><span class="cx"> bool viewSupportsOptions(const TestOptions&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/TestController.cpp (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/TestController.cpp 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/TestController.cpp 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -753,6 +753,9 @@
</span><span class="cx"> WKTextCheckerContinuousSpellCheckingEnabledStateChanged(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ // Make sure the view is in the window (a test can unparent it).
+ m_mainWebView->addToWindow();
+
</ins><span class="cx"> // In the case that a test using the chrome input field failed, be sure to clean up for the next test.
</span><span class="cx"> m_mainWebView->removeChromeInputField();
</span><span class="cx"> m_mainWebView->focus();
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunnereflPlatformWebViewEflcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -129,6 +129,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformWebView::addToWindow()
+{
+}
+
+void PlatformWebView::removeFromWindow()
+{
+}
+
</ins><span class="cx"> void PlatformWebView::makeWebViewFirstResponder()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunnergtkPlatformWebViewGtkcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -116,6 +116,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformWebView::addToWindow()
+{
+}
+
+void PlatformWebView::removeFromWindow()
+{
+}
+
</ins><span class="cx"> void PlatformWebView::makeWebViewFirstResponder()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunneriosPlatformWebViewIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -166,6 +166,16 @@
</span><span class="cx"> [m_window makeKeyWindow];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformWebView::addToWindow()
+{
+ [m_window.rootViewController.view addSubview:m_view];
+}
+
+void PlatformWebView::removeFromWindow()
+{
+ [m_view removeFromSuperview];
+}
+
</ins><span class="cx"> void PlatformWebView::resizeTo(unsigned width, unsigned height, WebViewSizingMode viewSizingMode)
</span><span class="cx"> {
</span><span class="cx"> WKRect frame = windowFrame();
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunneriosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -517,6 +517,16 @@
</span><span class="cx"> return JSStringCreateWithCFString((CFStringRef)[webView _scrollingTreeAsText]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIScriptController::removeViewFromWindow(JSValueRef callback)
+{
+ TestController::singleton().mainWebView()->removeFromWindow();
+}
+
+void UIScriptController::addViewToWindow(JSValueRef callback)
+{
+ TestController::singleton().mainWebView()->addToWindow();
+}
+
</ins><span class="cx"> void UIScriptController::platformSetDidStartFormControlInteractionCallback()
</span><span class="cx"> {
</span><span class="cx"> TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunnermacPlatformWebViewMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -256,6 +256,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformWebView::addToWindow()
+{
+ [[m_window contentView] addSubview:m_view];
+}
+
+void PlatformWebView::removeFromWindow()
+{
+ [m_view removeFromSuperview];
+}
+
</ins><span class="cx"> void PlatformWebView::makeWebViewFirstResponder()
</span><span class="cx"> {
</span><span class="cx"> [m_window makeFirstResponder:platformView()];
</span></span></pre></div>
<a id="branchessafari603branchToolsWebKitTestRunnermacUIScriptControllerMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm (212488 => 212489)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm 2017-02-17 00:55:28 UTC (rev 212488)
+++ branches/safari-603-branch/Tools/WebKitTestRunner/mac/UIScriptControllerMac.mm 2017-02-17 00:55:51 UTC (rev 212489)
</span><span class="lines">@@ -131,4 +131,40 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIScriptController::removeViewFromWindow(JSValueRef callback)
+{
+#if WK_API_ENABLED
+ unsigned callbackID = m_context->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
+
+ auto* mainWebView = TestController::singleton().mainWebView();
+ mainWebView->removeFromWindow();
+
+ [mainWebView->platformView() _doAfterNextPresentationUpdate: ^ {
+ if (!m_context)
+ return;
+ m_context->asyncTaskComplete(callbackID);
+ }];
+#else
+ UNUSED_PARAM(callback);
+#endif
+}
+
+void UIScriptController::addViewToWindow(JSValueRef callback)
+{
+#if WK_API_ENABLED
+ unsigned callbackID = m_context->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
+
+ auto* mainWebView = TestController::singleton().mainWebView();
+ mainWebView->addToWindow();
+
+ [mainWebView->platformView() _doAfterNextPresentationUpdate: ^ {
+ if (!m_context)
+ return;
+ m_context->asyncTaskComplete(callbackID);
+ }];
+#else
+ UNUSED_PARAM(callback);
+#endif
+}
+
</ins><span class="cx"> } // namespace WTR
</span></span></pre>
</div>
</div>
</body>
</html>