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

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

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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/ui_resource_layer.h ('k') | cc/layers/ui_resource_layer_impl.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui_resource_layer.h" 5 #include "cc/layers/ui_resource_layer.h"
6 6
7 #include "cc/layers/ui_resource_layer_impl.h" 7 #include "cc/layers/ui_resource_layer_impl.h"
8 #include "cc/resources/prioritized_resource.h" 8 #include "cc/resources/prioritized_resource.h"
9 #include "cc/resources/resource_update.h" 9 #include "cc/resources/resource_update.h"
10 #include "cc/resources/resource_update_queue.h" 10 #include "cc/resources/resource_update_queue.h"
11 #include "cc/resources/scoped_ui_resource.h" 11 #include "cc/resources/scoped_ui_resource.h"
12 #include "cc/resources/ui_resource_bitmap.h" 12 #include "cc/resources/ui_resource_bitmap.h"
13 #include "cc/trees/layer_tree_host.h" 13 #include "cc/trees/layer_tree_host.h"
14 14
15 namespace cc { 15 namespace cc {
16 16
17 17
18 namespace { 18 namespace {
19 19
20 class ScopedUIResourceHolder : public UIResourceLayer::UIResourceHolder { 20 class ScopedUIResourceHolder : public UIResourceLayer::UIResourceHolder {
21 public: 21 public:
22 static scoped_ptr<ScopedUIResourceHolder> Create(LayerTreeHost* host, 22 static scoped_ptr<ScopedUIResourceHolder> Create(LayerTreeHost* host,
23 const SkBitmap& skbitmap) { 23 const SkBitmap& skbitmap) {
24 return make_scoped_ptr(new ScopedUIResourceHolder(host, skbitmap)); 24 return make_scoped_ptr(new ScopedUIResourceHolder(host, skbitmap));
25 } 25 }
26 virtual UIResourceId id() OVERRIDE { return resource_->id(); } 26 virtual UIResourceId id() override { return resource_->id(); }
27 27
28 private: 28 private:
29 ScopedUIResourceHolder(LayerTreeHost* host, const SkBitmap& skbitmap) { 29 ScopedUIResourceHolder(LayerTreeHost* host, const SkBitmap& skbitmap) {
30 resource_ = ScopedUIResource::Create(host, UIResourceBitmap(skbitmap)); 30 resource_ = ScopedUIResource::Create(host, UIResourceBitmap(skbitmap));
31 } 31 }
32 32
33 scoped_ptr<ScopedUIResource> resource_; 33 scoped_ptr<ScopedUIResource> resource_;
34 }; 34 };
35 35
36 class SharedUIResourceHolder : public UIResourceLayer::UIResourceHolder { 36 class SharedUIResourceHolder : public UIResourceLayer::UIResourceHolder {
37 public: 37 public:
38 static scoped_ptr<SharedUIResourceHolder> Create(UIResourceId id) { 38 static scoped_ptr<SharedUIResourceHolder> Create(UIResourceId id) {
39 return make_scoped_ptr(new SharedUIResourceHolder(id)); 39 return make_scoped_ptr(new SharedUIResourceHolder(id));
40 } 40 }
41 41
42 virtual UIResourceId id() OVERRIDE { return id_; } 42 virtual UIResourceId id() override { return id_; }
43 43
44 private: 44 private:
45 explicit SharedUIResourceHolder(UIResourceId id) : id_(id) {} 45 explicit SharedUIResourceHolder(UIResourceId id) : id_(id) {}
46 46
47 UIResourceId id_; 47 UIResourceId id_;
48 }; 48 };
49 49
50 } // anonymous namespace 50 } // anonymous namespace
51 51
52 UIResourceLayer::UIResourceHolder::~UIResourceHolder() {} 52 UIResourceLayer::UIResourceHolder::~UIResourceHolder() {}
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 gfx::Size image_size = 157 gfx::Size image_size =
158 layer_tree_host()->GetUIResourceSize(ui_resource_holder_->id()); 158 layer_tree_host()->GetUIResourceSize(ui_resource_holder_->id());
159 layer_impl->SetUIResourceId(ui_resource_holder_->id()); 159 layer_impl->SetUIResourceId(ui_resource_holder_->id());
160 layer_impl->SetImageBounds(image_size); 160 layer_impl->SetImageBounds(image_size);
161 layer_impl->SetUV(uv_top_left_, uv_bottom_right_); 161 layer_impl->SetUV(uv_top_left_, uv_bottom_right_);
162 layer_impl->SetVertexOpacity(vertex_opacity_); 162 layer_impl->SetVertexOpacity(vertex_opacity_);
163 } 163 }
164 } 164 }
165 165
166 } // namespace cc 166 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/ui_resource_layer.h ('k') | cc/layers/ui_resource_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698