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

Unified Diff: ui/aura/bench/bench_main.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 | « device/bluetooth/bluetooth_profile_chromeos_unittest.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/bench/bench_main.cc
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index 08d31778b9f60f1123628438eea44b3c9006c325..bcdbd61a601e78667f14e737559bb2ae09063ff8 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -212,7 +212,7 @@ class WebGLBench : public BenchCompositorObserver {
texture_ = new WebGLTexture(context_.get(), bounds.size());
fbo_ = context_->createFramebuffer();
compositor->AddObserver(this);
- webgl_.SetExternalTexture(texture_);
+ webgl_.SetExternalTexture(texture_.get());
context_->bindFramebuffer(GL_FRAMEBUFFER, fbo_);
context_->framebufferTexture2D(
GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
@@ -237,7 +237,7 @@ class WebGLBench : public BenchCompositorObserver {
context_->clear(GL_COLOR_BUFFER_BIT);
context_->flush();
}
- webgl_.SetExternalTexture(texture_);
+ webgl_.SetExternalTexture(texture_.get());
webgl_.SchedulePaint(gfx::Rect(webgl_.bounds().size()));
compositor_->ScheduleDraw();
}
« no previous file with comments | « device/bluetooth/bluetooth_profile_chromeos_unittest.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698