Animations: Port LinkHighlight to use compositor timelines.

Source/web/LinkHighlight.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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 20 matching lines @@
 #include "core/dom/LayoutTreeBuilderTraversal.h"
 #include "core/dom/Node.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
 #include "core/style/ShadowData.h"
 #include "core/paint/DeprecatedPaintLayer.h"
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorAnimationCurve.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "public/platform/WebFloatAnimationCurve.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebSize.h"
@@ skipping 19 matching lines @@
     , m_owningWebViewImpl(owningWebViewImpl)
     , m_currentGraphicsLayer(0)
     , m_geometryNeedsUpdate(false)
     , m_isAnimating(false)
     , m_startTime(monotonicallyIncreasingTime())
 {
     ASSERT(m_node);
     ASSERT(owningWebViewImpl);
     WebCompositorSupport* compositorSupport = Platform::current()->compositorSupport();
     m_contentLayer = adoptPtr(compositorSupport->createContentLayer(this));
-    owningWebViewImpl->registerForAnimations(m_contentLayer->layer());
     m_clipLayer = adoptPtr(compositorSupport->createLayer());
     m_clipLayer->setTransformOrigin(WebFloatPoint3D());
     m_clipLayer->addChild(m_contentLayer->layer());
-    m_contentLayer->layer()->setAnimationDelegate(this);
+    if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->compositorSupport()) {

[chrishtr, 2015/07/13 21:20:52]

When would compositorSupport() be null?

[loyso (OOO), 2015/07/14 00:59:04]

We can assert that it can't be null here. I'll fix it here and all related CLs.

[chrishtr, 2015/07/14 18:34:00]

Also change the interface to return a reference rather than a pointer then? Is
that feasible?

[loyso (OOO), 2015/07/15 02:04:36]

We have so many calls to this function throughout the project. Many Mocks/Tests
intentionally don't override this virtual function so nullptr is desirable
behavior for them. In ideal world, I would go further an would like to get rid
of that Platform singleton. I think, this is outside of the scope of this CL. We
could set a task in our bug-tracker.

[chrishtr, 2015/07/15 14:25:14]

Ok please add the assert at least then.

[loyso (OOO), 2015/07/21 01:19:07]

Done.

+        m_compositorPlayer = adoptPtr(Platform::current()->compositorSupport()->createAnimationPlayer());
+        ASSERT(m_compositorPlayer);
+        m_compositorPlayer->setAnimationDelegate(this);
+        m_owningWebViewImpl->linkHighlightsTimeline()->playerAttached(*this);
+        m_compositorPlayer->attachLayer(m_contentLayer->layer());
+    } else {
+        owningWebViewImpl->registerForAnimations(m_contentLayer->layer());
+        m_contentLayer->layer()->setAnimationDelegate(this);
+    }
     m_contentLayer->layer()->setDrawsContent(true);
     m_contentLayer->layer()->setOpacity(1);
     m_geometryNeedsUpdate = true;
     updateGeometry();
 }
 
 LinkHighlight::~LinkHighlight()
 {
+    if (m_compositorPlayer) {
+        m_compositorPlayer->detachLayer();
+        m_owningWebViewImpl->linkHighlightsTimeline()->playerDestroyed(*this);
+        m_compositorPlayer->setAnimationDelegate(nullptr);
+    }
+    m_compositorPlayer.clear();
+
     clearGraphicsLayerLinkHighlightPointer();
     releaseResources();
 }
 
 WebContentLayer* LinkHighlight::contentLayer()
 {
     return m_contentLayer.get();
 }
 
 WebLayer* LinkHighlight::clipLayer()
@@ skipping 179 matching lines @@
     OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(compositorSupport->createFloatAnimationCurve());
 
     curve->add(WebFloatKeyframe(0, startOpacity));
     // Make sure we have displayed for at least minPreFadeDuration before starting to fade out.
     float extraDurationRequired = std::max(0.f, minPreFadeDuration - static_cast<float>(monotonicallyIncreasingTime() - m_startTime));
     if (extraDurationRequired)
         curve->add(WebFloatKeyframe(extraDurationRequired, startOpacity));
     // For layout tests we don't fade out.
     curve->add(WebFloatKeyframe(fadeDuration + extraDurationRequired, layoutTestMode() ? startOpacity : 0));
 
     OwnPtr<WebCompositorAnimation> animation = adoptPtr(compositorSupport->createAnimation(*curve, WebCompositorAnimation::TargetPropertyOpacity));

[chrishtr, 2015/07/13 21:20:52]

Why even put it in an OwnPtr if you are going to leak it two lines later?

[loyso (OOO), 2015/07/14 00:59:04]

1) This is how we mark ownership over this animation (and that we pass the
ownership here)
2) That's how blink interact with cc (cc_blink) in existing code base (search
for all the calls
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...).
We don't use OwnPtr in WebKit/public for some reason.

Would be nice to unify it on blink/chromium repositories merge. Any ideas?

[chrishtr, 2015/07/14 18:34:00]

I agree that unifying after the blink/chromium merge would be nice. For now this
code is ok.

[loyso (OOO), 2015/07/21 01:19:07]

Acknowledged.

 
     m_contentLayer->layer()->setDrawsContent(true);
-    m_contentLayer->layer()->addAnimation(animation.leakPtr());
+    if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled())
+        m_compositorPlayer->addAnimation(animation.leakPtr());
+    else
+        m_contentLayer->layer()->addAnimation(animation.leakPtr());
 
     invalidate();
     m_owningWebViewImpl->scheduleAnimation();
 }
 
 void LinkHighlight::clearGraphicsLayerLinkHighlightPointer()
 {
     if (m_currentGraphicsLayer) {
         m_currentGraphicsLayer->removeLinkHighlight(this);
         m_currentGraphicsLayer = 0;
@@ skipping 48 matching lines @@
 {
     // Make sure we update geometry on the next callback from WebViewImpl::layout().
     m_geometryNeedsUpdate = true;
 }
 
 WebLayer* LinkHighlight::layer()
 {
     return clipLayer();
 }
 
+WebCompositorAnimationPlayer* LinkHighlight::compositorPlayer() const
+{
+    return m_compositorPlayer.get();
+}
+
 } // namespace blink