diff options
Diffstat (limited to 'content/renderer')
6 files changed, 7 insertions, 17 deletions
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc index a5d60b1..1e55519 100644 --- a/content/renderer/media/media_stream_dependency_factory.cc +++ b/content/renderer/media/media_stream_dependency_factory.cc @@ -303,7 +303,7 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { signaling_thread_, audio_device_)); if (factory.get()) - pc_factory_ = factory.release(); + pc_factory_ = factory; else audio_device_ = NULL; } diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.cc b/content/renderer/pepper/pepper_platform_audio_input_impl.cc index c154579..66ce5d4 100644 --- a/content/renderer/pepper/pepper_platform_audio_input_impl.cc +++ b/content/renderer/pepper/pepper_platform_audio_input_impl.cc @@ -30,7 +30,8 @@ PepperPlatformAudioInputImpl* PepperPlatformAudioInputImpl::Create( frames_per_buffer, client)) { // Balanced by Release invoked in // PepperPlatformAudioInputImpl::ShutDownOnIOThread(). - return audio_input.release(); + audio_input->AddRef(); + return audio_input.get(); } return NULL; } diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.cc b/content/renderer/pepper/pepper_platform_audio_output_impl.cc index ecb833a..6681d0a 100644 --- a/content/renderer/pepper/pepper_platform_audio_output_impl.cc +++ b/content/renderer/pepper/pepper_platform_audio_output_impl.cc @@ -30,7 +30,8 @@ PepperPlatformAudioOutputImpl* PepperPlatformAudioOutputImpl::Create( source_render_view_id, client)) { // Balanced by Release invoked in // PepperPlatformAudioOutputImpl::ShutDownOnIOThread(). - return audio_output.release(); + audio_output->AddRef(); + return audio_output.get(); } return NULL; } diff --git a/content/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc index d6d1887..3094035 100644 --- a/content/renderer/render_widget_fullscreen.cc +++ b/content/renderer/render_widget_fullscreen.cc @@ -11,15 +11,6 @@ using WebKit::WebWidget; namespace content { -// static -RenderWidgetFullscreen* RenderWidgetFullscreen::Create(int32 opener_id) { - DCHECK_NE(MSG_ROUTING_NONE, opener_id); - scoped_refptr<RenderWidgetFullscreen> widget( - new RenderWidgetFullscreen(WebKit::WebScreenInfo())); - widget->Init(opener_id); - return widget.release(); -} - void RenderWidgetFullscreen::show(WebKit::WebNavigationPolicy) { DCHECK(!did_show_) << "received extraneous Show call"; DCHECK_NE(MSG_ROUTING_NONE, routing_id_); diff --git a/content/renderer/render_widget_fullscreen.h b/content/renderer/render_widget_fullscreen.h index fa2e1a6..5570cf8 100644 --- a/content/renderer/render_widget_fullscreen.h +++ b/content/renderer/render_widget_fullscreen.h @@ -14,10 +14,6 @@ namespace content { // TODO(boliu): Override non-supported methods with no-op? eg setWindowRect(). class RenderWidgetFullscreen : public RenderWidget { public: - // Creates a new RenderWidget. The opener_id is the routing ID of the - // RenderView that this widget lives inside. - static RenderWidgetFullscreen* Create(int32 opener_id); - virtual void show(WebKit::WebNavigationPolicy); protected: diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 58cb9da..a5458ff 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -352,7 +352,8 @@ RenderWidgetFullscreenPepper* RenderWidgetFullscreenPepper::Create( scoped_refptr<RenderWidgetFullscreenPepper> widget( new RenderWidgetFullscreenPepper(plugin, active_url, screen_info)); widget->Init(opener_id); - return widget.release(); + widget->AddRef(); + return widget.get(); } RenderWidgetFullscreenPepper::RenderWidgetFullscreenPepper( |