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

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

Issue 2415013002: Don't throttle disposed FrameViews (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5cfb85f3f5f5fddc20055ed245de877eeb10987f..86b24e35e4c3bcb8bbd7fe26f4eedcfea11fb47e 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -170,9 +170,7 @@ FrameView::FrameView(LocalFrame* frame)
m_needsUpdateWidgetGeometries(false),
m_needsUpdateViewportIntersection(true),
m_needsUpdateViewportIntersectionInSubtree(true),
-#if ENABLE(ASSERT)
m_hasBeenDisposed(false),
-#endif
m_horizontalScrollbarMode(ScrollbarAuto),
m_verticalScrollbarMode(ScrollbarAuto),
m_horizontalScrollbarLock(false),
@@ -319,9 +317,7 @@ void FrameView::dispose() {
if (ownerElement && ownerElement->ownedWidget() == this)
ownerElement->setWidget(nullptr);
-#if ENABLE(ASSERT)
m_hasBeenDisposed = true;
-#endif
}
void FrameView::detachScrollbars() {
@@ -4473,6 +4469,8 @@ bool FrameView::shouldThrottleRendering() const {
}
bool FrameView::canThrottleRendering() const {
+ if (m_hasBeenDisposed)
+ return false;
if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
return false;
return m_subtreeThrottled ||
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698