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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 16907002: Update Android 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2833 matching lines...) Expand 10 before | Expand all | Expand 10 after
2844 GpuChannelHost* gpu_channel_host = 2844 GpuChannelHost* gpu_channel_host =
2845 RenderThreadImpl::current()->EstablishGpuChannelSync( 2845 RenderThreadImpl::current()->EstablishGpuChannelSync(
2846 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); 2846 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
2847 if (!gpu_channel_host) { 2847 if (!gpu_channel_host) {
2848 LOG(ERROR) << "Failed to establish GPU channel for media player"; 2848 LOG(ERROR) << "Failed to establish GPU channel for media player";
2849 return NULL; 2849 return NULL;
2850 } 2850 }
2851 2851
2852 scoped_refptr<cc::ContextProvider> context_provider = 2852 scoped_refptr<cc::ContextProvider> context_provider =
2853 RenderThreadImpl::current()->OffscreenContextProviderForMainThread(); 2853 RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
2854 if (!context_provider) { 2854 if (!context_provider.get()) {
2855 LOG(ERROR) << "Failed to get context3d for media player"; 2855 LOG(ERROR) << "Failed to get context3d for media player";
2856 return NULL; 2856 return NULL;
2857 } 2857 }
2858 2858
2859 if (!media_player_proxy_) { 2859 if (!media_player_proxy_) {
2860 media_player_proxy_ = new WebMediaPlayerProxyImplAndroid( 2860 media_player_proxy_ = new WebMediaPlayerProxyImplAndroid(
2861 this, media_player_manager_.get()); 2861 this, media_player_manager_.get());
2862 } 2862 }
2863 scoped_ptr<webkit_media::WebMediaPlayerAndroid> web_media_player_android( 2863 scoped_ptr<webkit_media::WebMediaPlayerAndroid> web_media_player_android(
2864 new webkit_media::WebMediaPlayerAndroid( 2864 new webkit_media::WebMediaPlayerAndroid(
(...skipping 3864 matching lines...) Expand 10 before | Expand all | Expand 10 after
6729 WebURL url = icon_urls[i].iconURL(); 6729 WebURL url = icon_urls[i].iconURL();
6730 if (!url.isEmpty()) 6730 if (!url.isEmpty())
6731 urls.push_back(FaviconURL(url, 6731 urls.push_back(FaviconURL(url,
6732 ToFaviconType(icon_urls[i].iconType()))); 6732 ToFaviconType(icon_urls[i].iconType())));
6733 } 6733 }
6734 SendUpdateFaviconURL(urls); 6734 SendUpdateFaviconURL(urls);
6735 } 6735 }
6736 6736
6737 6737
6738 } // namespace content 6738 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc_local_audio_track.cc ('k') | gpu/command_buffer/tests/gl_unittests_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698