Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(516)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/CompositorMutatorClient.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from Kent; merge. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "platform/TraceEvent.h" 9 #include "platform/TraceEvent.h"
10 #include "platform/graphics/CompositorMutation.h" 10 #include "platform/graphics/CompositorMutation.h"
11 #include "platform/graphics/CompositorMutationsTarget.h" 11 #include "platform/graphics/CompositorMutationsTarget.h"
12 #include "platform/graphics/CompositorMutator.h" 12 #include "platform/graphics/CompositorMutator.h"
13 #include "wtf/PtrUtil.h"
14 #include <memory>
13 15
14 namespace blink { 16 namespace blink {
15 17
16 CompositorMutatorClient::CompositorMutatorClient(CompositorMutator* mutator, Com positorMutationsTarget* mutationsTarget) 18 CompositorMutatorClient::CompositorMutatorClient(CompositorMutator* mutator, Com positorMutationsTarget* mutationsTarget)
17 : m_client(nullptr) 19 : m_client(nullptr)
18 , m_mutationsTarget(mutationsTarget) 20 , m_mutationsTarget(mutationsTarget)
19 , m_mutator(mutator) 21 , m_mutator(mutator)
20 , m_mutations(nullptr) 22 , m_mutations(nullptr)
21 { 23 {
22 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta torClient::CompositorMutatorClient"); 24 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta torClient::CompositorMutatorClient");
23 } 25 }
24 26
25 CompositorMutatorClient::~CompositorMutatorClient() 27 CompositorMutatorClient::~CompositorMutatorClient()
26 { 28 {
27 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta torClient::~CompositorMutatorClient"); 29 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta torClient::~CompositorMutatorClient");
28 } 30 }
29 31
30 bool CompositorMutatorClient::Mutate( 32 bool CompositorMutatorClient::Mutate(
31 base::TimeTicks monotonicTime) 33 base::TimeTicks monotonicTime)
32 { 34 {
33 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::Mutate"); 35 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::Mutate");
34 double monotonicTimeNow = (monotonicTime - base::TimeTicks()).InSecondsF(); 36 double monotonicTimeNow = (monotonicTime - base::TimeTicks()).InSecondsF();
35 if (!m_mutations) 37 if (!m_mutations)
36 m_mutations = adoptPtr(new CompositorMutations); 38 m_mutations = wrapUnique(new CompositorMutations);
37 bool shouldReinvoke = m_mutator->mutate(monotonicTimeNow); 39 bool shouldReinvoke = m_mutator->mutate(monotonicTimeNow);
38 return shouldReinvoke; 40 return shouldReinvoke;
39 } 41 }
40 42
41 void CompositorMutatorClient::SetClient(cc::LayerTreeMutatorClient* client) 43 void CompositorMutatorClient::SetClient(cc::LayerTreeMutatorClient* client)
42 { 44 {
43 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::SetClient"); 45 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::SetClient");
44 m_client = client; 46 m_client = client;
45 setNeedsMutate(); 47 setNeedsMutate();
46 } 48 }
47 49
48 base::Closure CompositorMutatorClient::TakeMutations() 50 base::Closure CompositorMutatorClient::TakeMutations()
49 { 51 {
50 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta torClient::TakeMutations"); 52 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorMuta torClient::TakeMutations");
51 if (!m_mutations) 53 if (!m_mutations)
52 return base::Closure(); 54 return base::Closure();
53 55
54 return base::Bind(&CompositorMutationsTarget::applyMutations, 56 return base::Bind(&CompositorMutationsTarget::applyMutations,
55 base::Unretained(m_mutationsTarget), 57 base::Unretained(m_mutationsTarget),
56 base::Owned(m_mutations.leakPtr())); 58 base::Owned(m_mutations.release()));
57 } 59 }
58 60
59 void CompositorMutatorClient::setNeedsMutate() 61 void CompositorMutatorClient::setNeedsMutate()
60 { 62 {
61 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::setNeedsMutate") ; 63 TRACE_EVENT0("compositor-worker", "CompositorMutatorClient::setNeedsMutate") ;
62 m_client->SetNeedsMutate(); 64 m_client->SetNeedsMutate();
63 } 65 }
64 66
65 void CompositorMutatorClient::setMutationsForTesting(PassOwnPtr<CompositorMutati ons> mutations) 67 void CompositorMutatorClient::setMutationsForTesting(std::unique_ptr<CompositorM utations> mutations)
66 { 68 {
67 m_mutations = std::move(mutations); 69 m_mutations = std::move(mutations);
68 } 70 }
69 71
70 } // namespace blink 72 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698