Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Unified Diff: Source/core/rendering/RenderLayerStackingNode.cpp

Issue 60113005: Enable chromium_code=1 on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use accessors Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderLayerScrollableArea.cpp ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerStackingNode.cpp
diff --git a/Source/core/rendering/RenderLayerStackingNode.cpp b/Source/core/rendering/RenderLayerStackingNode.cpp
index b0d2973c9b16d3557d43a71fa088d291c6344f91..b66bce08a120cc872c214e8fd720126c3a57c146 100644
--- a/Source/core/rendering/RenderLayerStackingNode.cpp
+++ b/Source/core/rendering/RenderLayerStackingNode.cpp
@@ -437,11 +437,11 @@ bool RenderLayerStackingNode::shouldBeNormalFlowOnlyIgnoringCompositedScrolling(
void RenderLayerStackingNode::updateIsNormalFlowOnly()
{
- bool isNormalFlowOnly = shouldBeNormalFlowOnly();
- if (isNormalFlowOnly == m_isNormalFlowOnly)
+ bool newIsNormalFlowOnly = shouldBeNormalFlowOnly();
dglazkov 2013/11/06 17:31:05 Here and elsewhere: would you not be able to resol
Peter Kasting 2013/11/06 18:41:46 Personally I think the "new" route reads more clea
+ if (newIsNormalFlowOnly == isNormalFlowOnly())
return;
- m_isNormalFlowOnly = isNormalFlowOnly;
+ m_isNormalFlowOnly = newIsNormalFlowOnly;
if (RenderLayer* p = layer()->parent())
p->stackingNode()->dirtyNormalFlowList();
dirtyStackingContainerZOrderLists();
@@ -618,9 +618,9 @@ bool RenderLayerStackingNode::descendantsAreContiguousInStackingOrder() const
return m_descendantsAreContiguousInStackingOrder;
}
-bool RenderLayerStackingNode::setNeedsToBeStackingContainer(bool needsToBeStackingContainer)
+bool RenderLayerStackingNode::setNeedsToBeStackingContainer(bool newNeedsToBeStackingContainer)
{
- if (m_needsToBeStackingContainer == needsToBeStackingContainer)
+ if (needsToBeStackingContainer() == newNeedsToBeStackingContainer)
return false;
// Count the total number of RenderLayers which need to be stacking
@@ -631,7 +631,7 @@ bool RenderLayerStackingNode::setNeedsToBeStackingContainer(bool needsToBeStacki
m_needsToBeStackingContainerHasBeenRecorded = true;
}
- m_needsToBeStackingContainer = needsToBeStackingContainer;
+ m_needsToBeStackingContainer = newNeedsToBeStackingContainer;
return true;
}
« no previous file with comments | « Source/core/rendering/RenderLayerScrollableArea.cpp ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698