CC Animation: Move files from cc_blink to Source/platform/animation

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 78 matching lines @@
 #include "core/page/TouchDisambiguation.h"
 #include "core/paint/PaintLayer.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/Performance.h"
 #include "modules/accessibility/AXObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "modules/credentialmanager/CredentialManagerClient.h"
 #include "modules/encryptedmedia/MediaKeysController.h"
 #include "modules/storage/StorageNamespaceController.h"
 #include "modules/webgl/WebGLRenderingContext.h"
+#include "platform/CompositorFactory.h"
 #include "platform/ContextMenu.h"
 #include "platform/ContextMenuItem.h"
 #include "platform/Cursor.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/Logging.h"
 #include "platform/NotImplemented.h"
 #include "platform/PlatformGestureEvent.h"
 #include "platform/PlatformKeyboardEvent.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ skipping 4237 matching lines @@
         m_layerTreeView->setNeedsBeginFrame();
         return;
     }
     if (m_client)
         m_client->scheduleAnimation();
 }
 
 void WebViewImpl::attachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timeline)
 {
     if (m_layerTreeView)
-        m_layerTreeView->attachCompositorAnimationTimeline(timeline);
+        m_layerTreeView->attachCompositorAnimationTimeline(timeline->animationTimeline());
 }
 
 void WebViewImpl::detachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timeline)
 {
     if (m_layerTreeView)
-        m_layerTreeView->detachCompositorAnimationTimeline(timeline);
+        m_layerTreeView->detachCompositorAnimationTimeline(timeline->animationTimeline());
 }
 
 void WebViewImpl::initializeLayerTreeView()
 {
     if (m_client) {
         m_client->initializeLayerTreeView();
         m_layerTreeView = m_client->layerTreeView();
     }
 
     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 headers and footers)
     // make this assert necessary. We should make them not hit this code and then delete allowsBrokenNullLayerTreeView.
     ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeView());
 
     if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled() && m_layerTreeView) {
-        ASSERT(Platform::current()->compositorSupport());
-        m_linkHighlightsTimeline = adoptPtr(Platform::current()->compositorSupport()->createAnimationTimeline());
+        m_linkHighlightsTimeline = adoptPtr(CompositorFactory::current().createAnimationTimeline());
         attachCompositorAnimationTimeline(m_linkHighlightsTimeline.get());
     }
 
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         attachPaintArtifactCompositor();
 }
 
 void WebViewImpl::applyViewportDeltas(
     const WebFloatSize& visualViewportDelta,
     const WebFloatSize& layoutViewportDelta,
@@ skipping 237 matching lines @@
 {
     // TODO(oshima): Investigate if this should return the ScreenInfo's scale factor rather than
     // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 } // namespace blink