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

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

Issue 822713002: Update from https://crrev.com/309415 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years 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 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"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 ui_resource_holder_ = nullptr; 127 ui_resource_holder_ = nullptr;
128 } 128 }
129 UpdateDrawsContent(HasDrawableContent()); 129 UpdateDrawsContent(HasDrawableContent());
130 SetNeedsCommit(); 130 SetNeedsCommit();
131 } 131 }
132 132
133 void UIResourceLayer::SetUIResourceId(UIResourceId resource_id) { 133 void UIResourceLayer::SetUIResourceId(UIResourceId resource_id) {
134 if (ui_resource_holder_ && ui_resource_holder_->id() == resource_id) 134 if (ui_resource_holder_ && ui_resource_holder_->id() == resource_id)
135 return; 135 return;
136 136
137 if (!bitmap_.isNull())
138 bitmap_.reset();
139
137 if (resource_id) 140 if (resource_id)
138 ui_resource_holder_ = SharedUIResourceHolder::Create(resource_id); 141 ui_resource_holder_ = SharedUIResourceHolder::Create(resource_id);
139 else 142 else
140 ui_resource_holder_ = nullptr; 143 ui_resource_holder_ = nullptr;
141 144
142 UpdateDrawsContent(HasDrawableContent()); 145 UpdateDrawsContent(HasDrawableContent());
143 SetNeedsCommit(); 146 SetNeedsCommit();
144 } 147 }
145 148
146 bool UIResourceLayer::HasDrawableContent() const { 149 bool UIResourceLayer::HasDrawableContent() const {
(...skipping 13 matching lines...) Expand all
160 gfx::Size image_size = 163 gfx::Size image_size =
161 layer_tree_host()->GetUIResourceSize(ui_resource_holder_->id()); 164 layer_tree_host()->GetUIResourceSize(ui_resource_holder_->id());
162 layer_impl->SetUIResourceId(ui_resource_holder_->id()); 165 layer_impl->SetUIResourceId(ui_resource_holder_->id());
163 layer_impl->SetImageBounds(image_size); 166 layer_impl->SetImageBounds(image_size);
164 layer_impl->SetUV(uv_top_left_, uv_bottom_right_); 167 layer_impl->SetUV(uv_top_left_, uv_bottom_right_);
165 layer_impl->SetVertexOpacity(vertex_opacity_); 168 layer_impl->SetVertexOpacity(vertex_opacity_);
166 } 169 }
167 } 170 }
168 171
169 } // namespace cc 172 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698