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

Unified Diff: ui/aura/window.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/bench/bench_main.cc ('k') | webkit/browser/fileapi/obfuscated_file_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 7146049aa18ceb035a16230406d97e6be9a26e35..26f3929e1e2516a18c60f14684ec9b0cf700fec5 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -158,7 +158,7 @@ ui::Layer* Window::RecreateLayer() {
cc::TextureMailbox old_mailbox =
old_layer->GetTextureMailbox(&mailbox_scale_factor);
scoped_refptr<ui::Texture> old_texture = old_layer->external_texture();
- if (delegate_ && old_texture)
+ if (delegate_ && old_texture.get())
old_layer->SetExternalTexture(delegate_->CopyTexture());
layer_ = new ui::Layer(old_layer->type());
@@ -170,8 +170,8 @@ ui::Layer* Window::RecreateLayer() {
// Move the original texture to the new layer if the old layer has a
// texture and we could copy it into the old layer,
// crbug.com/175211.
- if (delegate_ && old_texture) {
- layer_->SetExternalTexture(old_texture);
+ if (delegate_ && old_texture.get()) {
+ layer_->SetExternalTexture(old_texture.get());
} else if (old_mailbox.IsSharedMemory()) {
base::SharedMemory* old_buffer = old_mailbox.shared_memory();
const size_t size = old_mailbox.shared_memory_size_in_bytes();
« no previous file with comments | « ui/aura/bench/bench_main.cc ('k') | webkit/browser/fileapi/obfuscated_file_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698