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

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

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updates/cleanups before pulling in reviewers. Created 5 years, 9 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 (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_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 #include "content/renderer/p2p/socket_dispatcher.h" 99 #include "content/renderer/p2p/socket_dispatcher.h"
100 #include "content/renderer/render_frame_proxy.h" 100 #include "content/renderer/render_frame_proxy.h"
101 #include "content/renderer/render_process_impl.h" 101 #include "content/renderer/render_process_impl.h"
102 #include "content/renderer/render_view_impl.h" 102 #include "content/renderer/render_view_impl.h"
103 #include "content/renderer/renderer_blink_platform_impl.h" 103 #include "content/renderer/renderer_blink_platform_impl.h"
104 #include "content/renderer/scheduler/renderer_scheduler.h" 104 #include "content/renderer/scheduler/renderer_scheduler.h"
105 #include "content/renderer/scheduler/resource_dispatch_throttler.h" 105 #include "content/renderer/scheduler/resource_dispatch_throttler.h"
106 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h" 106 #include "content/renderer/service_worker/embedded_worker_context_message_filter .h"
107 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" 107 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
108 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" 108 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
109 #include "content/renderer/vr_dispatcher.h"
109 #include "gin/public/debug.h" 110 #include "gin/public/debug.h"
110 #include "gpu/GLES2/gl2extchromium.h" 111 #include "gpu/GLES2/gl2extchromium.h"
111 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 112 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
112 #include "ipc/ipc_channel_handle.h" 113 #include "ipc/ipc_channel_handle.h"
113 #include "ipc/ipc_platform_file.h" 114 #include "ipc/ipc_platform_file.h"
114 #include "ipc/mojo/ipc_channel_mojo.h" 115 #include "ipc/mojo/ipc_channel_mojo.h"
115 #include "media/base/audio_hardware_config.h" 116 #include "media/base/audio_hardware_config.h"
116 #include "media/base/media.h" 117 #include "media/base/media.h"
117 #include "media/renderers/gpu_video_accelerator_factories.h" 118 #include "media/renderers/gpu_video_accelerator_factories.h"
118 #include "mojo/common/common_type_converters.h" 119 #include "mojo/common/common_type_converters.h"
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); 537 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy());
537 AddFilter(audio_message_filter_.get()); 538 AddFilter(audio_message_filter_.get());
538 539
539 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy()); 540 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy());
540 AddFilter(midi_message_filter_.get()); 541 AddFilter(midi_message_filter_.get());
541 542
542 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); 543 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter());
543 544
544 AddFilter((new EmbeddedWorkerContextMessageFilter())->GetFilter()); 545 AddFilter((new EmbeddedWorkerContextMessageFilter())->GetFilter());
545 546
547 vr_dispatcher_.reset(new VRDispatcher());
548 AddObserver(vr_dispatcher_.get());
549
546 GetContentClient()->renderer()->RenderThreadStarted(); 550 GetContentClient()->renderer()->RenderThreadStarted();
547 551
548 InitSkiaEventTracer(); 552 InitSkiaEventTracer();
549 553
550 const base::CommandLine& command_line = 554 const base::CommandLine& command_line =
551 *base::CommandLine::ForCurrentProcess(); 555 *base::CommandLine::ForCurrentProcess();
552 556
553 is_impl_side_painting_enabled_ = 557 is_impl_side_painting_enabled_ =
554 !command_line.HasSwitch(switches::kDisableImplSidePainting); 558 !command_line.HasSwitch(switches::kDisableImplSidePainting);
555 cc_blink::WebLayerImpl::SetImplSidePaintingEnabled( 559 cc_blink::WebLayerImpl::SetImplSidePaintingEnabled(
(...skipping 1254 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 } 1814 }
1811 1815
1812 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 1816 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
1813 size_t erased = 1817 size_t erased =
1814 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 1818 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
1815 routing_id_); 1819 routing_id_);
1816 DCHECK_EQ(1u, erased); 1820 DCHECK_EQ(1u, erased);
1817 } 1821 }
1818 1822
1819 } // namespace content 1823 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698