<!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>[170037] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170037">170037</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-06-16 16:56:50 -0700 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Use TileController on Windows
https://bugs.webkit.org/show_bug.cgi?id=133895
Reviewed by Tim Horton.
../WebCore:
* WebCore.vcxproj/WebCore.vcxproj: Add Tiled Drawing files.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* platform/graphics/TiledBacking.h: No longer Cocoa-only.
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::swapFromOrToTiledLayer): Windows
now uses the same layer type as Mac.
* platform/graphics/ca/LayerPool.cpp:
(WebCore::LayerPool::takeLayerWithSize): Use nullptr
rather than nil for C++ code.
* platform/graphics/ca/PlatformCALayer.cpp:
* platform/graphics/ca/PlatformCALayer.h: Expose necessary
drawing functions for Windows port.
* platform/graphics/ca/TileController.cpp: Remove unneeded
header include for WebLayer.
* platform/graphics/ca/TileCoverageMap.cpp: Correct #includes.
* platform/graphics/ca/TileGrid.h: Not just for Cococa.
* platform/graphics/ca/mac/PlatformCALayerMac.mm: Remove
extra whitespace.
* platform/graphics/ca/mac/PlatformCALayerMac.h: Remove
unneeded overload.
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayer::collectRectsToPaint): Added stub.
(PlatformCALayer::drawLayerContents): Added.
(PlatformCALayer::frameForLayer): Added.
(PlatformCALayerWin::PlatformCALayerWin): Remove unneeded
assert now that we support these types. Add TileController
support.
(PlatformCALayerWin::setEdgeAntialiasingMask): Added.
(printLayer): Add newly-supported tile types.
(PlatformCALayerWin::tiledBacking): Added.
* platform/graphics/ca/win/PlatformCALayerWin.h: Update to
support Tiled Drawing.
* platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
(PlatformCALayerWinInternal::PlatformCALayerWinInternal): Update to
recognize newly-supported layer types.
(PlatformCALayerWinInternal::setNeedsDisplay): Ditto.
(PlatformCALayerWinInternal::setSublayers): Ditto.
(PlatformCALayerWinInternal::getSublayers): Ditto.
(PlatformCALayerWinInternal::removeAllSublayers): Ditto.
(PlatformCALayerWinInternal::insertSublayer): Ditto.
(PlatformCALayerWinInternal::sublayerCount): Ditto.
(PlatformCALayerWinInternal::indexOfSublayer): Ditto.
(PlatformCALayerWinInternal::sublayerAtIndex): Ditto.
(PlatformCALayerWinInternal::setBounds): Ditto.
(PlatformCALayerWinInternal::setFrame): Ditto.
(PlatformCALayerWinInternal::drawTile): Ditto.
(PlatformCALayerWinInternal::createTileController): Ditto.
(PlatformCALayerWinInternal::tiledBacking): Ditto.
* platform/graphics/ca/win/PlatformCALayerWinInternal.h: Update to use
TileController.
../WebKit2:
* WebProcess/WebPage/mac/PlatformCALayerRemote.h: Remove
unneeded overload.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingh">trunk/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaLayerPoolcpp">trunk/Source/WebCore/platform/graphics/ca/LayerPool.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileCoverageMapcpp">trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileGridh">trunk/Source/WebCore/platform/graphics/ca/TileGrid.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMach">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinh">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalcpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalh">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/ChangeLog 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2014-06-16 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Use TileController on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=133895
+
+ Reviewed by Tim Horton.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Add Tiled Drawing files.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+ * platform/graphics/TiledBacking.h: No longer Cocoa-only.
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer): Windows
+ now uses the same layer type as Mac.
+ * platform/graphics/ca/LayerPool.cpp:
+ (WebCore::LayerPool::takeLayerWithSize): Use nullptr
+ rather than nil for C++ code.
+ * platform/graphics/ca/PlatformCALayer.cpp:
+ * platform/graphics/ca/PlatformCALayer.h: Expose necessary
+ drawing functions for Windows port.
+ * platform/graphics/ca/TileController.cpp: Remove unneeded
+ header include for WebLayer.
+ * platform/graphics/ca/TileCoverageMap.cpp: Correct #includes.
+ * platform/graphics/ca/TileGrid.h: Not just for Cococa.
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm: Remove
+ extra whitespace.
+ * platform/graphics/ca/mac/PlatformCALayerMac.h: Remove
+ unneeded overload.
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (PlatformCALayer::collectRectsToPaint): Added stub.
+ (PlatformCALayer::drawLayerContents): Added.
+ (PlatformCALayer::frameForLayer): Added.
+ (PlatformCALayerWin::PlatformCALayerWin): Remove unneeded
+ assert now that we support these types. Add TileController
+ support.
+ (PlatformCALayerWin::setEdgeAntialiasingMask): Added.
+ (printLayer): Add newly-supported tile types.
+ (PlatformCALayerWin::tiledBacking): Added.
+ * platform/graphics/ca/win/PlatformCALayerWin.h: Update to
+ support Tiled Drawing.
+ * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+ (PlatformCALayerWinInternal::PlatformCALayerWinInternal): Update to
+ recognize newly-supported layer types.
+ (PlatformCALayerWinInternal::setNeedsDisplay): Ditto.
+ (PlatformCALayerWinInternal::setSublayers): Ditto.
+ (PlatformCALayerWinInternal::getSublayers): Ditto.
+ (PlatformCALayerWinInternal::removeAllSublayers): Ditto.
+ (PlatformCALayerWinInternal::insertSublayer): Ditto.
+ (PlatformCALayerWinInternal::sublayerCount): Ditto.
+ (PlatformCALayerWinInternal::indexOfSublayer): Ditto.
+ (PlatformCALayerWinInternal::sublayerAtIndex): Ditto.
+ (PlatformCALayerWinInternal::setBounds): Ditto.
+ (PlatformCALayerWinInternal::setFrame): Ditto.
+ (PlatformCALayerWinInternal::drawTile): Ditto.
+ (PlatformCALayerWinInternal::createTileController): Ditto.
+ (PlatformCALayerWinInternal::tiledBacking): Ditto.
+ * platform/graphics/ca/win/PlatformCALayerWinInternal.h: Update to use
+ TileController.
+
</ins><span class="cx"> 2014-06-16 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary style invalidation in RenderTextControl::styleDidChange().
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -7217,12 +7217,22 @@
</span><span class="cx"> <ClCompile Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateAVCF.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateLegacyAVCF.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\avfoundation\InbandTextTrackPrivateAVF.cpp" />
</span><ins>+ <ClCompile Include="..\platform\graphics\ca\LayerPool.cpp" />
</ins><span class="cx"> <ClCompile Include="..\platform\graphics\ca\PlatformCALayer.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\platform\graphics\ca\TileController.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\ca\TileCoverageMap.cpp" />
+ <ClCompile Include="..\platform\graphics\ca\TileGrid.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\platform\graphics\GLContext.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DCairo.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -19144,7 +19154,17 @@
</span><span class="cx"> <ClInclude Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateLegacyAVCF.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\avfoundation\InbandTextTrackPrivateAVF.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\cairo\TileCairo.h" />
</span><ins>+ <ClInclude Include="..\platform\graphics\ca\LayerPool.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\graphics\ca\PlatformCAFilters.h" />
</span><ins>+ <ClInclude Include="..\platform\graphics\ca\TileController.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="..\platform\graphics\ca\TileCoverageMap.h" />
+ <ClInclude Include="..\platform\graphics\ca\TileGrid.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\platform\graphics\ca\win\PlatformCAAnimationWin.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\ca\win\PlatformCALayerWin.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\GLContext.h" />
</span><span class="lines">@@ -21172,4 +21192,4 @@
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -6829,9 +6829,6 @@
</span><span class="cx"> <ClCompile Include="..\rendering\shapes\Shape.cpp">
</span><span class="cx"> <Filter>rendering\shapes</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\rendering\shapes\ShapeInsideInfo.cpp">
- <Filter>rendering\shapes</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\rendering\shapes\ShapeOutsideInfo.cpp">
</span><span class="cx"> <Filter>rendering\shapes</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -7115,6 +7112,25 @@
</span><span class="cx"> <ClCompile Include="..\html\track\VTTRegionList.cpp">
</span><span class="cx"> <Filter>html\track</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTTPHeaderNames.cpp" />
+ <ClCompile Include="..\platform\DisplaySleepDisabler.cpp" />
+ <ClCompile Include="..\platform\SystemSleepListener.cpp" />
+ <ClCompile Include="..\platform\network\BlobRegistry.cpp" />
+ <ClCompile Include="..\platform\network\BlobRegistryImpl.cpp" />
+ <ClCompile Include="..\css\CSSToLengthConversionData.cpp" />
+ <ClCompile Include="..\html\PublicURLManager.cpp" />
+ <ClCompile Include="..\platform\graphics\ca\TileController.cpp">
+ <Filter>platform\graphics\ca</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\ca\TileGrid.cpp">
+ <Filter>platform\graphics\ca</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\ca\LayerPool.cpp">
+ <Filter>platform\graphics\ca</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\ca\TileCoverageMap.cpp">
+ <Filter>platform\graphics\ca</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\Modules\geolocation\Coordinates.h">
</span><span class="lines">@@ -8644,9 +8660,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundation.h">
</span><span class="cx"> <Filter>platform\graphics\avfoundation</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClCompile Include="..\platform\graphics\win\MediaPlayerPrivateMediaFoundation.h">
- <Filter>platform\graphics\win</Filter>
- </ClCompile>
</del><span class="cx"> <ClInclude Include="..\platform\graphics\avfoundation\cf\AVFoundationCFSoftLinking.h">
</span><span class="cx"> <Filter>platform\graphics\avfoundation\cf</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -14685,9 +14698,6 @@
</span><span class="cx"> <ClInclude Include="..\rendering\shapes\Shape.h">
</span><span class="cx"> <Filter>rendering\shapes</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\rendering\shapes\ShapeInsideInfo.h">
- <Filter>rendering\shapes</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\rendering\shapes\ShapeInterval.h">
</span><span class="cx"> <Filter>rendering\shapes</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -14997,6 +15007,23 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSVTTRegion.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSVTTRegionList.cpp" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSVTTRegionList.h" />
</span><ins>+ <ClInclude Include="..\platform\DisplaySleepDisabler.h" />
+ <ClInclude Include="..\platform\graphics\ca\win\PlatformCAAnimationWin.h" />
+ <ClInclude Include="..\platform\graphics\win\MediaPlayerPrivateMediaFoundation.h" />
+ <ClInclude Include="..\platform\SystemSleepListener.h" />
+ <ClInclude Include="..\css\CSSToLengthConversionData.h" />
+ <ClInclude Include="..\platform\graphics\ca\TileController.h">
+ <Filter>platform\graphics\ca</Filter>
+ </ClInclude>
+ <ClInclude Include="..\platform\graphics\ca\TileGrid.h">
+ <Filter>platform\graphics\ca</Filter>
+ </ClInclude>
+ <ClInclude Include="..\platform\graphics\ca\LayerPool.h">
+ <Filter>platform\graphics\ca</Filter>
+ </ClInclude>
+ <ClInclude Include="..\platform\graphics\ca\TileCoverageMap.h">
+ <Filter>platform\graphics\ca</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\css\CSSGrammar.y.in">
</span><span class="lines">@@ -15070,6 +15097,7 @@
</span><span class="cx"> <None Include="..\Modules\mediacontrols\mediaControlsApple.js">
</span><span class="cx"> <Filter>Modules\mediacontrols</Filter>
</span><span class="cx"> </None>
</span><ins>+ <None Include="..\platform\network\HTTPHeaderNames.in" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <CustomBuildStep Include="..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.h">
</span><span class="lines">@@ -15204,4 +15232,4 @@
</span><span class="cx"> <Filter>platform\win</Filter>
</span><span class="cx"> </MASM>
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -32,9 +32,7 @@
</span><span class="cx"> static const int defaultTileHeight = 512;
</span><span class="cx">
</span><span class="cx"> class IntRect;
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> class PlatformCALayer;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> enum ScrollingModeIndication {
</span><span class="cx"> SynchronousScrollingBecauseOfStyleIndication,
</span><span class="lines">@@ -103,7 +101,7 @@
</span><span class="cx"> virtual IntRect tileGridExtent() const = 0;
</span><span class="cx"> virtual void setScrollingModeIndication(ScrollingModeIndication) = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if USE(CA)
</ins><span class="cx"> virtual PlatformCALayer* tiledScrollingIndicatorLayer() = 0;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -2998,11 +2998,7 @@
</span><span class="cx"> ASSERT(useTiledLayer != m_usingTiledBacking);
</span><span class="cx"> RefPtr<PlatformCALayer> oldLayer = m_layer;
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
- PlatformCALayer::LayerType layerType = useTiledLayer ? PlatformCALayer::LayerTypeWebTiledLayer : PlatformCALayer::LayerTypeWebLayer;
-#else
</del><span class="cx"> PlatformCALayer::LayerType layerType = useTiledLayer ? PlatformCALayer::LayerTypeTiledBackingLayer : PlatformCALayer::LayerTypeWebLayer;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_layer = createPlatformCALayer(layerType, this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaLayerPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/LayerPool.cpp (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/LayerPool.cpp 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/LayerPool.cpp 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -81,10 +81,10 @@
</span><span class="cx"> RefPtr<PlatformCALayer> LayerPool::takeLayerWithSize(const IntSize& size)
</span><span class="cx"> {
</span><span class="cx"> if (!canReuseLayerWithSize(size))
</span><del>- return nil;
</del><ins>+ return nullptr;
</ins><span class="cx"> LayerList& reuseList = listOfLayersWithSize(size, MarkAsUsed);
</span><span class="cx"> if (reuseList.isEmpty())
</span><del>- return nil;
</del><ins>+ return nullptr;
</ins><span class="cx"> m_totalBytes -= backingStoreBytesForSize(size);
</span><span class="cx"> return reuseList.takeFirst();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -37,6 +37,10 @@
</span><span class="cx"> return ++layerID;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if COMPILER(MSVC)
+const float PlatformCALayer::webLayerWastedSpaceThreshold = 0.75f;
+#endif
+
</ins><span class="cx"> PlatformCALayer::PlatformCALayer(LayerType layerType, PlatformCALayerClient* owner)
</span><span class="cx"> : m_layerType(layerType)
</span><span class="cx"> , m_layerID(generateLayerID())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> virtual PlatformLayer* platformLayer() const { return m_layer.get(); }
</span><span class="cx">
</span><del>- virtual bool usesTiledBackingLayer() const = 0;
</del><ins>+ bool usesTiledBackingLayer() const { return layerType() == LayerTypePageTiledBackingLayer || layerType() == LayerTypeTiledBackingLayer; }
</ins><span class="cx">
</span><span class="cx"> PlatformCALayerClient* owner() const { return m_owner; }
</span><span class="cx"> virtual void setOwner(PlatformCALayerClient* owner) { m_owner = owner; }
</span><span class="lines">@@ -226,16 +226,20 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> virtual void enumerateRectsBeingDrawn(CGContextRef, void (^block)(CGRect)) = 0;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static const unsigned webLayerMaxRectsToPaint = 5;
</span><ins>+#if COMPILER(MSVC)
+ static const float webLayerWastedSpaceThreshold;
+#else
</ins><span class="cx"> constexpr static const float webLayerWastedSpaceThreshold = 0.75f;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> typedef Vector<FloatRect, webLayerMaxRectsToPaint> RepaintRectList;
</span><span class="cx">
</span><span class="cx"> // Functions allows us to share implementation across WebTiledLayer and WebLayer
</span><span class="cx"> static RepaintRectList collectRectsToPaint(CGContextRef, PlatformCALayer*);
</span><span class="cx"> static void drawLayerContents(CGContextRef, PlatformCALayer*, RepaintRectList& dirtyRects);
</span><del>-#endif
</del><span class="cx"> static void drawRepaintIndicator(CGContextRef, PlatformCALayer*, int repaintCount, CGColorRef customBackgroundColor);
</span><span class="cx"> static CGRect frameForLayer(const PlatformLayer*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "Region.h"
</span><span class="cx"> #include "TileCoverageMap.h"
</span><span class="cx"> #include "TileGrid.h"
</span><del>-#include "WebLayer.h"
</del><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileCoverageMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import "config.h"
-#import "TileCoverageMap.h"
</del><ins>+#include "config.h"
+#include "TileCoverageMap.h"
</ins><span class="cx">
</span><del>-#import "GraphicsContext.h"
-#import "TileController.h"
-#import "TileGrid.h"
</del><ins>+#include "GraphicsContext.h"
+#include "TileController.h"
+#include "TileGrid.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileGrid.h (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileGrid.h 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/TileGrid.h 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if USE(CG)
</ins><span class="cx"> typedef struct CGContext *CGContextRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -42,8 +42,6 @@
</span><span class="cx">
</span><span class="cx"> ~PlatformCALayerMac();
</span><span class="cx">
</span><del>- virtual bool usesTiledBackingLayer() const override { return layerType() == LayerTypePageTiledBackingLayer || layerType() == LayerTypeTiledBackingLayer; }
-
</del><span class="cx"> virtual void setOwner(PlatformCALayerClient*) override;
</span><span class="cx">
</span><span class="cx"> virtual void setNeedsDisplay(const FloatRect* dirtyRect = 0) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -957,7 +957,6 @@
</span><span class="cx"> return [tileLayer frame];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> PassRefPtr<PlatformCALayer> PlatformCALayerMac::createCompatibleLayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* client) const
</span><span class="cx"> {
</span><span class="cx"> return PlatformCALayerMac::create(layerType, client);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "PlatformCAAnimationWin.h"
</span><span class="cx"> #include "PlatformCALayerWinInternal.h"
</span><ins>+#include "TileController.h"
</ins><span class="cx"> #include <QuartzCore/CoreAnimationCF.h>
</span><span class="cx"> #include <WebKitSystemInterface/WebKitSystemInterface.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="lines">@@ -93,6 +94,24 @@
</span><span class="cx"> return layerIntern ? layerIntern->owner() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PlatformCALayer::RepaintRectList PlatformCALayer::collectRectsToPaint(CGContextRef, PlatformCALayer*)
+{
+ // FIXME: We should actually collect rects to use instead of defaulting to Windows'
+ // normal drawing path.
+ PlatformCALayer::RepaintRectList dirtyRects;
+ return dirtyRects;
+}
+
+void PlatformCALayer::drawLayerContents(CGContextRef context, WebCore::PlatformCALayer* platformCALayer, RepaintRectList&)
+{
+ intern(platformCALayer)->displayCallback(platformCALayer->platformLayer(), context);
+}
+
+CGRect PlatformCALayer::frameForLayer(const PlatformLayer* tileLayer)
+{
+ return CACFLayerGetFrame(static_cast<CACFLayerRef>(const_cast<PlatformLayer*>(tileLayer)));
+}
+
</ins><span class="cx"> static void displayCallback(CACFLayerRef caLayer, CGContextRef context)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(caLayer, CACFLayerGetUserData(caLayer));
</span><span class="lines">@@ -116,7 +135,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT((layerType != LayerTypeTiledBackingLayer) && (layerType != LayerTypePageTiledBackingLayer));
</del><span class="cx"> m_layer = adoptCF(CACFLayerCreate(toCACFLayerType(layerType)));
</span><span class="cx">
</span><span class="cx"> // Create the PlatformCALayerWinInternal object and point to it in the userdata.
</span><span class="lines">@@ -126,6 +144,11 @@
</span><span class="cx"> // Set the display callback
</span><span class="cx"> CACFLayerSetDisplayCallback(m_layer.get(), displayCallback);
</span><span class="cx"> CACFLayerSetLayoutCallback(m_layer.get(), layoutSublayersProc);
</span><ins>+
+ if (usesTiledBackingLayer()) {
+ TileController* tileController = intern->createTileController(this);
+ m_customSublayers = std::make_unique<PlatformCALayerList>(tileController->containerLayers());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PlatformCALayerWin::~PlatformCALayerWin()
</span><span class="lines">@@ -541,6 +564,12 @@
</span><span class="cx"> setNeedsCommit();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PlatformCALayerWin::setEdgeAntialiasingMask(unsigned mask)
+{
+ CACFLayerSetEdgeAntialiasingMask(m_layer.get(), mask);
+ setNeedsCommit();
+}
+
</ins><span class="cx"> float PlatformCALayerWin::contentsScale() const
</span><span class="cx"> {
</span><span class="cx"> return 1;
</span><span class="lines">@@ -579,6 +608,7 @@
</span><span class="cx"> case PlatformCALayer::LayerTypeWebLayer: layerTypeName = "web-layer"; break;
</span><span class="cx"> case PlatformCALayer::LayerTypeTransformLayer: layerTypeName = "transform-layer"; break;
</span><span class="cx"> case PlatformCALayer::LayerTypeWebTiledLayer: layerTypeName = "web-tiled-layer"; break;
</span><ins>+ case PlatformCALayer::LayerTypeTiledBackingLayer: layerTypeName = "tiled-backing-layer"; break;
</ins><span class="cx"> case PlatformCALayer::LayerTypeRootLayer: layerTypeName = "root-layer"; break;
</span><span class="cx"> case PlatformCALayer::LayerTypeCustom: layerTypeName = "custom-layer"; break;
</span><span class="cx"> }
</span><span class="lines">@@ -675,3 +705,11 @@
</span><span class="cx"> {
</span><span class="cx"> return PlatformCALayerWin::create(layerType, client);
</span><span class="cx"> }
</span><ins>+
+TiledBacking* PlatformCALayerWin::tiledBacking()
+{
+ if (!usesTiledBackingLayer())
+ return nullptr;
+
+ return intern(this)->tiledBacking();
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -37,8 +37,6 @@
</span><span class="cx">
</span><span class="cx"> ~PlatformCALayerWin();
</span><span class="cx">
</span><del>- virtual bool usesTiledBackingLayer() const override { return false; }
-
</del><span class="cx"> virtual void setNeedsDisplay(const FloatRect* dirtyRect = 0) override;
</span><span class="cx">
</span><span class="cx"> virtual void setContentsChanged() override;
</span><span class="lines">@@ -50,7 +48,7 @@
</span><span class="cx"> virtual void appendSublayer(PlatformCALayer*) override;
</span><span class="cx"> virtual void insertSublayer(PlatformCALayer*, size_t index) override;
</span><span class="cx"> virtual void replaceSublayer(PlatformCALayer* reference, PlatformCALayer*) override;
</span><del>- virtual const PlatformCALayerList* customSublayers() const override { return nullptr; }
</del><ins>+ virtual const PlatformCALayerList* customSublayers() const override { return m_customSublayers.get(); }
</ins><span class="cx"> virtual void adoptSublayers(PlatformCALayer* source) override;
</span><span class="cx">
</span><span class="cx"> virtual void addAnimationForKey(const String& key, PlatformCAAnimation*) override;
</span><span class="lines">@@ -124,7 +122,7 @@
</span><span class="cx"> virtual float contentsScale() const override;
</span><span class="cx"> virtual void setContentsScale(float) override;
</span><span class="cx">
</span><del>- virtual void setEdgeAntialiasingMask(unsigned) override { ASSERT_NOT_REACHED(); }
</del><ins>+ virtual void setEdgeAntialiasingMask(unsigned) override;
</ins><span class="cx">
</span><span class="cx"> virtual GraphicsLayer::CustomAppearance customAppearance() const override { return m_customAppearance; }
</span><span class="cx"> virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance customAppearance) override { m_customAppearance = customAppearance; }
</span><span class="lines">@@ -132,7 +130,7 @@
</span><span class="cx"> virtual GraphicsLayer::CustomBehavior customBehavior() const override { return m_customBehavior; }
</span><span class="cx"> virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior customBehavior) override { m_customBehavior = customBehavior; }
</span><span class="cx">
</span><del>- virtual TiledBacking* tiledBacking() override { return nullptr; }
</del><ins>+ virtual TiledBacking* tiledBacking() override;
</ins><span class="cx">
</span><span class="cx"> virtual PlatformCALayer* rootLayer() const override;
</span><span class="cx"> virtual void setNeedsLayout() override;
</span><span class="lines">@@ -150,6 +148,7 @@
</span><span class="cx"> PlatformCALayerWin(LayerType, PlatformLayer*, PlatformCALayerClient* owner);
</span><span class="cx">
</span><span class="cx"> HashMap<String, RefPtr<PlatformCAAnimation>> m_animations;
</span><ins>+ std::unique_ptr<PlatformCALayerList> m_customSublayers;
</ins><span class="cx"> GraphicsLayer::CustomAppearance m_customAppearance;
</span><span class="cx"> GraphicsLayer::CustomBehavior m_customBehavior;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "PlatformCALayer.h"
</span><span class="cx"> #include "TextRun.h"
</span><ins>+#include "TileController.h"
+#include "TiledBacking.h"
</ins><span class="cx"> #include <QuartzCore/CACFLayer.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="lines">@@ -43,12 +45,19 @@
</span><span class="cx"> // to keep the overall tile cost low.
</span><span class="cx"> static const int cTiledLayerTileSize = 512;
</span><span class="cx">
</span><ins>+static bool layerTypeIsTiled(const PlatformCALayer::LayerType layerType)
+{
+ return layerType == PlatformCALayer::LayerTypeWebTiledLayer
+ || layerType == PlatformCALayer::LayerTypePageTiledBackingLayer
+ || layerType == PlatformCALayer::LayerTypeTiledBackingLayer;
+}
+
</ins><span class="cx"> PlatformCALayerWinInternal::PlatformCALayerWinInternal(PlatformCALayer* owner)
</span><span class="cx"> : m_tileSize(CGSizeMake(cTiledLayerTileSize, cTiledLayerTileSize))
</span><span class="cx"> , m_constrainedSize(constrainedSize(owner->bounds().size()))
</span><span class="cx"> , m_owner(owner)
</span><span class="cx"> {
</span><del>- if (m_owner->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> // Tiled layers are placed in a child layer that is always the first child of the TiledLayer
</span><span class="cx"> m_tileParent = adoptCF(CACFLayerCreate(kCACFLayer));
</span><span class="cx"> CACFLayerInsertSublayer(m_owner->platformLayer(), m_tileParent.get(), 0);
</span><span class="lines">@@ -153,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerWinInternal::setNeedsDisplay(const FloatRect* dirtyRect)
</span><span class="cx"> {
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> // FIXME: Only setNeedsDisplay for tiles that are currently visible
</span><span class="cx"> int numTileLayers = tileCount();
</span><span class="cx"> CGRect rect;
</span><span class="lines">@@ -208,7 +217,7 @@
</span><span class="cx">
</span><span class="cx"> owner()->setNeedsCommit();
</span><span class="cx">
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> // Preserve the tile parent after set
</span><span class="cx"> CACFLayerInsertSublayer(owner()->platformLayer(), m_tileParent.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -225,7 +234,7 @@
</span><span class="cx"> size_t count = CFArrayGetCount(sublayers);
</span><span class="cx">
</span><span class="cx"> size_t layersToSkip = 0;
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> // Exclude the tile parent layer.
</span><span class="cx"> layersToSkip = 1;
</span><span class="cx"> }
</span><span class="lines">@@ -240,7 +249,7 @@
</span><span class="cx"> CACFLayerSetSublayers(owner()->platformLayer(), 0);
</span><span class="cx"> owner()->setNeedsCommit();
</span><span class="cx">
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> // Restore the tile parent after removal
</span><span class="cx"> CACFLayerInsertSublayer(owner()->platformLayer(), m_tileParent.get(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -249,7 +258,7 @@
</span><span class="cx"> void PlatformCALayerWinInternal::insertSublayer(PlatformCALayer* layer, size_t index)
</span><span class="cx"> {
</span><span class="cx"> index = min(index, sublayerCount());
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> // Add 1 to account for the tile parent layer
</span><span class="cx"> index++;
</span><span class="cx"> }
</span><span class="lines">@@ -264,7 +273,7 @@
</span><span class="cx"> CFArrayRef sublayers = CACFLayerGetSublayers(owner()->platformLayer());
</span><span class="cx"> size_t count = sublayers ? CFArrayGetCount(sublayers) : 0;
</span><span class="cx">
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> // Subtract 1 to account for the tile parent layer
</span><span class="cx"> ASSERT(count > 0);
</span><span class="cx"> count--;
</span><span class="lines">@@ -285,7 +294,7 @@
</span><span class="cx">
</span><span class="cx"> size_t n = CFArrayGetCount(sublayers);
</span><span class="cx">
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> for (size_t i = 1; i < n; ++i) {
</span><span class="cx"> if (CFArrayGetValueAtIndex(sublayers, i) == ref)
</span><span class="cx"> return i - 1;
</span><span class="lines">@@ -302,7 +311,7 @@
</span><span class="cx">
</span><span class="cx"> PlatformCALayer* PlatformCALayerWinInternal::sublayerAtIndex(int index) const
</span><span class="cx"> {
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> // Add 1 to account for the tile parent layer
</span><span class="cx"> index++;
</span><span class="cx"> }
</span><span class="lines">@@ -322,7 +331,7 @@
</span><span class="cx"> CACFLayerSetBounds(owner()->platformLayer(), rect);
</span><span class="cx"> owner()->setNeedsCommit();
</span><span class="cx">
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) {
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType())) {
</ins><span class="cx"> m_constrainedSize = constrainedSize(rect.size());
</span><span class="cx"> updateTiles();
</span><span class="cx"> }
</span><span class="lines">@@ -337,7 +346,7 @@
</span><span class="cx"> CACFLayerSetFrame(owner()->platformLayer(), rect);
</span><span class="cx"> owner()->setNeedsCommit();
</span><span class="cx">
</span><del>- if (owner()->layerType() == PlatformCALayer::LayerTypeWebTiledLayer)
</del><ins>+ if (layerTypeIsTiled(m_owner->layerType()))
</ins><span class="cx"> updateTiles();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -487,3 +496,15 @@
</span><span class="cx">
</span><span class="cx"> CGContextRestoreGState(context);
</span><span class="cx"> }
</span><ins>+
+TileController* PlatformCALayerWinInternal::createTileController(PlatformCALayer* rootLayer)
+{
+ ASSERT(!m_tileController);
+ m_tileController = TileController::create(rootLayer);
+ return m_tileController.get();
+}
+
+TiledBacking* PlatformCALayerWinInternal::tiledBacking()
+{
+ return m_tileController.get();
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.h (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.h 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.h 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx">
</span><span class="cx"> class FloatRect;
</span><span class="cx"> class PlatformCALayer;
</span><ins>+class TileController;
+class TiledBacking;
</ins><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<PlatformCALayer> > PlatformCALayerList;
</span><span class="cx">
</span><span class="lines">@@ -59,6 +61,9 @@
</span><span class="cx"> void setBounds(const FloatRect&);
</span><span class="cx"> void setFrame(const FloatRect&);
</span><span class="cx">
</span><ins>+ TileController* createTileController(PlatformCALayer* rootLayer);
+ TiledBacking* tiledBacking();
+
</ins><span class="cx"> private:
</span><span class="cx"> void internalSetNeedsDisplay(const FloatRect*);
</span><span class="cx"> PlatformCALayer* sublayerAtIndex(int) const;
</span><span class="lines">@@ -78,6 +83,7 @@
</span><span class="cx"> CGSize m_tileSize;
</span><span class="cx"> CGSize m_constrainedSize;
</span><span class="cx"> RetainPtr<CACFLayerRef> m_tileParent;
</span><ins>+ OwnPtr<TileController> m_tileController;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-06-16 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Use TileController on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=133895
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h: Remove
+ unneeded overload.
+
</ins><span class="cx"> 2014-06-16 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][wk2] Swipe snapshots are removed too quickly if there is no saved render tree size
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (170036 => 170037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-06-16 23:48:13 UTC (rev 170036)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-06-16 23:56:50 UTC (rev 170037)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx">
</span><span class="cx"> virtual ~PlatformCALayerRemote();
</span><span class="cx">
</span><del>- virtual bool usesTiledBackingLayer() const override { return layerType() == LayerTypePageTiledBackingLayer || layerType() == LayerTypeTiledBackingLayer; }
-
</del><span class="cx"> virtual PlatformLayer* platformLayer() const override { return nullptr; }
</span><span class="cx">
</span><span class="cx"> void recursiveBuildTransaction(RemoteLayerTreeTransaction&);
</span></span></pre>
</div>
</div>
</body>
</html>