<!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>[166308] 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/166308">166308</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-26 12:36:49 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers
https://bugs.webkit.org/show_bug.cgi?id=130778
Reviewed by Tim Horton.
Make it possible to put a "custom behavior" flag on a layer so that,
with UI-side compositing, we know to create a specific type of
layer or view for that GraphicsLayer.
Source/WebCore:
* WebCore.exp.in:
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::GraphicsLayer):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::setCustomBehavior):
(WebCore::GraphicsLayer::customBehavior):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::updateCustomBehavior):
(WebCore::GraphicsLayerCA::setCustomBehavior):
* platform/graphics/ca/GraphicsLayerCA.h:
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/mac/PlatformCALayerMac.h:
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::PlatformCALayerMac):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateScrollingLayers):
Source/WebKit2:
* Shared/mac/RemoteLayerTreeTransaction.h:
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
(WebKit::dumpChangedLayers):
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(PlatformCALayerRemote::customBehavior):
(PlatformCALayerRemote::updateCustomBehavior):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.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="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionh">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp</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 (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/ChangeLog 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-03-26 Simon Fraser <simon.fraser@apple.com>
+
+ Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers
+ https://bugs.webkit.org/show_bug.cgi?id=130778
+
+ Reviewed by Tim Horton.
+
+ Make it possible to put a "custom behavior" flag on a layer so that,
+ with UI-side compositing, we know to create a specific type of
+ layer or view for that GraphicsLayer.
+
+ * WebCore.exp.in:
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::GraphicsLayer):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::setCustomBehavior):
+ (WebCore::GraphicsLayer::customBehavior):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+ (WebCore::GraphicsLayerCA::updateCustomBehavior):
+ (WebCore::GraphicsLayerCA::setCustomBehavior):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ * platform/graphics/ca/PlatformCALayer.h:
+ * platform/graphics/ca/mac/PlatformCALayerMac.h:
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ (PlatformCALayerMac::PlatformCALayerMac):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateScrollingLayers):
+
</ins><span class="cx"> 2014-03-26 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed test correction.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -545,6 +545,7 @@
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA16resumeAnimationsEv
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA16setMasksToBoundsEb
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA17setContentsOpaqueEb
</span><ins>+__ZN7WebCore15GraphicsLayerCA17setCustomBehaviorENS_13GraphicsLayer14CustomBehaviorE
</ins><span class="cx"> __ZN7WebCore15GraphicsLayerCA17suspendAnimationsEd
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA18setAllowTiledLayerEb
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA18setBackgroundColorERKNS_5ColorE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> , m_replicatedLayer(0)
</span><span class="cx"> , m_repaintCount(0)
</span><span class="cx"> , m_customAppearance(NoCustomAppearance)
</span><ins>+ , m_customBehavior(NoCustomBehavior)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> if (m_client)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -443,6 +443,10 @@
</span><span class="cx"> virtual void setCustomAppearance(CustomAppearance customAppearance) { m_customAppearance = customAppearance; }
</span><span class="cx"> CustomAppearance customAppearance() const { return m_customAppearance; }
</span><span class="cx">
</span><ins>+ enum CustomBehavior { NoCustomBehavior, CustomScrollingBehavior };
+ virtual void setCustomBehavior(CustomBehavior customBehavior) { m_customBehavior = customBehavior; }
+ CustomBehavior customBehavior() const { return m_customBehavior; }
+
</ins><span class="cx"> // z-position is the z-equivalent of position(). It's only used for debugging purposes.
</span><span class="cx"> virtual float zPosition() const { return m_zPosition; }
</span><span class="cx"> virtual void setZPosition(float);
</span><span class="lines">@@ -611,6 +615,7 @@
</span><span class="cx">
</span><span class="cx"> int m_repaintCount;
</span><span class="cx"> CustomAppearance m_customAppearance;
</span><ins>+ CustomBehavior m_customBehavior;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #define GRAPHICSLAYER_TYPE_CASTS(ToValueTypeName, predicate) \
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -1409,6 +1409,9 @@
</span><span class="cx"> if (m_uncommittedChanges & CustomAppearanceChanged)
</span><span class="cx"> updateCustomAppearance();
</span><span class="cx">
</span><ins>+ if (m_uncommittedChanges & CustomBehaviorChanged)
+ updateCustomBehavior();
+
</ins><span class="cx"> if (m_uncommittedChanges & ChildrenChanged) {
</span><span class="cx"> updateSublayerList();
</span><span class="cx"> // Sublayers may set this flag again, so clear it to avoid always updating sublayers in commitLayerChangesAfterSublayers().
</span><span class="lines">@@ -2952,6 +2955,11 @@
</span><span class="cx"> m_layer->updateCustomAppearance(m_customAppearance);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsLayerCA::updateCustomBehavior()
+{
+ m_layer->updateCustomBehavior(m_customBehavior);
+}
+
</ins><span class="cx"> void GraphicsLayerCA::setShowDebugBorder(bool showBorder)
</span><span class="cx"> {
</span><span class="cx"> if (showBorder == m_showDebugBorder)
</span><span class="lines">@@ -3053,6 +3061,15 @@
</span><span class="cx"> noteLayerPropertyChanged(CustomAppearanceChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsLayerCA::setCustomBehavior(CustomBehavior customBehavior)
+{
+ if (customBehavior == m_customBehavior)
+ return;
+
+ GraphicsLayer::setCustomBehavior(customBehavior);
+ noteLayerPropertyChanged(CustomBehaviorChanged);
+}
+
</ins><span class="cx"> bool GraphicsLayerCA::requiresTiledLayer(float pageScaleFactor) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_drawsContent || !m_allowTiledLayer || m_isPageTiledBackingLayer)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx"> virtual void setDebugBorder(const Color&, float borderWidth);
</span><span class="cx">
</span><span class="cx"> virtual void setCustomAppearance(CustomAppearance);
</span><ins>+ virtual void setCustomBehavior(CustomBehavior);
</ins><span class="cx">
</span><span class="cx"> virtual void layerDidDisplay(PlatformLayer*);
</span><span class="cx">
</span><span class="lines">@@ -389,7 +390,8 @@
</span><span class="cx"> void updateTiles();
</span><span class="cx"> void updateContentsScale(float pageScaleFactor);
</span><span class="cx"> void updateCustomAppearance();
</span><del>-
</del><ins>+ void updateCustomBehavior();
+
</ins><span class="cx"> enum StructuralLayerPurpose {
</span><span class="cx"> NoStructuralLayer = 0,
</span><span class="cx"> StructuralLayerForPreserves3D,
</span><span class="lines">@@ -447,9 +449,10 @@
</span><span class="cx"> TilesAdded = 1 < 29,
</span><span class="cx"> DebugIndicatorsChanged = 1 << 30,
</span><span class="cx"> CustomAppearanceChanged = 1 << 31,
</span><del>- BlendModeChanged = 1 << 32
</del><ins>+ CustomBehaviorChanged = 1 << 32,
+ BlendModeChanged = 1 << 33
</ins><span class="cx"> };
</span><del>- typedef unsigned LayerChangeFlags;
</del><ins>+ typedef uint64_t LayerChangeFlags;
</ins><span class="cx"> enum ScheduleFlushOrNot { ScheduleFlush, DontScheduleFlush };
</span><span class="cx"> void noteLayerPropertyChanged(LayerChangeFlags, ScheduleFlushOrNot = ScheduleFlush);
</span><span class="cx"> void noteSublayersChanged(ScheduleFlushOrNot = ScheduleFlush);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -197,6 +197,9 @@
</span><span class="cx"> virtual GraphicsLayer::CustomAppearance customAppearance() const = 0;
</span><span class="cx"> virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance) = 0;
</span><span class="cx">
</span><ins>+ virtual GraphicsLayer::CustomBehavior customBehavior() const = 0;
+ virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior) = 0;
+
</ins><span class="cx"> virtual TiledBacking* tiledBacking() = 0;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -136,6 +136,9 @@
</span><span class="cx"> virtual GraphicsLayer::CustomAppearance customAppearance() const override { return m_customAppearance; }
</span><span class="cx"> virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance) override;
</span><span class="cx">
</span><ins>+ virtual GraphicsLayer::CustomBehavior customBehavior() const override { return m_customBehavior; }
+ virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior) override { }
+
</ins><span class="cx"> virtual TiledBacking* tiledBacking() override;
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<PlatformCALayer> clone(PlatformCALayerClient* owner) const override;
</span><span class="lines">@@ -157,6 +160,7 @@
</span><span class="cx"> RetainPtr<NSObject> m_delegate;
</span><span class="cx"> OwnPtr<PlatformCALayerList> m_customSublayers;
</span><span class="cx"> GraphicsLayer::CustomAppearance m_customAppearance;
</span><ins>+ GraphicsLayer::CustomBehavior m_customBehavior;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> PLATFORM_CALAYER_TYPE_CASTS(PlatformCALayerMac, isPlatformCALayerMac())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -165,6 +165,7 @@
</span><span class="cx"> PlatformCALayerMac::PlatformCALayerMac(LayerType layerType, PlatformCALayerClient* owner)
</span><span class="cx"> : PlatformCALayer(layerType, owner)
</span><span class="cx"> , m_customAppearance(GraphicsLayer::NoCustomAppearance)
</span><ins>+ , m_customBehavior(GraphicsLayer::NoCustomBehavior)
</ins><span class="cx"> {
</span><span class="cx"> Class layerClass = Nil;
</span><span class="cx"> switch (layerType) {
</span><span class="lines">@@ -205,6 +206,7 @@
</span><span class="cx"> PlatformCALayerMac::PlatformCALayerMac(PlatformLayer* layer, PlatformCALayerClient* owner)
</span><span class="cx"> : PlatformCALayer([layer isKindOfClass:getAVPlayerLayerClass()] ? LayerTypeAVPlayerLayer : LayerTypeCustom, owner)
</span><span class="cx"> , m_customAppearance(GraphicsLayer::NoCustomAppearance)
</span><ins>+ , m_customBehavior(GraphicsLayer::NoCustomBehavior)
</ins><span class="cx"> {
</span><span class="cx"> m_layer = layer;
</span><span class="cx"> commonInit();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -1431,7 +1431,9 @@
</span><span class="cx"> m_scrollingLayer = createGraphicsLayer("Scrolling container");
</span><span class="cx"> m_scrollingLayer->setDrawsContent(false);
</span><span class="cx"> m_scrollingLayer->setMasksToBounds(true);
</span><del>-
</del><ins>+#if PLATFORM(IOS)
+ m_scrollingLayer->setCustomBehavior(GraphicsLayer::CustomScrollingBehavior);
+#endif
</ins><span class="cx"> // Inner layer which renders the content that scrolls.
</span><span class="cx"> m_scrollingContentsLayer = createGraphicsLayer("Scrolled Contents");
</span><span class="cx"> m_scrollingContentsLayer->setDrawsContent(true);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-03-26 Simon Fraser <simon.fraser@apple.com>
+
+ Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers
+ https://bugs.webkit.org/show_bug.cgi?id=130778
+
+ Reviewed by Tim Horton.
+
+ Make it possible to put a "custom behavior" flag on a layer so that,
+ with UI-side compositing, we know to create a specific type of
+ layer or view for that GraphicsLayer.
+
+ * Shared/mac/RemoteLayerTreeTransaction.h:
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
+ (WebKit::dumpChangedLayers):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (PlatformCALayerRemote::customBehavior):
+ (PlatformCALayerRemote::updateCustomBehavior):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+
</ins><span class="cx"> 2014-03-26 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Remove shape-inside support
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -75,7 +75,8 @@
</span><span class="cx"> BackingStoreChanged = 1 << 24,
</span><span class="cx"> FiltersChanged = 1 << 25,
</span><span class="cx"> EdgeAntialiasingMaskChanged = 1 << 26,
</span><del>- CustomAppearanceChanged = 1 << 27
</del><ins>+ CustomAppearanceChanged = 1 << 27,
+ CustomBehaviorChanged = 1 << 28
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned LayerChange;
</span><span class="cx">
</span><span class="lines">@@ -127,6 +128,7 @@
</span><span class="cx"> WebCore::Color borderColor;
</span><span class="cx"> unsigned edgeAntialiasingMask;
</span><span class="cx"> WebCore::GraphicsLayer::CustomAppearance customAppearance;
</span><ins>+ WebCore::GraphicsLayer::CustomBehavior customBehavior;
</ins><span class="cx"> WebCore::PlatformCALayer::FilterType minificationFilter;
</span><span class="cx"> WebCore::PlatformCALayer::FilterType magnificationFilter;
</span><span class="cx"> bool hidden;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> , borderColor(Color::black)
</span><span class="cx"> , edgeAntialiasingMask(kCALayerLeftEdge | kCALayerRightEdge | kCALayerBottomEdge | kCALayerTopEdge)
</span><span class="cx"> , customAppearance(GraphicsLayer::NoCustomAppearance)
</span><ins>+ , customBehavior(GraphicsLayer::NoCustomBehavior)
</ins><span class="cx"> , minificationFilter(PlatformCALayer::FilterType::Linear)
</span><span class="cx"> , magnificationFilter(PlatformCALayer::FilterType::Linear)
</span><span class="cx"> , hidden(false)
</span><span class="lines">@@ -116,6 +117,7 @@
</span><span class="cx"> , borderColor(other.borderColor)
</span><span class="cx"> , edgeAntialiasingMask(other.edgeAntialiasingMask)
</span><span class="cx"> , customAppearance(other.customAppearance)
</span><ins>+ , customBehavior(other.customBehavior)
</ins><span class="cx"> , minificationFilter(other.minificationFilter)
</span><span class="cx"> , magnificationFilter(other.magnificationFilter)
</span><span class="cx"> , hidden(other.hidden)
</span><span class="lines">@@ -224,6 +226,9 @@
</span><span class="cx">
</span><span class="cx"> if (changedProperties & CustomAppearanceChanged)
</span><span class="cx"> encoder.encodeEnum(customAppearance);
</span><ins>+
+ if (changedProperties & CustomBehaviorChanged)
+ encoder.encodeEnum(customBehavior);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RemoteLayerTreeTransaction::LayerProperties::decode(IPC::ArgumentDecoder& decoder, LayerProperties& result)
</span><span class="lines">@@ -387,6 +392,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (result.changedProperties & CustomBehaviorChanged) {
+ if (!decoder.decodeEnum(result.customBehavior))
+ return false;
+ }
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -805,6 +815,9 @@
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::CustomAppearanceChanged)
</span><span class="cx"> dumpProperty<GraphicsLayer::CustomAppearance>(ts, "customAppearance", layerProperties.customAppearance);
</span><span class="cx">
</span><ins>+ if (layerProperties.changedProperties & RemoteLayerTreeTransaction::CustomBehaviorChanged)
+ dumpProperty<GraphicsLayer::CustomBehavior>(ts, "customBehavior", layerProperties.customBehavior);
+
</ins><span class="cx"> ts << ")";
</span><span class="cx">
</span><span class="cx"> ts.decreaseIndent();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -563,6 +563,17 @@
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::CustomAppearanceChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+GraphicsLayer::CustomBehavior PlatformCALayerRemote::customBehavior() const
+{
+ return m_properties.customBehavior;
+}
+
+void PlatformCALayerRemote::updateCustomBehavior(GraphicsLayer::CustomBehavior customBehavior)
+{
+ m_properties.customBehavior = customBehavior;
+ m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::CustomBehaviorChanged);
+}
+
</ins><span class="cx"> PassRefPtr<PlatformCALayer> PlatformCALayerRemote::createCompatibleLayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* client) const
</span><span class="cx"> {
</span><span class="cx"> return PlatformCALayerRemote::create(layerType, client, m_context);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (166307 => 166308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-03-26 19:21:49 UTC (rev 166307)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-03-26 19:36:49 UTC (rev 166308)
</span><span class="lines">@@ -138,6 +138,9 @@
</span><span class="cx"> virtual WebCore::GraphicsLayer::CustomAppearance customAppearance() const override;
</span><span class="cx"> virtual void updateCustomAppearance(WebCore::GraphicsLayer::CustomAppearance) override;
</span><span class="cx">
</span><ins>+ virtual WebCore::GraphicsLayer::CustomBehavior customBehavior() const override;
+ virtual void updateCustomBehavior(WebCore::GraphicsLayer::CustomBehavior) override;
+
</ins><span class="cx"> virtual WebCore::TiledBacking* tiledBacking() override { return nullptr; }
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::PlatformCALayer> clone(WebCore::PlatformCALayerClient* owner) const override;
</span></span></pre>
</div>
</div>
</body>
</html>