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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 65193003: Clear SingleProcess and InProcessGPU logic. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 IPC::Channel::MODE_SERVER, 464 IPC::Channel::MODE_SERVER,
465 this, 465 this,
466 BrowserThread::GetMessageLoopProxyForThread( 466 BrowserThread::GetMessageLoopProxyForThread(
467 BrowserThread::IO).get())); 467 BrowserThread::IO).get()));
468 468
469 // Call the embedder first so that their IPC filters have priority. 469 // Call the embedder first so that their IPC filters have priority.
470 GetContentClient()->browser()->RenderProcessHostCreated(this); 470 GetContentClient()->browser()->RenderProcessHostCreated(this);
471 471
472 CreateMessageFilters(); 472 CreateMessageFilters();
473 473
474 // Single-process mode not supported in multiple-dll mode currently. 474 if (run_renderer_in_process()) {
475 if (run_renderer_in_process() && g_renderer_main_thread_factory) { 475 CHECK(g_renderer_main_thread_factory);
piman 2013/11/07 22:09:52 Should be DCHECK
476 // Crank up a thread and run the initialization there. With the way that 476 // Crank up a thread and run the initialization there. With the way that
477 // messages flow between the browser and renderer, this thread is required 477 // messages flow between the browser and renderer, this thread is required
478 // to prevent a deadlock in single-process mode. Since the primordial 478 // to prevent a deadlock in single-process mode. Since the primordial
479 // thread in the renderer process runs the WebKit code and can sometimes 479 // thread in the renderer process runs the WebKit code and can sometimes
480 // make blocking calls to the UI thread (i.e. this thread), they need to run 480 // make blocking calls to the UI thread (i.e. this thread), they need to run
481 // on separate threads. 481 // on separate threads.
482 in_process_renderer_.reset(g_renderer_main_thread_factory(channel_id)); 482 in_process_renderer_.reset(g_renderer_main_thread_factory(channel_id));
483 483
484 base::Thread::Options options; 484 base::Thread::Options options;
485 #if defined(OS_WIN) && !defined(OS_MACOSX) 485 #if defined(OS_WIN) && !defined(OS_MACOSX)
(...skipping 1348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1834 // Skip widgets in other processes. 1834 // Skip widgets in other processes.
1835 if (widget->GetProcess()->GetID() != GetID()) 1835 if (widget->GetProcess()->GetID() != GetID())
1836 continue; 1836 continue;
1837 1837
1838 RenderViewHost* rvh = RenderViewHost::From(widget); 1838 RenderViewHost* rvh = RenderViewHost::From(widget);
1839 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); 1839 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences());
1840 } 1840 }
1841 } 1841 }
1842 1842
1843 } // namespace content 1843 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698