Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp

third_party/WebKit/Source/web/WebPagePopupImpl.cpp

Index: third_party/WebKit/Source/web/WebPagePopupImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
index 7c60ee882b92293d22f01df5834ecb26ff44aeaa..db2013e530962ea1910e01612f2825dd577c1072 100644
--- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
+++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp
@@ -343,6 +343,8 @@ void WebPagePopupImpl::setIsAcceleratedCompositingActive(bool enter)
             m_layerTreeView->setVisible(true);
             m_isAcceleratedCompositingActive = true;
             m_layerTreeView->setDeviceScaleFactor(m_webView->deviceScaleFactor());
+            if (m_page)

[dcheng, 2015/12/01 01:16:30]

Is the m_page test here necessary? It looks asymmetrical with the other web/
changes.

[loyso (OOO), 2015/12/01 05:41:03]

WebPagePopupImpl tests m_page for nullptr almost everywhere (same for
WebViewImpl).
But I agree, there shouldn't be any checks for the sake of symmetry.

Now I remember that invariant !!page() == !!client() == !!host() :)

Fixed.

+                m_page->layerTreeViewInitialized(*m_layerTreeView);
         } else {
             m_isAcceleratedCompositingActive = false;
         }
@@ -360,6 +362,9 @@ void WebPagePopupImpl::beginFrame(double lastFrameTimeMonotonic)
 
 void WebPagePopupImpl::willCloseLayerTreeView()
 {
+    if (m_page && m_layerTreeView)
+        m_page->willCloseLayerTreeView(*m_layerTreeView);
+
     setIsAcceleratedCompositingActive(false);
     m_layerTreeView = 0;
 }