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

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

Issue 10703095: New PeerConnection handler in Chrome to support latest PeerConnection draft (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Readd the UMA histogram for Deprecated PeerConnection to not screw up the stats. Created 8 years, 3 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
« no previous file with comments | « content/renderer/renderer_webkitplatformsupport_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer_webkitplatformsupport_impl.h" 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 25 matching lines...) Expand all
36 #include "googleurl/src/gurl.h" 36 #include "googleurl/src/gurl.h"
37 #include "ipc/ipc_sync_message_filter.h" 37 #include "ipc/ipc_sync_message_filter.h"
38 #include "media/audio/audio_output_device.h" 38 #include "media/audio/audio_output_device.h"
39 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegis try.h" 39 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegis try.h"
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h" 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads. h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads. h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amCenter.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amCenter.h"
45 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amCenterClient.h" 45 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amCenterClient.h"
46 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandler.h"
47 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandlerClient.h"
48 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 46 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
49 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" 47 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
50 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" 48 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
51 #include "webkit/glue/simple_webmimeregistry_impl.h" 49 #include "webkit/glue/simple_webmimeregistry_impl.h"
52 #include "webkit/glue/webclipboard_impl.h" 50 #include "webkit/glue/webclipboard_impl.h"
53 #include "webkit/glue/webfileutilities_impl.h" 51 #include "webkit/glue/webfileutilities_impl.h"
54 #include "webkit/glue/webkit_glue.h" 52 #include "webkit/glue/webkit_glue.h"
55 53
56 #if defined(OS_WIN) 54 #if defined(OS_WIN)
57 #include "content/common/child_process_messages.h" 55 #include "content/common/child_process_messages.h"
(...skipping 26 matching lines...) Expand all
84 using WebKit::WebFileInfo; 82 using WebKit::WebFileInfo;
85 using WebKit::WebFileSystem; 83 using WebKit::WebFileSystem;
86 using WebKit::WebFrame; 84 using WebKit::WebFrame;
87 using WebKit::WebGamepads; 85 using WebKit::WebGamepads;
88 using WebKit::WebIDBFactory; 86 using WebKit::WebIDBFactory;
89 using WebKit::WebKitPlatformSupport; 87 using WebKit::WebKitPlatformSupport;
90 using WebKit::WebMediaStreamCenter; 88 using WebKit::WebMediaStreamCenter;
91 using WebKit::WebMediaStreamCenterClient; 89 using WebKit::WebMediaStreamCenterClient;
92 using WebKit::WebPeerConnection00Handler; 90 using WebKit::WebPeerConnection00Handler;
93 using WebKit::WebPeerConnection00HandlerClient; 91 using WebKit::WebPeerConnection00HandlerClient;
94 using WebKit::WebPeerConnectionHandler; 92 using WebKit::WebRTCPeerConnectionHandler;
95 using WebKit::WebPeerConnectionHandlerClient; 93 using WebKit::WebRTCPeerConnectionHandlerClient;
96 using WebKit::WebStorageNamespace; 94 using WebKit::WebStorageNamespace;
97 using WebKit::WebString; 95 using WebKit::WebString;
98 using WebKit::WebURL; 96 using WebKit::WebURL;
99 using WebKit::WebVector; 97 using WebKit::WebVector;
100 98
101 static bool g_sandbox_enabled = true; 99 static bool g_sandbox_enabled = true;
102 100
103 //------------------------------------------------------------------------------ 101 //------------------------------------------------------------------------------
104 102
105 class RendererWebKitPlatformSupportImpl::MimeRegistry 103 class RendererWebKitPlatformSupportImpl::MimeRegistry
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 return NULL; 681 return NULL;
684 #if defined(ENABLE_WEBRTC) 682 #if defined(ENABLE_WEBRTC)
685 MediaStreamDependencyFactory* rtc_dependency_factory = 683 MediaStreamDependencyFactory* rtc_dependency_factory =
686 render_thread->GetMediaStreamDependencyFactory(); 684 render_thread->GetMediaStreamDependencyFactory();
687 return rtc_dependency_factory->CreatePeerConnectionHandlerJsep(client); 685 return rtc_dependency_factory->CreatePeerConnectionHandlerJsep(client);
688 #else 686 #else
689 return NULL; 687 return NULL;
690 #endif // defined(ENABLE_WEBRTC) 688 #endif // defined(ENABLE_WEBRTC)
691 } 689 }
692 690
691 WebRTCPeerConnectionHandler*
692 RendererWebKitPlatformSupportImpl::createRTCPeerConnectionHandler(
693 WebRTCPeerConnectionHandlerClient* client) {
694 RenderThreadImpl* render_thread = RenderThreadImpl::current();
695 DCHECK(render_thread);
696 if (!render_thread)
697 return NULL;
698 #if defined(ENABLE_WEBRTC)
699 MediaStreamDependencyFactory* rtc_dependency_factory =
700 render_thread->GetMediaStreamDependencyFactory();
701 return rtc_dependency_factory->CreateRTCPeerConnectionHandler(client);
702 #else
703 return NULL;
704 #endif // defined(ENABLE_WEBRTC)
705 }
706
693 //------------------------------------------------------------------------------ 707 //------------------------------------------------------------------------------
694 708
695 WebMediaStreamCenter* 709 WebMediaStreamCenter*
696 RendererWebKitPlatformSupportImpl::createMediaStreamCenter( 710 RendererWebKitPlatformSupportImpl::createMediaStreamCenter(
697 WebMediaStreamCenterClient* client) { 711 WebMediaStreamCenterClient* client) {
698 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 712 RenderThreadImpl* render_thread = RenderThreadImpl::current();
699 DCHECK(render_thread); 713 DCHECK(render_thread);
700 if (!render_thread) 714 if (!render_thread)
701 return NULL; 715 return NULL;
702 return render_thread->CreateMediaStreamCenter(client); 716 return render_thread->CreateMediaStreamCenter(client);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 const char16* characters, 753 const char16* characters,
740 size_t length, 754 size_t length,
741 size_t before_index, 755 size_t before_index,
742 const WebKit::WebString& locale) { 756 const WebKit::WebString& locale) {
743 // Crash if WebKit calls this function when canHyphenate returns false. 757 // Crash if WebKit calls this function when canHyphenate returns false.
744 DCHECK(locale.isEmpty() || locale.equals("en-US")); 758 DCHECK(locale.isEmpty() || locale.equals("en-US"));
745 DCHECK(hyphenator_.get()); 759 DCHECK(hyphenator_.get());
746 return hyphenator_->ComputeLastHyphenLocation(string16(characters, length), 760 return hyphenator_->ComputeLastHyphenLocation(string16(characters, length),
747 before_index); 761 before_index);
748 } 762 }
OLDNEW
« no previous file with comments | « content/renderer/renderer_webkitplatformsupport_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698