summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cc/output/render_surface_filters.cc2
-rw-r--r--cc/trees/layer_tree_host_unittest.cc6
-rw-r--r--cc/trees/single_thread_proxy.cc6
3 files changed, 7 insertions, 7 deletions
diff --git a/cc/output/render_surface_filters.cc b/cc/output/render_surface_filters.cc
index d2178b8..03e38d2 100644
--- a/cc/output/render_surface_filters.cc
+++ b/cc/output/render_surface_filters.cc
@@ -274,7 +274,7 @@ class FilterBufferState {
}
SkCanvas* Canvas() {
- if (!canvas_.get())
+ if (!canvas_)
CreateCanvas();
return canvas_.get();
}
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 046699e1..b81bd047 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -1365,7 +1365,7 @@ class EvictionTestLayer : public Layer {
virtual ~EvictionTestLayer() {}
void CreateTextureIfNeeded() {
- if (texture_.get())
+ if (texture_)
return;
texture_ = PrioritizedResource::Create(
layer_tree_host()->contents_texture_manager());
@@ -1402,7 +1402,7 @@ class EvictionTestLayerImpl : public LayerImpl {
void EvictionTestLayer::SetTexturePriorities(const PriorityCalculator&) {
CreateTextureIfNeeded();
- if (!texture_.get())
+ if (!texture_)
return;
texture_->set_request_priority(PriorityCalculator::UIPriority(true));
}
@@ -1411,7 +1411,7 @@ void EvictionTestLayer::Update(ResourceUpdateQueue* queue,
const OcclusionTracker*,
RenderingStats*) {
CreateTextureIfNeeded();
- if (!texture_.get())
+ if (!texture_)
return;
gfx::Rect full_rect(0, 0, 10, 10);
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 1ebb2fd..36c4a1f 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -94,7 +94,7 @@ bool SingleThreadProxy::InitializeOutputSurface() {
DCHECK(Proxy::IsMainThread());
scoped_ptr<OutputSurface> output_surface =
layer_tree_host_->CreateOutputSurface();
- if (!output_surface.get())
+ if (!output_surface)
return false;
output_surface_before_initialization_ = output_surface.Pass();
return true;
@@ -134,7 +134,7 @@ bool SingleThreadProxy::RecreateOutputSurface() {
scoped_ptr<OutputSurface> output_surface =
layer_tree_host_->CreateOutputSurface();
- if (!output_surface.get())
+ if (!output_surface)
return false;
scoped_refptr<cc::ContextProvider> offscreen_context_provider;
if (created_offscreen_context_provider_) {
@@ -313,7 +313,7 @@ void SingleThreadProxy::ReduceWastedContentsTextureMemoryOnImplThread() {
void SingleThreadProxy::SendManagedMemoryStats() {
DCHECK(Proxy::IsImplThread());
- if (!layer_tree_host_impl_.get())
+ if (!layer_tree_host_impl_)
return;
if (!layer_tree_host_->contents_texture_manager())
return;