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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2324623002: Disallow reentrance of FrameView::updateLifecyclePhasesInternal() (Closed)
Patch Set: Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 2544 matching lines...) Expand 10 before | Expand all | Expand 10 after
2555 if (FrameView* frameView = m_frame->view()) 2555 if (FrameView* frameView = m_frame->view())
2556 frameView->scheduleAnimation(); 2556 frameView->scheduleAnimation();
2557 } 2557 }
2558 2558
2559 DCHECK(!layoutView()->needsLayout()); 2559 DCHECK(!layoutView()->needsLayout());
2560 } 2560 }
2561 2561
2562 // TODO(leviw): We don't assert lifecycle information from documents in child Pl uginViews. 2562 // TODO(leviw): We don't assert lifecycle information from documents in child Pl uginViews.
2563 void FrameView::updateLifecyclePhasesInternal(DocumentLifecycle::LifecycleState targetState) 2563 void FrameView::updateLifecyclePhasesInternal(DocumentLifecycle::LifecycleState targetState)
2564 { 2564 {
2565 if (m_currentUpdateLifecyclePhasesTargetState != DocumentLifecycle::Uninitia lized) {
2566 NOTREACHED() << "FrameView::updateLifecyclePhasesInternal() reentrance";
2567 return;
2568 }
2569
2565 // This must be called from the root frame, since it recurses down, not up. 2570 // This must be called from the root frame, since it recurses down, not up.
2566 // Otherwise the lifecycles of the frames might be out of sync. 2571 // Otherwise the lifecycles of the frames might be out of sync.
2567 DCHECK(m_frame->isLocalRoot()); 2572 DCHECK(m_frame->isLocalRoot());
2568 2573
2569 // Only the following target states are supported. 2574 // Only the following target states are supported.
2570 DCHECK(targetState == DocumentLifecycle::LayoutClean 2575 DCHECK(targetState == DocumentLifecycle::LayoutClean
2571 || targetState == DocumentLifecycle::CompositingClean 2576 || targetState == DocumentLifecycle::CompositingClean
2572 || targetState == DocumentLifecycle::PrePaintClean 2577 || targetState == DocumentLifecycle::PrePaintClean
2573 || targetState == DocumentLifecycle::PaintClean); 2578 || targetState == DocumentLifecycle::PaintClean);
2574 2579
(...skipping 1749 matching lines...) Expand 10 before | Expand all | Expand 10 after
4324 } 4329 }
4325 4330
4326 bool FrameView::canThrottleRendering() const 4331 bool FrameView::canThrottleRendering() const
4327 { 4332 {
4328 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) 4333 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
4329 return false; 4334 return false;
4330 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4335 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4331 } 4336 }
4332 4337
4333 } // namespace blink 4338 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698