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

Unified Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 1459023002: Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb it for WebPagePopup. Created 5 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
Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
index 94cae36c4d2075b1438d28417db77243c30bdaa9..dd3ac62a05b4365845aaedc6526e5dca111cb1f4 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -604,6 +604,9 @@ bool WebFrameWidgetImpl::isAcceleratedCompositingActive() const
void WebFrameWidgetImpl::willCloseLayerTreeView()
{
+ if (page() && m_layerTreeView)
dcheng 2015/12/01 01:16:30 Out of curiosity... how can we have a null page he
loyso (OOO) 2015/12/01 05:41:03 There is a comment: // Returns the page object
loyso (OOO) 2015/12/01 06:45:39 Well, we have it null here in fast/forms/ layout t
+ page()->willCloseLayerTreeView(*m_layerTreeView);
+
setIsAcceleratedCompositingActive(false);
m_layerTreeView = nullptr;
m_layerTreeViewClosed = true;
@@ -978,6 +981,8 @@ void WebFrameWidgetImpl::initializeLayerTreeView()
devTools->layerTreeViewChanged(m_layerTreeView);
page()->settings().setAcceleratedCompositingEnabled(m_layerTreeView);
+ if (m_layerTreeView)
+ page()->layerTreeViewInitialized(*m_layerTreeView);
// FIXME: only unittests, click to play, Android priting, and printing (for headers and footers)
// make this assert necessary. We should make them not hit this code and then delete allowsBrokenNullLayerTreeView.

Powered by Google App Engine
This is Rietveld 408576698