diff options
| author | dcheng <dcheng@chromium.org> | 2014-08-28 11:56:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 18:58:26 +0000 |
| commit | fba633145b886957109efd5c0d745c4af45d4d59 (patch) | |
| tree | 91bb64400fd740ca85573b72bccc83deec8abdf3 /cc/output | |
| parent | 941dbec971267977fa9dbb92bf72af3b4b772ff2 (diff) | |
| download | chromium_src-fba633145b886957109efd5c0d745c4af45d4d59.zip chromium_src-fba633145b886957109efd5c0d745c4af45d4d59.tar.gz chromium_src-fba633145b886957109efd5c0d745c4af45d4d59.tar.bz2 | |
Manual fixups in compositor code scoped_refptr operator T* removal.
BUG=110610
Review URL: https://codereview.chromium.org/514123002
Cr-Commit-Position: refs/heads/master@{#292432}
Diffstat (limited to 'cc/output')
| -rw-r--r-- | cc/output/delegating_renderer.cc | 3 | ||||
| -rw-r--r-- | cc/output/output_surface_unittest.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc index 8a9f461..143596b 100644 --- a/cc/output/delegating_renderer.cc +++ b/cc/output/delegating_renderer.cc @@ -113,8 +113,7 @@ void DelegatingRenderer::ReceiveSwapBuffersAck( } void DelegatingRenderer::DidChangeVisibility() { - scoped_refptr<ContextProvider> context_provider = - output_surface_->context_provider(); + ContextProvider* context_provider = output_surface_->context_provider(); if (!visible()) { TRACE_EVENT0("cc", "DelegatingRenderer::SetVisible dropping resources"); resource_provider_->ReleaseCachedData(); diff --git a/cc/output/output_surface_unittest.cc b/cc/output/output_surface_unittest.cc index 104d423..299baba 100644 --- a/cc/output/output_surface_unittest.cc +++ b/cc/output/output_surface_unittest.cc @@ -153,7 +153,7 @@ TEST_F(OutputSurfaceTestInitializeNewContext3d, Success) { EXPECT_TRUE(output_surface_.InitializeNewContext3d(context_provider_)); EXPECT_TRUE(client_.deferred_initialize_called()); - EXPECT_EQ(context_provider_, output_surface_.context_provider()); + EXPECT_EQ(context_provider_.get(), output_surface_.context_provider()); EXPECT_FALSE(client_.did_lose_output_surface_called()); context_provider_->ContextGL()->LoseContextCHROMIUM( |