| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 , m_startTime(monotonicallyIncreasingTime()) | 75 , m_startTime(monotonicallyIncreasingTime()) |
| 76 { | 76 { |
| 77 ASSERT(m_node); | 77 ASSERT(m_node); |
| 78 ASSERT(owningWebViewImpl); | 78 ASSERT(owningWebViewImpl); |
| 79 WebCompositorSupport* compositorSupport = Platform::current()->compositorSup
port(); | 79 WebCompositorSupport* compositorSupport = Platform::current()->compositorSup
port(); |
| 80 ASSERT(compositorSupport); | 80 ASSERT(compositorSupport); |
| 81 m_contentLayer = adoptPtr(compositorSupport->createContentLayer(this)); | 81 m_contentLayer = adoptPtr(compositorSupport->createContentLayer(this)); |
| 82 m_clipLayer = adoptPtr(compositorSupport->createLayer()); | 82 m_clipLayer = adoptPtr(compositorSupport->createLayer()); |
| 83 m_clipLayer->setTransformOrigin(WebFloatPoint3D()); | 83 m_clipLayer->setTransformOrigin(WebFloatPoint3D()); |
| 84 m_clipLayer->addChild(m_contentLayer->layer()); | 84 m_clipLayer->addChild(m_contentLayer->layer()); |
| 85 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) { | 85 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor
m::current()->isThreadedAnimationEnabled()) { |
| 86 m_compositorPlayer = adoptPtr(compositorSupport->createAnimationPlayer()
); | 86 m_compositorPlayer = adoptPtr(compositorSupport->createAnimationPlayer()
); |
| 87 ASSERT(m_compositorPlayer); | 87 ASSERT(m_compositorPlayer); |
| 88 m_compositorPlayer->setAnimationDelegate(this); | 88 m_compositorPlayer->setAnimationDelegate(this); |
| 89 m_owningWebViewImpl->linkHighlightsTimeline()->playerAttached(*this); | 89 m_owningWebViewImpl->linkHighlightsTimeline()->playerAttached(*this); |
| 90 m_compositorPlayer->attachLayer(m_contentLayer->layer()); | 90 m_compositorPlayer->attachLayer(m_contentLayer->layer()); |
| 91 } else { | 91 } else { |
| 92 owningWebViewImpl->registerForAnimations(m_contentLayer->layer()); | 92 owningWebViewImpl->registerForAnimations(m_contentLayer->layer()); |
| 93 m_contentLayer->layer()->setAnimationDelegate(this); | 93 m_contentLayer->layer()->setAnimationDelegate(this); |
| 94 } | 94 } |
| 95 m_contentLayer->layer()->setDrawsContent(true); | 95 m_contentLayer->layer()->setDrawsContent(true); |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 { | 381 { |
| 382 return clipLayer(); | 382 return clipLayer(); |
| 383 } | 383 } |
| 384 | 384 |
| 385 WebCompositorAnimationPlayer* LinkHighlightImpl::compositorPlayer() const | 385 WebCompositorAnimationPlayer* LinkHighlightImpl::compositorPlayer() const |
| 386 { | 386 { |
| 387 return m_compositorPlayer.get(); | 387 return m_compositorPlayer.get(); |
| 388 } | 388 } |
| 389 | 389 |
| 390 } // namespace blink | 390 } // namespace blink |
| OLD | NEW |