Blink Compositor Animation: Introduce CompositorAnimationHost correctly.

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 33 matching lines @@
 #include "core/loader/FrameLoadRequest.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/PagePopupClient.h"
 #include "core/page/PagePopupSupplement.h"
 #include "modules/accessibility/AXObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/ScriptForbiddenScope.h"
+#include "platform/animation/CompositorAnimationHost.h"
 #include "platform/heap/Handle.h"
 #include "platform/tracing/TraceEvent.h"
 #include "public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "public/platform/WebCursorInfo.h"
 #include "public/web/WebAXObject.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebViewClient.h"
 #include "public/web/WebWidgetClient.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
@@ skipping 59 matching lines @@
     if (m_popup->isAcceleratedCompositingActive()) {
       DCHECK(m_popup->m_layerTreeView);
       m_popup->m_layerTreeView->setNeedsBeginFrame();
       return;
     }
     m_popup->m_widgetClient->scheduleAnimation();
   }
 
   void attachCompositorAnimationTimeline(CompositorAnimationTimeline* timeline,
                                          LocalFrame*) override {
-    if (m_popup->m_layerTreeView)
-      m_popup->m_layerTreeView->attachCompositorAnimationTimeline(
-          timeline->animationTimeline());
+    if (m_popup->m_compositorAnimationHost)
+      m_popup->m_compositorAnimationHost->addTimeline(timeline);
   }
 
   void detachCompositorAnimationTimeline(CompositorAnimationTimeline* timeline,
                                          LocalFrame*) override {
-    if (m_popup->m_layerTreeView)
-      m_popup->m_layerTreeView->detachCompositorAnimationTimeline(
-          timeline->animationTimeline());
+    if (m_popup->m_compositorAnimationHost)
+      m_popup->m_compositorAnimationHost->removeTimeline(timeline);
   }
 
   WebScreenInfo screenInfo() const override {
     return m_popup->m_webView->client()
                ? m_popup->m_webView->client()->screenInfo()
                : WebScreenInfo();
   }
 
   void* webView() const override { return m_popup->m_webView; }
 
@@ skipping 222 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_compositorAnimationHost = WTF::makeUnique<CompositorAnimationHost>(
+          m_layerTreeView->compositorAnimationHost());
       m_page->layerTreeViewInitialized(*m_layerTreeView);
     } else {
       m_isAcceleratedCompositingActive = false;
+      m_compositorAnimationHost = nullptr;
     }
   }
 }
 
 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;
+  m_layerTreeView = nullptr;
+  m_compositorAnimationHost = nullptr;
 }
 
 void WebPagePopupImpl::updateAllLifecyclePhases() {
   if (!m_page)
     return;
   PageWidgetDelegate::updateAllLifecyclePhases(
       *m_page, *m_page->deprecatedLocalMainFrame());
 }
 
 void WebPagePopupImpl::paint(WebCanvas* canvas, const WebRect& rect) {
@@ skipping 167 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