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

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

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed tedchoc@'s feedback Created 5 years, 8 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 #include "content/renderer/render_process.h" 95 #include "content/renderer/render_process.h"
96 #include "content/renderer/render_thread_impl.h" 96 #include "content/renderer/render_thread_impl.h"
97 #include "content/renderer/render_view_impl.h" 97 #include "content/renderer/render_view_impl.h"
98 #include "content/renderer/render_widget_fullscreen_pepper.h" 98 #include "content/renderer/render_widget_fullscreen_pepper.h"
99 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 99 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
100 #include "content/renderer/renderer_webcolorchooser_impl.h" 100 #include "content/renderer/renderer_webcolorchooser_impl.h"
101 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 101 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
102 #include "content/renderer/shared_worker_repository.h" 102 #include "content/renderer/shared_worker_repository.h"
103 #include "content/renderer/skia_benchmarking_extension.h" 103 #include "content/renderer/skia_benchmarking_extension.h"
104 #include "content/renderer/stats_collection_controller.h" 104 #include "content/renderer/stats_collection_controller.h"
105 #include "content/renderer/vr_dispatcher.h"
105 #include "content/renderer/web_ui_extension.h" 106 #include "content/renderer/web_ui_extension.h"
106 #include "content/renderer/websharedworker_proxy.h" 107 #include "content/renderer/websharedworker_proxy.h"
107 #include "gin/modules/module_registry.h" 108 #include "gin/modules/module_registry.h"
108 #include "media/base/audio_renderer_mixer_input.h" 109 #include "media/base/audio_renderer_mixer_input.h"
109 #include "media/base/media_log.h" 110 #include "media/base/media_log.h"
110 #include "media/blink/webencryptedmediaclient_impl.h" 111 #include "media/blink/webencryptedmediaclient_impl.h"
111 #include "media/blink/webmediaplayer_impl.h" 112 #include "media/blink/webmediaplayer_impl.h"
112 #include "media/blink/webmediaplayer_params.h" 113 #include "media/blink/webmediaplayer_params.h"
113 #include "media/renderers/gpu_video_accelerator_factories.h" 114 #include "media/renderers/gpu_video_accelerator_factories.h"
114 #include "net/base/data_url.h" 115 #include "net/base/data_url.h"
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 contains_media_player_(false), 683 contains_media_player_(false),
683 #endif 684 #endif
684 devtools_agent_(nullptr), 685 devtools_agent_(nullptr),
685 geolocation_dispatcher_(NULL), 686 geolocation_dispatcher_(NULL),
686 push_messaging_dispatcher_(NULL), 687 push_messaging_dispatcher_(NULL),
687 presentation_dispatcher_(NULL), 688 presentation_dispatcher_(NULL),
688 screen_orientation_dispatcher_(NULL), 689 screen_orientation_dispatcher_(NULL),
689 manifest_manager_(NULL), 690 manifest_manager_(NULL),
690 accessibility_mode_(AccessibilityModeOff), 691 accessibility_mode_(AccessibilityModeOff),
691 renderer_accessibility_(NULL), 692 renderer_accessibility_(NULL),
693 vr_dispatcher_(NULL),
692 weak_factory_(this) { 694 weak_factory_(this) {
693 std::pair<RoutingIDFrameMap::iterator, bool> result = 695 std::pair<RoutingIDFrameMap::iterator, bool> result =
694 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); 696 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
695 CHECK(result.second) << "Inserting a duplicate item."; 697 CHECK(result.second) << "Inserting a duplicate item.";
696 698
697 RenderThread::Get()->AddRoute(routing_id_, this); 699 RenderThread::Get()->AddRoute(routing_id_, this);
698 700
699 render_view_->RegisterRenderFrame(this); 701 render_view_->RegisterRenderFrame(this);
700 702
701 // Everything below subclasses RenderFrameObserver and is automatically 703 // Everything below subclasses RenderFrameObserver and is automatically
(...skipping 3108 matching lines...) Expand 10 before | Expand all | Expand 10 after
3810 return true; 3812 return true;
3811 } 3813 }
3812 3814
3813 blink::WebPermissionClient* RenderFrameImpl::permissionClient() { 3815 blink::WebPermissionClient* RenderFrameImpl::permissionClient() {
3814 if (!permission_client_) 3816 if (!permission_client_)
3815 permission_client_.reset(new PermissionDispatcher(GetServiceRegistry())); 3817 permission_client_.reset(new PermissionDispatcher(GetServiceRegistry()));
3816 3818
3817 return permission_client_.get(); 3819 return permission_client_.get();
3818 } 3820 }
3819 3821
3822 blink::WebVRClient* RenderFrameImpl::webVRClient() {
3823 // vr_dispatcher_ is a RenderFrameObserver and will be deleted when the frame
3824 // is destroyed, as described in render_frame_observer.h
3825 if (!vr_dispatcher_)
3826 vr_dispatcher_ = new VRDispatcher(this);
3827
3828 return vr_dispatcher_;
3829 }
3830
3820 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { 3831 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) {
3821 Send(new FrameHostMsg_MediaPlayingNotification( 3832 Send(new FrameHostMsg_MediaPlayingNotification(
3822 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), 3833 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(),
3823 player->hasAudio(), player->isRemote())); 3834 player->hasAudio(), player->isRemote()));
3824 } 3835 }
3825 3836
3826 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) { 3837 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) {
3827 Send(new FrameHostMsg_MediaPausedNotification( 3838 Send(new FrameHostMsg_MediaPausedNotification(
3828 routing_id_, reinterpret_cast<int64>(player))); 3839 routing_id_, reinterpret_cast<int64>(player)));
3829 } 3840 }
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
4881 #elif defined(ENABLE_BROWSER_CDMS) 4892 #elif defined(ENABLE_BROWSER_CDMS)
4882 cdm_manager_, 4893 cdm_manager_,
4883 #endif 4894 #endif
4884 this); 4895 this);
4885 } 4896 }
4886 4897
4887 return cdm_factory_; 4898 return cdm_factory_;
4888 } 4899 }
4889 4900
4890 } // namespace content 4901 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698