<!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>[170944] trunk/Source/WebCore</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/170944">170944</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 18:01:52 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make IndirectCompositingReason an enum class
https://bugs.webkit.org/show_bug.cgi?id=134789
Reviewed by Tim Horton.
Make RenderLayer::IndirectCompositingReason an enum class, and change some code
in RenderLayerCompositor::reasonsForCompositing() to use a switch.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer):
* rendering/RenderLayer.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::computeCompositingRequirements):
(WebCore::RenderLayerCompositor::requiresOwnBackingStore):
(WebCore::RenderLayerCompositor::reasonsForCompositing):
(WebCore::RenderLayerCompositor::requiresCompositingForIndirectReason):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170943 => 170944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-10 00:50:25 UTC (rev 170943)
+++ trunk/Source/WebCore/ChangeLog 2014-07-10 01:01:52 UTC (rev 170944)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-07-09 Simon Fraser <simon.fraser@apple.com>
+
+ Make IndirectCompositingReason an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=134789
+
+ Reviewed by Tim Horton.
+
+ Make RenderLayer::IndirectCompositingReason an enum class, and change some code
+ in RenderLayerCompositor::reasonsForCompositing() to use a switch.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::RenderLayer):
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+ (WebCore::RenderLayerCompositor::requiresOwnBackingStore):
+ (WebCore::RenderLayerCompositor::reasonsForCompositing):
+ (WebCore::RenderLayerCompositor::requiresCompositingForIndirectReason):
+
</ins><span class="cx"> 2014-07-09 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Make SharedBuffer::append(SharedBuffer*) be smarter about CFData and data arrays
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (170943 => 170944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-07-10 00:50:25 UTC (rev 170943)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-07-10 01:01:52 UTC (rev 170944)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> , m_hasCompositingDescendant(false)
</span><span class="cx"> , m_hasTransformedAncestor(false)
</span><span class="cx"> , m_has3DTransformedAncestor(false)
</span><del>- , m_indirectCompositingReason(NoIndirectCompositingReason)
</del><ins>+ , m_indirectCompositingReason(static_cast<unsigned>(IndirectCompositingReason::None))
</ins><span class="cx"> , m_viewportConstrainedNotCompositedReason(NoNotCompositedReason)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_adjustForIOSCaretWhenScrolling(false)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (170943 => 170944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-07-10 00:50:25 UTC (rev 170943)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-07-10 01:01:52 UTC (rev 170944)
</span><span class="lines">@@ -1149,17 +1149,17 @@
</span><span class="cx">
</span><span class="cx"> void setHasCompositingDescendant(bool b) { m_hasCompositingDescendant = b; }
</span><span class="cx">
</span><del>- enum IndirectCompositingReason {
- NoIndirectCompositingReason,
- IndirectCompositingForStacking,
- IndirectCompositingForOverlap,
- IndirectCompositingForBackgroundLayer,
- IndirectCompositingForGraphicalEffect, // opacity, mask, filter, transform etc.
- IndirectCompositingForPerspective,
- IndirectCompositingForPreserve3D
</del><ins>+ enum class IndirectCompositingReason {
+ None,
+ Stacking,
+ Overlap,
+ BackgroundLayer,
+ GraphicalEffect, // opacity, mask, filter, transform etc.
+ Perspective,
+ Preserve3D
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- void setIndirectCompositingReason(IndirectCompositingReason reason) { m_indirectCompositingReason = reason; }
</del><ins>+ void setIndirectCompositingReason(IndirectCompositingReason reason) { m_indirectCompositingReason = static_cast<unsigned>(reason); }
</ins><span class="cx"> IndirectCompositingReason indirectCompositingReason() const { return static_cast<IndirectCompositingReason>(m_indirectCompositingReason); }
</span><span class="cx"> bool mustCompositeForIndirectReasons() const { return m_indirectCompositingReason; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (170943 => 170944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-07-10 00:50:25 UTC (rev 170943)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-07-10 01:01:52 UTC (rev 170944)
</span><span class="lines">@@ -1121,14 +1121,14 @@
</span><span class="cx">
</span><span class="cx"> // Clear the flag
</span><span class="cx"> layer.setHasCompositingDescendant(false);
</span><del>- layer.setIndirectCompositingReason(RenderLayer::NoIndirectCompositingReason);
</del><ins>+ layer.setIndirectCompositingReason(RenderLayer::IndirectCompositingReason::None);
</ins><span class="cx">
</span><span class="cx"> // Check if the layer needs to be composited for non-indirect reasons (ex. 3D transform).
</span><span class="cx"> // We use this value to avoid checking the overlap-map, if we know for sure the layer
</span><span class="cx"> // is already going to be composited for other reasons.
</span><span class="cx"> bool willBeComposited = needsToBeComposited(layer);
</span><span class="cx">
</span><del>- RenderLayer::IndirectCompositingReason compositingReason = compositingState.m_subtreeIsCompositing ? RenderLayer::IndirectCompositingForStacking : RenderLayer::NoIndirectCompositingReason;
</del><ins>+ RenderLayer::IndirectCompositingReason compositingReason = compositingState.m_subtreeIsCompositing ? RenderLayer::IndirectCompositingReason::Stacking : RenderLayer::IndirectCompositingReason::None;
</ins><span class="cx"> bool haveComputedBounds = false;
</span><span class="cx"> IntRect absBounds;
</span><span class="cx">
</span><span class="lines">@@ -1141,7 +1141,7 @@
</span><span class="cx"> if (absBounds.isEmpty())
</span><span class="cx"> absBounds.setSize(IntSize(1, 1));
</span><span class="cx"> haveComputedBounds = true;
</span><del>- compositingReason = overlapMap->overlapsLayers(absBounds) ? RenderLayer::IndirectCompositingForOverlap : RenderLayer::NoIndirectCompositingReason;
</del><ins>+ compositingReason = overlapMap->overlapsLayers(absBounds) ? RenderLayer::IndirectCompositingReason::Overlap : RenderLayer::IndirectCompositingReason::None;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="lines">@@ -1150,7 +1150,7 @@
</span><span class="cx"> // into. These children (the controls) always need to be promoted into their
</span><span class="cx"> // own layers to draw on top of the accelerated video.
</span><span class="cx"> if (compositingState.m_compositingAncestor && compositingState.m_compositingAncestor->renderer().isVideo())
</span><del>- compositingReason = RenderLayer::IndirectCompositingForOverlap;
</del><ins>+ compositingReason = RenderLayer::IndirectCompositingReason::Overlap;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> layer.setIndirectCompositingReason(compositingReason);
</span><span class="lines">@@ -1197,7 +1197,7 @@
</span><span class="cx"> // (since we need to ensure that the -ve z-order child renders underneath our contents).
</span><span class="cx"> if (!willBeComposited && childState.m_subtreeIsCompositing) {
</span><span class="cx"> // make layer compositing
</span><del>- layer.setIndirectCompositingReason(RenderLayer::IndirectCompositingForBackgroundLayer);
</del><ins>+ layer.setIndirectCompositingReason(RenderLayer::IndirectCompositingReason::BackgroundLayer);
</ins><span class="cx"> childState.m_compositingAncestor = &layer;
</span><span class="cx"> if (overlapMap)
</span><span class="cx"> overlapMap->pushCompositingContainer();
</span><span class="lines">@@ -1268,7 +1268,7 @@
</span><span class="cx"> ASSERT(willBeComposited == needsToBeComposited(layer));
</span><span class="cx"> if (layer.reflectionLayer()) {
</span><span class="cx"> // FIXME: Shouldn't we call computeCompositingRequirements to handle a reflection overlapping with another renderer?
</span><del>- layer.reflectionLayer()->setIndirectCompositingReason(willBeComposited ? RenderLayer::IndirectCompositingForStacking : RenderLayer::NoIndirectCompositingReason);
</del><ins>+ layer.reflectionLayer()->setIndirectCompositingReason(willBeComposited ? RenderLayer::IndirectCompositingReason::Stacking : RenderLayer::IndirectCompositingReason::None);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Subsequent layers in the parent stacking context also need to composite.
</span><span class="lines">@@ -2111,11 +2111,11 @@
</span><span class="cx">
</span><span class="cx"> if (layer.mustCompositeForIndirectReasons()) {
</span><span class="cx"> RenderLayer::IndirectCompositingReason reason = layer.indirectCompositingReason();
</span><del>- return reason == RenderLayer::IndirectCompositingForOverlap
- || reason == RenderLayer::IndirectCompositingForStacking
- || reason == RenderLayer::IndirectCompositingForBackgroundLayer
- || reason == RenderLayer::IndirectCompositingForGraphicalEffect
- || reason == RenderLayer::IndirectCompositingForPreserve3D; // preserve-3d has to create backing store to ensure that 3d-transformed elements intersect.
</del><ins>+ return reason == RenderLayer::IndirectCompositingReason::Overlap
+ || reason == RenderLayer::IndirectCompositingReason::Stacking
+ || reason == RenderLayer::IndirectCompositingReason::BackgroundLayer
+ || reason == RenderLayer::IndirectCompositingReason::GraphicalEffect
+ || reason == RenderLayer::IndirectCompositingReason::Preserve3D; // preserve-3d has to create backing store to ensure that 3d-transformed elements intersect.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!ancestorCompositedBounds.contains(layerCompositedBoundsInAncestor))
</span><span class="lines">@@ -2170,13 +2170,19 @@
</span><span class="cx"> if (requiresCompositingForOverflowScrolling(*renderer->layer()))
</span><span class="cx"> reasons |= CompositingReasonOverflowScrollingTouch;
</span><span class="cx">
</span><del>- if (renderer->layer()->indirectCompositingReason() == RenderLayer::IndirectCompositingForStacking)
</del><ins>+ switch (renderer->layer()->indirectCompositingReason()) {
+ case RenderLayer::IndirectCompositingReason::None:
+ break;
+ case RenderLayer::IndirectCompositingReason::Stacking:
</ins><span class="cx"> reasons |= CompositingReasonStacking;
</span><del>- else if (renderer->layer()->indirectCompositingReason() == RenderLayer::IndirectCompositingForOverlap)
</del><ins>+ break;
+ case RenderLayer::IndirectCompositingReason::Overlap:
</ins><span class="cx"> reasons |= CompositingReasonOverlap;
</span><del>- else if (renderer->layer()->indirectCompositingReason() == RenderLayer::IndirectCompositingForBackgroundLayer)
</del><ins>+ break;
+ case RenderLayer::IndirectCompositingReason::BackgroundLayer:
</ins><span class="cx"> reasons |= CompositingReasonNegativeZIndexChildren;
</span><del>- else if (renderer->layer()->indirectCompositingReason() == RenderLayer::IndirectCompositingForGraphicalEffect) {
</del><ins>+ break;
+ case RenderLayer::IndirectCompositingReason::GraphicalEffect:
</ins><span class="cx"> if (renderer->layer()->transform())
</span><span class="cx"> reasons |= CompositingReasonTransformWithCompositedDescendants;
</span><span class="cx">
</span><span class="lines">@@ -2199,11 +2205,14 @@
</span><span class="cx"> if (layer.hasBlendMode())
</span><span class="cx"> reasons |= CompositingReasonBlendingWithCompositedDescendants;
</span><span class="cx"> #endif
</span><del>-
- } else if (renderer->layer()->indirectCompositingReason() == RenderLayer::IndirectCompositingForPerspective)
</del><ins>+ break;
+ case RenderLayer::IndirectCompositingReason::Perspective:
</ins><span class="cx"> reasons |= CompositingReasonPerspective;
</span><del>- else if (renderer->layer()->indirectCompositingReason() == RenderLayer::IndirectCompositingForPreserve3D)
</del><ins>+ break;
+ case RenderLayer::IndirectCompositingReason::Preserve3D:
</ins><span class="cx"> reasons |= CompositingReasonPreserve3D;
</span><ins>+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> if (inCompositingMode() && renderer->layer()->isRootLayer())
</span><span class="cx"> reasons |= CompositingReasonRoot;
</span><span class="lines">@@ -2474,7 +2483,7 @@
</span><span class="cx"> // When a layer has composited descendants, some effects, like 2d transforms, filters, masks etc must be implemented
</span><span class="cx"> // via compositing so that they also apply to those composited descendants.
</span><span class="cx"> if (hasCompositedDescendants && (layer.isolatesCompositedBlending() || layer.transform() || renderer.createsGroup() || renderer.hasReflection() || renderer.isRenderNamedFlowFragmentContainer())) {
</span><del>- reason = RenderLayer::IndirectCompositingForGraphicalEffect;
</del><ins>+ reason = RenderLayer::IndirectCompositingReason::GraphicalEffect;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2482,17 +2491,17 @@
</span><span class="cx"> // will be affected by the preserve-3d or perspective.
</span><span class="cx"> if (has3DTransformedDescendants) {
</span><span class="cx"> if (renderer.style().transformStyle3D() == TransformStyle3DPreserve3D) {
</span><del>- reason = RenderLayer::IndirectCompositingForPreserve3D;
</del><ins>+ reason = RenderLayer::IndirectCompositingReason::Preserve3D;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (renderer.style().hasPerspective()) {
</span><del>- reason = RenderLayer::IndirectCompositingForPerspective;
</del><ins>+ reason = RenderLayer::IndirectCompositingReason::Perspective;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- reason = RenderLayer::NoIndirectCompositingReason;
</del><ins>+ reason = RenderLayer::IndirectCompositingReason::None;
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>