OLD | NEW |
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 2712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2723 GetWebView()->sharedGraphicsContext3D(); | 2723 GetWebView()->sharedGraphicsContext3D(); |
2724 | 2724 |
2725 GpuChannelHost* gpu_channel_host = | 2725 GpuChannelHost* gpu_channel_host = |
2726 RenderThreadImpl::current()->EstablishGpuChannelSync( | 2726 RenderThreadImpl::current()->EstablishGpuChannelSync( |
2727 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); | 2727 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); |
2728 if (!gpu_channel_host) { | 2728 if (!gpu_channel_host) { |
2729 LOG(ERROR) << "Failed to establish GPU channel for media player"; | 2729 LOG(ERROR) << "Failed to establish GPU channel for media player"; |
2730 return NULL; | 2730 return NULL; |
2731 } | 2731 } |
2732 | 2732 |
2733 if (cmd_line->HasSwitch(switches::kMediaPlayerInRenderProcess)) { | 2733 if (cmd_line->HasSwitch(switches::kInProcessWebGL)) { |
2734 if (!media_bridge_manager_.get()) { | 2734 if (!media_bridge_manager_.get()) { |
2735 media_bridge_manager_.reset( | 2735 media_bridge_manager_.reset( |
2736 new webkit_media::MediaPlayerBridgeManagerImpl(1)); | 2736 new webkit_media::MediaPlayerBridgeManagerImpl(1)); |
2737 } | 2737 } |
2738 return new webkit_media::WebMediaPlayerInProcessAndroid( | 2738 return new webkit_media::WebMediaPlayerInProcessAndroid( |
2739 frame, | 2739 frame, |
2740 client, | 2740 client, |
2741 cookieJar(frame), | 2741 cookieJar(frame), |
2742 media_player_manager_.get(), | 2742 media_player_manager_.get(), |
2743 media_bridge_manager_.get(), | 2743 media_bridge_manager_.get(), |
(...skipping 4001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6745 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6745 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6746 RenderProcess::current()->ReleaseTransportDIB(dib); | 6746 RenderProcess::current()->ReleaseTransportDIB(dib); |
6747 } | 6747 } |
6748 | 6748 |
6749 void RenderViewImpl::DidCommitCompositorFrame() { | 6749 void RenderViewImpl::DidCommitCompositorFrame() { |
6750 RenderWidget::DidCommitCompositorFrame(); | 6750 RenderWidget::DidCommitCompositorFrame(); |
6751 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); | 6751 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); |
6752 } | 6752 } |
6753 | 6753 |
6754 } // namespace content | 6754 } // namespace content |
OLD | NEW |