Blink Compositor Animation: Introduce CompositorAnimationHost correctly.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 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 84 matching lines @@
 #include "modules/webgl/WebGLRenderingContext.h"
 #include "platform/ContextMenu.h"
 #include "platform/ContextMenuItem.h"
 #include "platform/Cursor.h"
 #include "platform/Histogram.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/PlatformGestureEvent.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
+#include "platform/animation/CompositorAnimationHost.h"
 #include "platform/exported/WebActiveGestureAnimation.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/CompositorMutatorClient.h"
 #include "platform/graphics/FirstPaintInvalidationTracking.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/gpu/DrawingBuffer.h"
@@ skipping 2406 matching lines @@
   if (m_linkHighlightsTimeline) {
     m_linkHighlights.clear();
     detachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
     m_linkHighlightsTimeline.reset();
   }
 
   if (m_layerTreeView)
     page()->willCloseLayerTreeView(*m_layerTreeView);
 
   setRootLayer(nullptr);
+  m_compositorAnimationHost = nullptr;
 
   m_mutator = nullptr;
   m_layerTreeView = nullptr;
 }
 
 void WebViewImpl::didAcquirePointerLock() {
   if (page())
     page()->pointerLockController().didAcquirePointerLock();
 }
 
@@ skipping 1398 matching lines @@
   if (m_layerTreeView) {
     m_layerTreeView->setNeedsBeginFrame();
     return;
   }
   if (m_client)
     m_client->widgetClient()->scheduleAnimation();
 }
 
 void WebViewImpl::attachCompositorAnimationTimeline(
     CompositorAnimationTimeline* timeline) {
-  if (m_layerTreeView)
-    m_layerTreeView->attachCompositorAnimationTimeline(
-        timeline->animationTimeline());
+  if (m_compositorAnimationHost)
+    m_compositorAnimationHost->addTimeline(timeline);
 }
 
 void WebViewImpl::detachCompositorAnimationTimeline(
     CompositorAnimationTimeline* timeline) {
-  if (m_layerTreeView)
-    m_layerTreeView->detachCompositorAnimationTimeline(
-        timeline->animationTimeline());
+  if (m_compositorAnimationHost)
+    m_compositorAnimationHost->removeTimeline(timeline);
 }
 
 void WebViewImpl::initializeLayerTreeView() {
   if (m_client) {
     m_client->initializeLayerTreeView();
     m_layerTreeView = m_client->widgetClient()->layerTreeView();
+    if (m_layerTreeView && m_layerTreeView->compositorAnimationHost()) {
+      m_compositorAnimationHost = WTF::makeUnique<CompositorAnimationHost>(
+          m_layerTreeView->compositorAnimationHost());
+    }
   }
 
   if (WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl())
     devTools->layerTreeViewChanged(m_layerTreeView);
 
   m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView);
   if (m_layerTreeView)
     m_page->layerTreeViewInitialized(*m_layerTreeView);
 
   // FIXME: only unittests, click to play, Android printing, and printing (for
@@ skipping 229 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink