<!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>[168468] 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/168468">168468</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-08 03:35:54 -0700 (Thu, 08 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Blending] Replacing Unisolated with NotIsolated in variables and methods names
https://bugs.webkit.org/show_bug.cgi?id=132677
Patch by Ion Rosca <rosca@adobe.com> on 2014-05-08
Reviewed by Dirk Schulze.
No new tests required.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer):
(WebCore::RenderLayer::updateAncestorChainHasBlendingDescendants):
(WebCore::RenderLayer::dirtyAncestorChainHasBlendingDescendants):
(WebCore::RenderLayer::updateDescendantDependentFlags):
hasUnisolatedBlendingDescendants -> hasNotIsolatedBlendingDescendants
(WebCore::RenderLayer::addChild):
(WebCore::RenderLayer::removeChild):
(WebCore::RenderLayer::updateStackingContextsAfterStyleChange):
* rendering/RenderLayer.h:
m_hasUnisolatedBlendingDescendants -> m_hasNotIsolatedBlendingDescendants
m_hasUnisolatedBlendingDescendantsStatusDirty -> m_hasNotIsolatedBlendingDescendantsStatusDirty
hasUnisolatedBlendingDescendants() -> hasNotIsolatedBlendingDescendants()
hasUnisolatedBlendingDescendantsStatusDirty() -> hasNotIsolatedBlendingDescendantsStatusDirty()
m_hasUnisolatedCompositedBlendingDescendants -> m_hasNotIsolatedCompositedBlendingDescendants
hasUnisolatedCompositedBlendingDescendants() -> hasNotIsolatedCompositedBlendingDescendants()
setHasUnisolatedCompositedBlendingDescendants() -> setHasNotIsolatedCompositedBlendingDescendants
* rendering/RenderLayerCompositor.cpp:
(WebCore::CompositingState::CompositingState):
m_hasUnisolatedCompositedBlendingDescendants -> m_hasNotIsolatedCompositedBlendingDescendants
(WebCore::RenderLayerCompositor::computeCompositingRequirements):</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 (168467 => 168468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-08 10:28:37 UTC (rev 168467)
+++ trunk/Source/WebCore/ChangeLog 2014-05-08 10:35:54 UTC (rev 168468)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-05-08 Ion Rosca <rosca@adobe.com>
+
+ [CSS Blending] Replacing Unisolated with NotIsolated in variables and methods names
+ https://bugs.webkit.org/show_bug.cgi?id=132677
+
+ Reviewed by Dirk Schulze.
+
+ No new tests required.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::RenderLayer):
+ (WebCore::RenderLayer::updateAncestorChainHasBlendingDescendants):
+ (WebCore::RenderLayer::dirtyAncestorChainHasBlendingDescendants):
+ (WebCore::RenderLayer::updateDescendantDependentFlags):
+ hasUnisolatedBlendingDescendants -> hasNotIsolatedBlendingDescendants
+ (WebCore::RenderLayer::addChild):
+ (WebCore::RenderLayer::removeChild):
+ (WebCore::RenderLayer::updateStackingContextsAfterStyleChange):
+ * rendering/RenderLayer.h:
+ m_hasUnisolatedBlendingDescendants -> m_hasNotIsolatedBlendingDescendants
+ m_hasUnisolatedBlendingDescendantsStatusDirty -> m_hasNotIsolatedBlendingDescendantsStatusDirty
+ hasUnisolatedBlendingDescendants() -> hasNotIsolatedBlendingDescendants()
+ hasUnisolatedBlendingDescendantsStatusDirty() -> hasNotIsolatedBlendingDescendantsStatusDirty()
+ m_hasUnisolatedCompositedBlendingDescendants -> m_hasNotIsolatedCompositedBlendingDescendants
+ hasUnisolatedCompositedBlendingDescendants() -> hasNotIsolatedCompositedBlendingDescendants()
+ setHasUnisolatedCompositedBlendingDescendants() -> setHasNotIsolatedCompositedBlendingDescendants
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::CompositingState::CompositingState):
+ m_hasUnisolatedCompositedBlendingDescendants -> m_hasNotIsolatedCompositedBlendingDescendants
+ (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+
</ins><span class="cx"> 2014-05-08 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Enable skipped http/tests/media/hls/video-controls-live-stream.html
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (168467 => 168468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-08 10:28:37 UTC (rev 168467)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-08 10:35:54 UTC (rev 168468)
</span><span class="lines">@@ -186,9 +186,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> , m_blendMode(BlendModeNormal)
</span><del>- , m_hasUnisolatedCompositedBlendingDescendants(false)
- , m_hasUnisolatedBlendingDescendants(false)
- , m_hasUnisolatedBlendingDescendantsStatusDirty(false)
</del><ins>+ , m_hasNotIsolatedCompositedBlendingDescendants(false)
+ , m_hasNotIsolatedBlendingDescendants(false)
+ , m_hasNotIsolatedBlendingDescendantsStatusDirty(false)
</ins><span class="cx"> #endif
</span><span class="cx"> , m_renderer(rendererLayerModelObject)
</span><span class="cx"> , m_parent(0)
</span><span class="lines">@@ -826,10 +826,10 @@
</span><span class="cx"> void RenderLayer::updateAncestorChainHasBlendingDescendants()
</span><span class="cx"> {
</span><span class="cx"> for (auto layer = this; layer; layer = layer->parent()) {
</span><del>- if (!layer->hasUnisolatedBlendingDescendantsStatusDirty() && layer->hasUnisolatedBlendingDescendants())
</del><ins>+ if (!layer->hasNotIsolatedBlendingDescendantsStatusDirty() && layer->hasNotIsolatedBlendingDescendants())
</ins><span class="cx"> break;
</span><del>- layer->m_hasUnisolatedBlendingDescendants = true;
- layer->m_hasUnisolatedBlendingDescendantsStatusDirty = false;
</del><ins>+ layer->m_hasNotIsolatedBlendingDescendants = true;
+ layer->m_hasNotIsolatedBlendingDescendantsStatusDirty = false;
</ins><span class="cx">
</span><span class="cx"> layer->updateSelfPaintingLayer();
</span><span class="cx">
</span><span class="lines">@@ -841,10 +841,10 @@
</span><span class="cx"> void RenderLayer::dirtyAncestorChainHasBlendingDescendants()
</span><span class="cx"> {
</span><span class="cx"> for (auto layer = this; layer; layer = layer->parent()) {
</span><del>- if (layer->hasUnisolatedBlendingDescendantsStatusDirty())
</del><ins>+ if (layer->hasNotIsolatedBlendingDescendantsStatusDirty())
</ins><span class="cx"> break;
</span><span class="cx">
</span><del>- layer->m_hasUnisolatedBlendingDescendantsStatusDirty = true;
</del><ins>+ layer->m_hasNotIsolatedBlendingDescendantsStatusDirty = true;
</ins><span class="cx">
</span><span class="cx"> if (layer->isStackingContext())
</span><span class="cx"> break;
</span><span class="lines">@@ -1042,12 +1042,12 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::updateDescendantDependentFlags(HashSet<const RenderObject*>* outOfFlowDescendantContainingBlocks)
</span><span class="cx"> {
</span><del>- if (m_visibleDescendantStatusDirty || m_hasSelfPaintingLayerDescendantDirty || m_hasOutOfFlowPositionedDescendantDirty || hasUnisolatedBlendingDescendantsStatusDirty()) {
</del><ins>+ if (m_visibleDescendantStatusDirty || m_hasSelfPaintingLayerDescendantDirty || m_hasOutOfFlowPositionedDescendantDirty || hasNotIsolatedBlendingDescendantsStatusDirty()) {
</ins><span class="cx"> bool hasVisibleDescendant = false;
</span><span class="cx"> bool hasSelfPaintingLayerDescendant = false;
</span><span class="cx"> bool hasOutOfFlowPositionedDescendant = false;
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- bool hasUnisolatedBlendingDescendants = false;
</del><ins>+ bool hasNotIsolatedBlendingDescendants = false;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> HashSet<const RenderObject*> childOutOfFlowDescendantContainingBlocks;
</span><span class="lines">@@ -1069,12 +1069,12 @@
</span><span class="cx"> hasSelfPaintingLayerDescendant |= child->isSelfPaintingLayer() || child->hasSelfPaintingLayerDescendant();
</span><span class="cx"> hasOutOfFlowPositionedDescendant |= !childOutOfFlowDescendantContainingBlocks.isEmpty();
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- hasUnisolatedBlendingDescendants |= child->hasBlendMode() || (child->hasUnisolatedBlendingDescendants() && !child->isolatesBlending());
</del><ins>+ hasNotIsolatedBlendingDescendants |= child->hasBlendMode() || (child->hasNotIsolatedBlendingDescendants() && !child->isolatesBlending());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool allFlagsSet = hasVisibleDescendant && hasSelfPaintingLayerDescendant && hasOutOfFlowPositionedDescendant;
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- allFlagsSet &= hasUnisolatedBlendingDescendants;
</del><ins>+ allFlagsSet &= hasNotIsolatedBlendingDescendants;
</ins><span class="cx"> #endif
</span><span class="cx"> if (allFlagsSet)
</span><span class="cx"> break;
</span><span class="lines">@@ -1094,9 +1094,9 @@
</span><span class="cx">
</span><span class="cx"> m_hasOutOfFlowPositionedDescendantDirty = false;
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- m_hasUnisolatedBlendingDescendants = hasUnisolatedBlendingDescendants;
- if (m_hasUnisolatedBlendingDescendantsStatusDirty) {
- m_hasUnisolatedBlendingDescendantsStatusDirty = false;
</del><ins>+ m_hasNotIsolatedBlendingDescendants = hasNotIsolatedBlendingDescendants;
+ if (m_hasNotIsolatedBlendingDescendantsStatusDirty) {
+ m_hasNotIsolatedBlendingDescendantsStatusDirty = false;
</ins><span class="cx"> updateSelfPaintingLayer();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -1756,7 +1756,7 @@
</span><span class="cx"> setAncestorChainHasOutOfFlowPositionedDescendant(child->renderer().containingBlock());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- if (child->hasBlendMode() || (child->hasUnisolatedBlendingDescendants() && !child->isolatesBlending()))
</del><ins>+ if (child->hasBlendMode() || (child->hasNotIsolatedBlendingDescendants() && !child->isolatesBlending()))
</ins><span class="cx"> updateAncestorChainHasBlendingDescendants();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1803,7 +1803,7 @@
</span><span class="cx"> dirtyAncestorChainHasSelfPaintingLayerDescendantStatus();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- if (oldChild->hasBlendMode() || (oldChild->hasUnisolatedBlendingDescendants() && !oldChild->isolatesBlending()))
</del><ins>+ if (oldChild->hasBlendMode() || (oldChild->hasNotIsolatedBlendingDescendants() && !oldChild->isolatesBlending()))
</ins><span class="cx"> dirtyAncestorChainHasBlendingDescendants();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -6278,12 +6278,12 @@
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> if (parent()) {
</span><span class="cx"> if (isStackingContext) {
</span><del>- if (!hasUnisolatedBlendingDescendantsStatusDirty() && hasUnisolatedBlendingDescendants())
</del><ins>+ if (!hasNotIsolatedBlendingDescendantsStatusDirty() && hasNotIsolatedBlendingDescendants())
</ins><span class="cx"> parent()->dirtyAncestorChainHasBlendingDescendants();
</span><span class="cx"> } else {
</span><del>- if (hasUnisolatedBlendingDescendantsStatusDirty())
</del><ins>+ if (hasNotIsolatedBlendingDescendantsStatusDirty())
</ins><span class="cx"> parent()->dirtyAncestorChainHasBlendingDescendants();
</span><del>- else if (hasUnisolatedBlendingDescendants())
</del><ins>+ else if (hasNotIsolatedBlendingDescendants())
</ins><span class="cx"> parent()->updateAncestorChainHasBlendingDescendants();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (168467 => 168468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-05-08 10:28:37 UTC (rev 168467)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-05-08 10:35:54 UTC (rev 168468)
</span><span class="lines">@@ -798,23 +798,23 @@
</span><span class="cx"> bool hasBlendMode() const { return renderer().hasBlendMode(); }
</span><span class="cx"> BlendMode blendMode() const { return m_blendMode; }
</span><span class="cx">
</span><del>- bool isolatesCompositedBlending() const { return m_hasUnisolatedCompositedBlendingDescendants && isStackingContext(); }
- bool hasUnisolatedCompositedBlendingDescendants() const { return m_hasUnisolatedCompositedBlendingDescendants; }
- void setHasUnisolatedCompositedBlendingDescendants(bool hasUnisolatedCompositedBlendingDescendants)
</del><ins>+ bool isolatesCompositedBlending() const { return m_hasNotIsolatedCompositedBlendingDescendants && isStackingContext(); }
+ bool hasNotIsolatedCompositedBlendingDescendants() const { return m_hasNotIsolatedCompositedBlendingDescendants; }
+ void setHasNotIsolatedCompositedBlendingDescendants(bool hasNotIsolatedCompositedBlendingDescendants)
</ins><span class="cx"> {
</span><del>- m_hasUnisolatedCompositedBlendingDescendants = hasUnisolatedCompositedBlendingDescendants;
</del><ins>+ m_hasNotIsolatedCompositedBlendingDescendants = hasNotIsolatedCompositedBlendingDescendants;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- bool isolatesBlending() const { return hasUnisolatedBlendingDescendants() && isStackingContext(); }
</del><ins>+ bool isolatesBlending() const { return hasNotIsolatedBlendingDescendants() && isStackingContext(); }
</ins><span class="cx">
</span><del>- // FIXME: We should ASSERT(!m_hasUnisolatedBlendingDescendantsStatusDirty); here but we hit the same bugs as visible content above.
- bool hasUnisolatedBlendingDescendants() const { return m_hasUnisolatedBlendingDescendants; }
- bool hasUnisolatedBlendingDescendantsStatusDirty() const { return m_hasUnisolatedBlendingDescendantsStatusDirty; }
</del><ins>+ // FIXME: We should ASSERT(!m_hasNotIsolatedBlendingDescendantsStatusDirty); here but we hit the same bugs as visible content above.
+ bool hasNotIsolatedBlendingDescendants() const { return m_hasNotIsolatedBlendingDescendants; }
+ bool hasNotIsolatedBlendingDescendantsStatusDirty() const { return m_hasNotIsolatedBlendingDescendantsStatusDirty; }
</ins><span class="cx"> #else
</span><span class="cx"> bool hasBlendMode() const { return false; }
</span><span class="cx"> bool isolatesCompositedBlending() const { return false; }
</span><span class="cx"> bool isolatesBlending() const { return false; }
</span><del>- bool hasUnisolatedBlendingDescendantsStatusDirty() const { return false; }
</del><ins>+ bool hasNotIsolatedBlendingDescendantsStatusDirty() const { return false; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool isComposited() const { return m_backing != 0; }
</span><span class="lines">@@ -1268,9 +1268,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> BlendMode m_blendMode : 5;
</span><del>- bool m_hasUnisolatedCompositedBlendingDescendants : 1;
- bool m_hasUnisolatedBlendingDescendants : 1;
- bool m_hasUnisolatedBlendingDescendantsStatusDirty : 1;
</del><ins>+ bool m_hasNotIsolatedCompositedBlendingDescendants : 1;
+ bool m_hasNotIsolatedBlendingDescendants : 1;
+ bool m_hasNotIsolatedBlendingDescendantsStatusDirty : 1;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RenderLayerModelObject& m_renderer;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (168467 => 168468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-08 10:28:37 UTC (rev 168467)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-08 10:35:54 UTC (rev 168468)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> , m_subtreeIsCompositing(false)
</span><span class="cx"> , m_testingOverlap(testOverlap)
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- , m_hasUnisolatedCompositedBlendingDescendants(false)
</del><ins>+ , m_hasNotIsolatedCompositedBlendingDescendants(false)
</ins><span class="cx"> #endif
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_depth(0)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> , m_subtreeIsCompositing(other.m_subtreeIsCompositing)
</span><span class="cx"> , m_testingOverlap(other.m_testingOverlap)
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- , m_hasUnisolatedCompositedBlendingDescendants(other.m_hasUnisolatedCompositedBlendingDescendants)
</del><ins>+ , m_hasNotIsolatedCompositedBlendingDescendants(other.m_hasNotIsolatedCompositedBlendingDescendants)
</ins><span class="cx"> #endif
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_depth(other.m_depth + 1)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> bool m_subtreeIsCompositing;
</span><span class="cx"> bool m_testingOverlap;
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- bool m_hasUnisolatedCompositedBlendingDescendants;
</del><ins>+ bool m_hasNotIsolatedCompositedBlendingDescendants;
</ins><span class="cx"> #endif
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> int m_depth;
</span><span class="lines">@@ -1162,7 +1162,7 @@
</span><span class="cx"> CompositingState childState(compositingState);
</span><span class="cx"> childState.m_subtreeIsCompositing = false;
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- childState.m_hasUnisolatedCompositedBlendingDescendants = false;
</del><ins>+ childState.m_hasNotIsolatedCompositedBlendingDescendants = false;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (willBeComposited) {
</span><span class="lines">@@ -1245,8 +1245,8 @@
</span><span class="cx"> addToOverlapMap(*overlapMap, layer, absBounds, haveComputedBounds);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- layer.setHasUnisolatedCompositedBlendingDescendants(childState.m_hasUnisolatedCompositedBlendingDescendants);
- ASSERT(!layer.hasUnisolatedCompositedBlendingDescendants() || layer.hasUnisolatedBlendingDescendants());
</del><ins>+ layer.setHasNotIsolatedCompositedBlendingDescendants(childState.m_hasNotIsolatedCompositedBlendingDescendants);
+ ASSERT(!layer.hasNotIsolatedCompositedBlendingDescendants() || layer.hasNotIsolatedBlendingDescendants());
</ins><span class="cx"> #endif
</span><span class="cx"> // Now check for reasons to become composited that depend on the state of descendant layers.
</span><span class="cx"> RenderLayer::IndirectCompositingReason indirectCompositingReason;
</span><span class="lines">@@ -1297,8 +1297,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> if ((willBeComposited && layer.hasBlendMode())
</span><del>- || (layer.hasUnisolatedCompositedBlendingDescendants() && !layer.isolatesCompositedBlending()))
- compositingState.m_hasUnisolatedCompositedBlendingDescendants = true;
</del><ins>+ || (layer.hasNotIsolatedCompositedBlendingDescendants() && !layer.isolatesCompositedBlending()))
+ compositingState.m_hasNotIsolatedCompositedBlendingDescendants = true;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (overlapMap && childState.m_compositingAncestor == &layer && !layer.isRootLayer())
</span></span></pre>
</div>
</div>
</body>
</html>