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 4f686427e736d2b74b9d810e5e813d769d90a867..b4cc0b4b6851faa25a344a75e692ad944fa13517 100644 |
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp |
@@ -651,8 +651,10 @@ bool WebFrameWidgetImpl::isAcceleratedCompositingActive() const { |
} |
void WebFrameWidgetImpl::willCloseLayerTreeView() { |
- if (m_layerTreeView) |
- page()->willCloseLayerTreeView(*m_layerTreeView); |
+ if (m_layerTreeView) { |
+ page()->willCloseLayerTreeView(*m_layerTreeView, |
+ m_localRoot->frame()->view()); |
+ } |
setIsAcceleratedCompositingActive(false); |
m_mutator = nullptr; |
@@ -996,8 +998,12 @@ void WebFrameWidgetImpl::initializeLayerTreeView() { |
devTools->layerTreeViewChanged(m_layerTreeView); |
page()->settings().setAcceleratedCompositingEnabled(m_layerTreeView); |
- if (m_layerTreeView) |
- page()->layerTreeViewInitialized(*m_layerTreeView); |
+ if (m_layerTreeView) { |
+ LOG(ERROR) << "WFWI::initializeLayerTreeView(), this = " << (void*)this |
bokan
2017/01/17 20:40:16
Is this logging leftover from debugging?
kenrb
2017/01/19 19:07:40
Yes, sorry, removed.
bokan
2017/01/19 20:05:39
Acknowledged.
|
+ << ", root frame view = " << (void*)m_localRoot->frame()->view(); |
+ page()->layerTreeViewInitialized(*m_layerTreeView, |
+ m_localRoot->frame()->view()); |
+ } |
// FIXME: only unittests, click to play, Android priting, and printing (for |
// headers and footers) make this assert necessary. We should make them not |