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

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

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 7 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
« no previous file with comments | « cc/layers/surface_layer.h ('k') | cc/layers/surface_layer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "cc/layers/surface_layer_impl.h" 7 #include "cc/layers/surface_layer_impl.h"
8 #include "cc/output/swap_promise.h" 8 #include "cc/output/swap_promise.h"
9 #include "cc/trees/layer_tree_host.h" 9 #include "cc/trees/layer_tree_host.h"
10 10
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 int64 TraceId() const override { return 0; } 30 int64 TraceId() const override { return 0; }
31 31
32 SurfaceSequence sequence_; 32 SurfaceSequence sequence_;
33 SurfaceLayer::SatisfyCallback satisfy_callback_; 33 SurfaceLayer::SatisfyCallback satisfy_callback_;
34 34
35 DISALLOW_COPY_AND_ASSIGN(SatisfySwapPromise); 35 DISALLOW_COPY_AND_ASSIGN(SatisfySwapPromise);
36 }; 36 };
37 37
38 scoped_refptr<SurfaceLayer> SurfaceLayer::Create( 38 scoped_refptr<SurfaceLayer> SurfaceLayer::Create(
39 const LayerSettings& settings,
39 const SatisfyCallback& satisfy_callback, 40 const SatisfyCallback& satisfy_callback,
40 const RequireCallback& require_callback) { 41 const RequireCallback& require_callback) {
41 return make_scoped_refptr( 42 return make_scoped_refptr(
42 new SurfaceLayer(satisfy_callback, require_callback)); 43 new SurfaceLayer(settings, satisfy_callback, require_callback));
43 } 44 }
44 45
45 SurfaceLayer::SurfaceLayer(const SatisfyCallback& satisfy_callback, 46 SurfaceLayer::SurfaceLayer(const LayerSettings& settings,
47 const SatisfyCallback& satisfy_callback,
46 const RequireCallback& require_callback) 48 const RequireCallback& require_callback)
47 : Layer(), 49 : Layer(settings),
48 surface_scale_(1.f), 50 surface_scale_(1.f),
49 satisfy_callback_(satisfy_callback), 51 satisfy_callback_(satisfy_callback),
50 require_callback_(require_callback) { 52 require_callback_(require_callback) {
51 } 53 }
52 54
53 SurfaceLayer::~SurfaceLayer() { 55 SurfaceLayer::~SurfaceLayer() {
54 DCHECK(!layer_tree_host()); 56 DCHECK(!layer_tree_host());
55 DCHECK(destroy_sequence_.is_null()); 57 DCHECK(destroy_sequence_.is_null());
56 } 58 }
57 59
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 if (!layer_tree_host()) 117 if (!layer_tree_host())
116 return; 118 return;
117 DCHECK(!destroy_sequence_.is_null()); 119 DCHECK(!destroy_sequence_.is_null());
118 scoped_ptr<SatisfySwapPromise> satisfy( 120 scoped_ptr<SatisfySwapPromise> satisfy(
119 new SatisfySwapPromise(destroy_sequence_, satisfy_callback_)); 121 new SatisfySwapPromise(destroy_sequence_, satisfy_callback_));
120 layer_tree_host()->QueueSwapPromise(satisfy.Pass()); 122 layer_tree_host()->QueueSwapPromise(satisfy.Pass());
121 destroy_sequence_ = SurfaceSequence(); 123 destroy_sequence_ = SurfaceSequence();
122 } 124 }
123 125
124 } // namespace cc 126 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/surface_layer.h ('k') | cc/layers/surface_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698