| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1940 | 1940 |
| 1941 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; | 1941 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; |
| 1942 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); | 1942 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); |
| 1943 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( | 1943 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( |
| 1944 new webkit_glue::VideoRendererImpl(pts_logging)); | 1944 new webkit_glue::VideoRendererImpl(pts_logging)); |
| 1945 collection->AddVideoRenderer(renderer); | 1945 collection->AddVideoRenderer(renderer); |
| 1946 video_renderer = renderer; | 1946 video_renderer = renderer; |
| 1947 | 1947 |
| 1948 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( | 1948 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( |
| 1949 new webkit_glue::WebMediaPlayerImpl(client, | 1949 new webkit_glue::WebMediaPlayerImpl(client, |
| 1950 this, | 1950 AsWeakPtr(), |
| 1951 collection.release(), | 1951 collection.release(), |
| 1952 message_loop_factory.release(), | 1952 message_loop_factory.release(), |
| 1953 media_stream_impl_.get(), | 1953 media_stream_impl_.get(), |
| 1954 new RenderMediaLog())); | 1954 new RenderMediaLog())); |
| 1955 if (!result->Initialize(frame, | 1955 if (!result->Initialize(frame, |
| 1956 cmd_line->HasSwitch(switches::kSimpleDataSource), | 1956 cmd_line->HasSwitch(switches::kSimpleDataSource), |
| 1957 video_renderer)) { | 1957 video_renderer)) { |
| 1958 return NULL; | 1958 return NULL; |
| 1959 } | 1959 } |
| 1960 return result.release(); | 1960 return result.release(); |
| (...skipping 2676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4637 | 4637 |
| 4638 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 4638 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 4639 return webview()->settings()->useThreadedCompositor(); | 4639 return webview()->settings()->useThreadedCompositor(); |
| 4640 } | 4640 } |
| 4641 | 4641 |
| 4642 void RenderViewImpl::OnJavaBridgeInit( | 4642 void RenderViewImpl::OnJavaBridgeInit( |
| 4643 const IPC::ChannelHandle& channel_handle) { | 4643 const IPC::ChannelHandle& channel_handle) { |
| 4644 DCHECK(!java_bridge_dispatcher_.get()); | 4644 DCHECK(!java_bridge_dispatcher_.get()); |
| 4645 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4645 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
| 4646 } | 4646 } |
| OLD | NEW |