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

Side by Side Diff: cc/layers/surface_layer.cc

Issue 2323423002: cc: Add SwapPromiseManager and SurfaceSequenceGenerator. (Closed)
Patch Set: rebase Created 4 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "cc/layers/surface_layer.h" 5 #include "cc/layers/surface_layer.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
11 #include "cc/layers/surface_layer_impl.h" 11 #include "cc/layers/surface_layer_impl.h"
12 #include "cc/output/swap_promise.h" 12 #include "cc/output/swap_promise.h"
13 #include "cc/trees/layer_tree_host.h" 13 #include "cc/trees/surface_sequence_generator.h"
14 #include "cc/trees/swap_promise_manager.h"
14 15
15 namespace cc { 16 namespace cc {
16 17
17 class SatisfySwapPromise : public SwapPromise { 18 class SatisfySwapPromise : public SwapPromise {
18 public: 19 public:
19 SatisfySwapPromise(SurfaceSequence sequence, 20 SatisfySwapPromise(SurfaceSequence sequence,
20 const SurfaceLayer::SatisfyCallback& satisfy_callback) 21 const SurfaceLayer::SatisfyCallback& satisfy_callback)
21 : sequence_(sequence), satisfy_callback_(satisfy_callback) {} 22 : sequence_(sequence), satisfy_callback_(satisfy_callback) {}
22 23
23 ~SatisfySwapPromise() override {} 24 ~SatisfySwapPromise() override {}
(...skipping 23 matching lines...) Expand all
47 new SurfaceLayer(satisfy_callback, require_callback)); 48 new SurfaceLayer(satisfy_callback, require_callback));
48 } 49 }
49 50
50 SurfaceLayer::SurfaceLayer(const SatisfyCallback& satisfy_callback, 51 SurfaceLayer::SurfaceLayer(const SatisfyCallback& satisfy_callback,
51 const RequireCallback& require_callback) 52 const RequireCallback& require_callback)
52 : surface_scale_(1.f), 53 : surface_scale_(1.f),
53 satisfy_callback_(satisfy_callback), 54 satisfy_callback_(satisfy_callback),
54 require_callback_(require_callback) {} 55 require_callback_(require_callback) {}
55 56
56 SurfaceLayer::~SurfaceLayer() { 57 SurfaceLayer::~SurfaceLayer() {
57 DCHECK(!layer_tree_host()); 58 DCHECK(!GetLayerTree());
58 DCHECK(destroy_sequence_.is_null()); 59 DCHECK(destroy_sequence_.is_null());
59 } 60 }
60 61
61 void SurfaceLayer::SetSurfaceId(const SurfaceId& surface_id, 62 void SurfaceLayer::SetSurfaceId(const SurfaceId& surface_id,
62 float scale, 63 float scale,
63 const gfx::Size& size) { 64 const gfx::Size& size) {
64 SatisfyDestroySequence(); 65 SatisfyDestroySequence();
65 surface_id_ = surface_id; 66 surface_id_ = surface_id;
66 surface_size_ = size; 67 surface_size_ = size;
67 surface_scale_ = scale; 68 surface_scale_ = scale;
(...skipping 28 matching lines...) Expand all
96 TRACE_EVENT0("cc", "SurfaceLayer::PushPropertiesTo"); 97 TRACE_EVENT0("cc", "SurfaceLayer::PushPropertiesTo");
97 SurfaceLayerImpl* layer_impl = static_cast<SurfaceLayerImpl*>(layer); 98 SurfaceLayerImpl* layer_impl = static_cast<SurfaceLayerImpl*>(layer);
98 99
99 layer_impl->SetSurfaceId(surface_id_); 100 layer_impl->SetSurfaceId(surface_id_);
100 layer_impl->SetSurfaceSize(surface_size_); 101 layer_impl->SetSurfaceSize(surface_size_);
101 layer_impl->SetSurfaceScale(surface_scale_); 102 layer_impl->SetSurfaceScale(surface_scale_);
102 } 103 }
103 104
104 void SurfaceLayer::CreateNewDestroySequence() { 105 void SurfaceLayer::CreateNewDestroySequence() {
105 DCHECK(destroy_sequence_.is_null()); 106 DCHECK(destroy_sequence_.is_null());
106 if (layer_tree_host()) { 107 if (GetLayerTree()) {
107 destroy_sequence_ = layer_tree_host()->CreateSurfaceSequence(); 108 destroy_sequence_ =
109 GetLayerTree()->GetSurfaceSequenceGenerator()->CreateSurfaceSequence();
108 require_callback_.Run(surface_id_, destroy_sequence_); 110 require_callback_.Run(surface_id_, destroy_sequence_);
109 } 111 }
110 } 112 }
111 113
112 void SurfaceLayer::SatisfyDestroySequence() { 114 void SurfaceLayer::SatisfyDestroySequence() {
113 if (!layer_tree_host()) 115 if (!layer_tree_host())
114 return; 116 return;
115 DCHECK(!destroy_sequence_.is_null()); 117 DCHECK(!destroy_sequence_.is_null());
116 std::unique_ptr<SatisfySwapPromise> satisfy( 118 std::unique_ptr<SatisfySwapPromise> satisfy(
117 new SatisfySwapPromise(destroy_sequence_, satisfy_callback_)); 119 new SatisfySwapPromise(destroy_sequence_, satisfy_callback_));
118 layer_tree_host()->QueueSwapPromise(std::move(satisfy)); 120 GetLayerTree()->GetSwapPromiseManager()->QueueSwapPromise(std::move(satisfy));
119 destroy_sequence_ = SurfaceSequence(); 121 destroy_sequence_ = SurfaceSequence();
120 } 122 }
121 123
122 } // namespace cc 124 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698