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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2151933003: Change WTF::TemporaryChange to be an alias for AutoReset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months 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
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 9e64a983ed273135f768d12e98d0c4a98780eba9..5824cda6d85734b7eb50e0b3f710cc48fd64714b 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -559,7 +559,7 @@ void FrameView::adjustViewSizeAndLayout()
{
adjustViewSize();
if (needsLayout()) {
- TemporaryChange<bool> suppressAdjustViewSize(m_suppressAdjustViewSize, true);
+ TemporaryChange<bool> suppressAdjustViewSize(&m_suppressAdjustViewSize, true);
layout();
}
}
@@ -787,7 +787,7 @@ void FrameView::performPreLayoutTasks()
lifecycle().advanceTo(DocumentLifecycle::InPreLayout);
// Don't schedule more layouts, we're in one.
- TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
+ TemporaryChange<bool> changeSchedulingEnabled(&m_layoutSchedulingEnabled, false);
if (!m_nestedLayoutCount && !m_inSynchronousPostLayout && m_postLayoutTasksTimer.isActive()) {
// This is a new top-level layout. If there are any remaining tasks from the previous layout, finish them now.
@@ -965,7 +965,7 @@ void FrameView::layout()
FontCachePurgePreventer fontCachePurgePreventer;
{
- TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
+ TemporaryChange<bool> changeSchedulingEnabled(&m_layoutSchedulingEnabled, false);
m_nestedLayoutCount++;
updateCounters();
@@ -2521,7 +2521,7 @@ void FrameView::updateLifecyclePhasesInternal(DocumentLifecycle::LifecycleState
if (!m_frame->document()->isActive())
return;
- TemporaryChange<DocumentLifecycle::LifecycleState> targetStateScope(m_currentUpdateLifecyclePhasesTargetState, targetState);
+ TemporaryChange<DocumentLifecycle::LifecycleState> targetStateScope(&m_currentUpdateLifecyclePhasesTargetState, targetState);
if (shouldThrottleRendering()) {
updateViewportIntersectionsForSubtree(std::min(targetState, DocumentLifecycle::CompositingClean));

Powered by Google App Engine
This is Rietveld 408576698