Blink Compositor Animation: Introduce CompositorAnimationHost correctly.

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 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 34 matching lines @@
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/ContextMenuController.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/PointerLockController.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/WebFrameScheduler.h"
+#include "platform/animation/CompositorAnimationHost.h"
 #include "platform/graphics/CompositorMutatorClient.h"
 #include "public/web/WebAutofillClient.h"
 #include "public/web/WebPlugin.h"
 #include "public/web/WebRange.h"
 #include "public/web/WebWidgetClient.h"
 #include "web/CompositionUnderlineVectorBuilder.h"
 #include "web/CompositorMutatorImpl.h"
 #include "web/CompositorProxyClientImpl.h"
 #include "web/ContextMenuAllowedScope.h"
 #include "web/InspectorOverlay.h"
@@ skipping 80 matching lines @@
   m_localRoot->setFrameWidget(nullptr);
   m_localRoot = nullptr;
   // Reset the delegate to prevent notifications being sent as we're being
   // deleted.
   m_client = nullptr;
 
   m_mutator = nullptr;
   m_layerTreeView = nullptr;
   m_rootLayer = nullptr;
   m_rootGraphicsLayer = nullptr;
+  m_compositorAnimationHost = nullptr;
 
   m_selfKeepAlive.clear();
 }
 
 WebSize WebFrameWidgetImpl::size() {
   return m_size;
 }
 
 void WebFrameWidgetImpl::resize(const WebSize& newSize) {
   if (m_size == newSize)
@@ skipping 512 matching lines @@
   return m_isAcceleratedCompositingActive;
 }
 
 void WebFrameWidgetImpl::willCloseLayerTreeView() {
   if (m_layerTreeView)
     page()->willCloseLayerTreeView(*m_layerTreeView);
 
   setIsAcceleratedCompositingActive(false);
   m_mutator = nullptr;
   m_layerTreeView = nullptr;
+  m_compositorAnimationHost = nullptr;
   m_layerTreeViewClosed = true;
 }
 
 void WebFrameWidgetImpl::didAcquirePointerLock() {
   page()->pointerLockController().didAcquirePointerLock();
 }
 
 void WebFrameWidgetImpl::didNotAcquirePointerLock() {
   page()->pointerLockController().didNotAcquirePointerLock();
 }
@@ skipping 298 matching lines @@
     return nullptr;
 
   return document->focusedElement();
 }
 
 void WebFrameWidgetImpl::initializeLayerTreeView() {
   if (m_client) {
     DCHECK(!m_mutator);
     m_client->initializeLayerTreeView();
     m_layerTreeView = m_client->layerTreeView();
+    if (m_layerTreeView && m_layerTreeView->compositorAnimationHost()) {
+      m_compositorAnimationHost = WTF::makeUnique<CompositorAnimationHost>(
+          m_layerTreeView->compositorAnimationHost());
+    }
   }
 
   if (WebDevToolsAgentImpl* devTools = m_localRoot->devToolsAgentImpl())
     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
@@ skipping 65 matching lines @@
     return;
 
   if (m_rootLayer)
     m_layerTreeView->setRootLayer(*m_rootLayer);
   else
     m_layerTreeView->clearRootLayer();
 }
 
 void WebFrameWidgetImpl::attachCompositorAnimationTimeline(
     CompositorAnimationTimeline* compositorTimeline) {
-  if (m_layerTreeView)
-    m_layerTreeView->attachCompositorAnimationTimeline(
-        compositorTimeline->animationTimeline());
+  if (m_compositorAnimationHost)
+    m_compositorAnimationHost->addTimeline(compositorTimeline);
 }
 
 void WebFrameWidgetImpl::detachCompositorAnimationTimeline(
     CompositorAnimationTimeline* compositorTimeline) {
-  if (m_layerTreeView)
-    m_layerTreeView->detachCompositorAnimationTimeline(
-        compositorTimeline->animationTimeline());
+  if (m_compositorAnimationHost)
+    m_compositorAnimationHost->removeTimeline(compositorTimeline);
 }
 
 HitTestResult WebFrameWidgetImpl::coreHitTestResultAt(
     const WebPoint& pointInViewport) {
   DocumentLifecycle::AllowThrottlingScope throttlingScope(
       m_localRoot->frame()->document()->lifecycle());
   FrameView* view = m_localRoot->frameView();
   IntPoint pointInRootFrame =
       view->contentsToFrame(view->viewportToContents(pointInViewport));
   return hitTestResultForRootFramePos(pointInRootFrame);
@@ skipping 40 matching lines @@
   return nullptr;
 }
 
 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
   if (!m_imeAcceptEvents)
     return nullptr;
   return focusedLocalFrameInWidget();
 }
 
 }  // namespace blink