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

third_party/WebKit/Source/web/WebPagePopupImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 325 matching lines @@
         m_isAcceleratedCompositingActive = true;
     } else {
         TRACE_EVENT0("blink", "WebPagePopupImpl::setIsAcceleratedCompositingActive(true)");
 
         m_widgetClient->initializeLayerTreeView();
         m_layerTreeView = m_widgetClient->layerTreeView();
         if (m_layerTreeView) {
             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;
         }
     }
 }
 
 void WebPagePopupImpl::beginFrame(double lastFrameTimeMonotonic)
 {
     if (!m_page)
         return;
     // FIXME: This should use lastFrameTimeMonotonic but doing so
     // breaks tests.
     PageWidgetDelegate::animate(*m_page, monotonicallyIncreasingTime());
 }
 
 void WebPagePopupImpl::willCloseLayerTreeView()
 {
+    if (m_page && m_layerTreeView)
+        m_page->willCloseLayerTreeView(*m_layerTreeView);
+
     setIsAcceleratedCompositingActive(false);
     m_layerTreeView = 0;
 }
 
 void WebPagePopupImpl::updateAllLifecyclePhases()
 {
     if (!m_page)
         return;
     PageWidgetDelegate::updateAllLifecyclePhases(*m_page, *m_page->deprecatedLocalMainFrame());
 }
@@ skipping 158 matching lines @@
     // A WebPagePopupImpl instance usually has two references.
     //  - One owned by the instance itself. It represents the visible widget.
     //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
     //    WebPagePopupImpl to close.
     // We need them because the closing operation is asynchronous and the widget
     // can be closed while the WebViewImpl is unaware of it.
     return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 } // namespace blink