| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "platform/graphics/CompositorMutatorClient.h" | 5 #include "platform/graphics/CompositorMutatorClient.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "cc/trees/layer_tree_impl.h" | 10 #include "cc/trees/layer_tree_impl.h" |
| 11 #include "platform/graphics/CompositorMutableStateProvider.h" | 11 #include "platform/graphics/CompositorMutableStateProvider.h" |
| 12 #include "platform/graphics/CompositorMutation.h" | 12 #include "platform/graphics/CompositorMutation.h" |
| 13 #include "platform/graphics/CompositorMutationsTarget.h" | 13 #include "platform/graphics/CompositorMutationsTarget.h" |
| 14 #include "platform/graphics/CompositorMutator.h" | 14 #include "platform/graphics/CompositorMutator.h" |
| 15 #include "wtf/PtrUtil.h" |
| 16 #include <memory> |
| 15 | 17 |
| 16 namespace blink { | 18 namespace blink { |
| 17 | 19 |
| 18 CompositorMutatorClient::CompositorMutatorClient(CompositorMutator* mutator, Com
positorMutationsTarget* mutationsTarget) | 20 CompositorMutatorClient::CompositorMutatorClient(CompositorMutator* mutator, Com
positorMutationsTarget* mutationsTarget) |
| 19 : m_client(nullptr) | 21 : m_client(nullptr) |
| 20 , m_mutationsTarget(mutationsTarget) | 22 , m_mutationsTarget(mutationsTarget) |
| 21 , m_mutator(mutator) | 23 , m_mutator(mutator) |
| 22 , m_mutations(nullptr) | 24 , m_mutations(nullptr) |
| 23 { | 25 { |
| 24 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta
torClient::CompositorMutatorClient"); | 26 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta
torClient::CompositorMutatorClient"); |
| 25 } | 27 } |
| 26 | 28 |
| 27 CompositorMutatorClient::~CompositorMutatorClient() | 29 CompositorMutatorClient::~CompositorMutatorClient() |
| 28 { | 30 { |
| 29 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta
torClient::~CompositorMutatorClient"); | 31 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta
torClient::~CompositorMutatorClient"); |
| 30 } | 32 } |
| 31 | 33 |
| 32 bool CompositorMutatorClient::Mutate( | 34 bool CompositorMutatorClient::Mutate( |
| 33 base::TimeTicks monotonicTime, | 35 base::TimeTicks monotonicTime, |
| 34 cc::LayerTreeImpl* treeImpl) | 36 cc::LayerTreeImpl* treeImpl) |
| 35 { | 37 { |
| 36 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::Mutate"); | 38 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::Mutate"); |
| 37 double monotonicTimeNow = (monotonicTime - base::TimeTicks()).InSecondsF(); | 39 double monotonicTimeNow = (monotonicTime - base::TimeTicks()).InSecondsF(); |
| 38 if (!m_mutations) | 40 if (!m_mutations) |
| 39 m_mutations = adoptPtr(new CompositorMutations); | 41 m_mutations = wrapUnique(new CompositorMutations); |
| 40 CompositorMutableStateProvider compositorState(treeImpl, m_mutations.get()); | 42 CompositorMutableStateProvider compositorState(treeImpl, m_mutations.get()); |
| 41 bool shouldReinvoke = m_mutator->mutate(monotonicTimeNow, &compositorState); | 43 bool shouldReinvoke = m_mutator->mutate(monotonicTimeNow, &compositorState); |
| 42 return shouldReinvoke; | 44 return shouldReinvoke; |
| 43 } | 45 } |
| 44 | 46 |
| 45 void CompositorMutatorClient::SetClient(cc::LayerTreeMutatorClient* client) | 47 void CompositorMutatorClient::SetClient(cc::LayerTreeMutatorClient* client) |
| 46 { | 48 { |
| 47 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::SetClient"); | 49 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::SetClient"); |
| 48 m_client = client; | 50 m_client = client; |
| 49 setNeedsMutate(); | 51 setNeedsMutate(); |
| 50 } | 52 } |
| 51 | 53 |
| 52 base::Closure CompositorMutatorClient::TakeMutations() | 54 base::Closure CompositorMutatorClient::TakeMutations() |
| 53 { | 55 { |
| 54 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta
torClient::TakeMutations"); | 56 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta
torClient::TakeMutations"); |
| 55 if (!m_mutations) | 57 if (!m_mutations) |
| 56 return base::Closure(); | 58 return base::Closure(); |
| 57 | 59 |
| 58 return base::Bind(&CompositorMutationsTarget::applyMutations, | 60 return base::Bind(&CompositorMutationsTarget::applyMutations, |
| 59 base::Unretained(m_mutationsTarget), | 61 base::Unretained(m_mutationsTarget), |
| 60 base::Owned(m_mutations.leakPtr())); | 62 base::Owned(m_mutations.release())); |
| 61 } | 63 } |
| 62 | 64 |
| 63 void CompositorMutatorClient::setNeedsMutate() | 65 void CompositorMutatorClient::setNeedsMutate() |
| 64 { | 66 { |
| 65 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::setNeedsMutate")
; | 67 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::setNeedsMutate")
; |
| 66 m_client->SetNeedsMutate(); | 68 m_client->SetNeedsMutate(); |
| 67 } | 69 } |
| 68 | 70 |
| 69 void CompositorMutatorClient::setMutationsForTesting(PassOwnPtr<CompositorMutati
ons> mutations) | 71 void CompositorMutatorClient::setMutationsForTesting(std::unique_ptr<CompositorM
utations> mutations) |
| 70 { | 72 { |
| 71 m_mutations = std::move(mutations); | 73 m_mutations = std::move(mutations); |
| 72 } | 74 } |
| 73 | 75 |
| 74 } // namespace blink | 76 } // namespace blink |
| OLD | NEW |