| 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 4031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4042 return FindFrameByID(webview()->mainFrame(), it->first); | 4042 return FindFrameByID(webview()->mainFrame(), it->first); |
| 4043 } | 4043 } |
| 4044 return NULL; | 4044 return NULL; |
| 4045 } | 4045 } |
| 4046 | 4046 |
| 4047 void RenderViewImpl::EnsureMediaStreamImpl() { | 4047 void RenderViewImpl::EnsureMediaStreamImpl() { |
| 4048 if (!RenderThreadImpl::current()) // Will be NULL during unit tests. | 4048 if (!RenderThreadImpl::current()) // Will be NULL during unit tests. |
| 4049 return; | 4049 return; |
| 4050 | 4050 |
| 4051 #if defined(OS_ANDROID) | 4051 #if defined(OS_ANDROID) |
| 4052 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebRTC)) | 4052 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebRTC)) |
| 4053 return; | 4053 return; |
| 4054 #endif | 4054 #endif |
| 4055 | 4055 |
| 4056 #if defined(ENABLE_WEBRTC) | 4056 #if defined(ENABLE_WEBRTC) |
| 4057 if (!media_stream_dispatcher_) | 4057 if (!media_stream_dispatcher_) |
| 4058 media_stream_dispatcher_ = new MediaStreamDispatcher(this); | 4058 media_stream_dispatcher_ = new MediaStreamDispatcher(this); |
| 4059 | 4059 |
| 4060 if (!media_stream_impl_) { | 4060 if (!media_stream_impl_) { |
| 4061 media_stream_impl_ = new MediaStreamImpl( | 4061 media_stream_impl_ = new MediaStreamImpl( |
| 4062 this, | 4062 this, |
| (...skipping 2468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6531 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6531 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
| 6532 RenderProcess::current()->ReleaseTransportDIB(dib); | 6532 RenderProcess::current()->ReleaseTransportDIB(dib); |
| 6533 } | 6533 } |
| 6534 | 6534 |
| 6535 void RenderViewImpl::DidCommitCompositorFrame() { | 6535 void RenderViewImpl::DidCommitCompositorFrame() { |
| 6536 RenderWidget::DidCommitCompositorFrame(); | 6536 RenderWidget::DidCommitCompositorFrame(); |
| 6537 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); | 6537 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); |
| 6538 } | 6538 } |
| 6539 | 6539 |
| 6540 } // namespace content | 6540 } // namespace content |
| OLD | NEW |