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

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

Issue 2579233002: Merge MemoryCoordinator and MemoryCoordinatorImpl into one class (Closed)
Patch Set: addressed comments Created 4 years 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "content/browser/histogram_message_filter.h" 78 #include "content/browser/histogram_message_filter.h"
79 #include "content/browser/indexed_db/indexed_db_context_impl.h" 79 #include "content/browser/indexed_db/indexed_db_context_impl.h"
80 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h" 80 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h"
81 #include "content/browser/loader/resource_message_filter.h" 81 #include "content/browser/loader/resource_message_filter.h"
82 #include "content/browser/loader/resource_scheduler_filter.h" 82 #include "content/browser/loader/resource_scheduler_filter.h"
83 #include "content/browser/loader/url_loader_factory_impl.h" 83 #include "content/browser/loader/url_loader_factory_impl.h"
84 #include "content/browser/media/capture/audio_mirroring_manager.h" 84 #include "content/browser/media/capture/audio_mirroring_manager.h"
85 #include "content/browser/media/capture/image_capture_impl.h" 85 #include "content/browser/media/capture/image_capture_impl.h"
86 #include "content/browser/media/media_internals.h" 86 #include "content/browser/media/media_internals.h"
87 #include "content/browser/media/midi_host.h" 87 #include "content/browser/media/midi_host.h"
88 #include "content/browser/memory/memory_coordinator.h" 88 #include "content/browser/memory/memory_coordinator_impl.h"
89 #include "content/browser/memory/memory_message_filter.h" 89 #include "content/browser/memory/memory_message_filter.h"
90 #include "content/browser/message_port_message_filter.h" 90 #include "content/browser/message_port_message_filter.h"
91 #include "content/browser/mime_registry_impl.h" 91 #include "content/browser/mime_registry_impl.h"
92 #include "content/browser/notifications/notification_message_filter.h" 92 #include "content/browser/notifications/notification_message_filter.h"
93 #include "content/browser/notifications/platform_notification_context_impl.h" 93 #include "content/browser/notifications/platform_notification_context_impl.h"
94 #include "content/browser/payments/payment_app_manager.h" 94 #include "content/browser/payments/payment_app_manager.h"
95 #include "content/browser/permissions/permission_service_context.h" 95 #include "content/browser/permissions/permission_service_context.h"
96 #include "content/browser/permissions/permission_service_impl.h" 96 #include "content/browser/permissions/permission_service_impl.h"
97 #include "content/browser/profiler_message_filter.h" 97 #include "content/browser/profiler_message_filter.h"
98 #include "content/browser/push_messaging/push_messaging_message_filter.h" 98 #include "content/browser/push_messaging/push_messaging_message_filter.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 442
443 private: 443 private:
444 std::unique_ptr<std::map<int, SessionStorageNamespaceMap>> 444 std::unique_ptr<std::map<int, SessionStorageNamespaceMap>>
445 session_storage_namespaces_awaiting_close_; 445 session_storage_namespaces_awaiting_close_;
446 DISALLOW_COPY_AND_ASSIGN(SessionStorageHolder); 446 DISALLOW_COPY_AND_ASSIGN(SessionStorageHolder);
447 }; 447 };
448 448
449 void CreateMemoryCoordinatorHandle( 449 void CreateMemoryCoordinatorHandle(
450 int render_process_id, 450 int render_process_id,
451 mojom::MemoryCoordinatorHandleRequest request) { 451 mojom::MemoryCoordinatorHandleRequest request) {
452 MemoryCoordinator::GetInstance()->CreateHandle(render_process_id, 452 MemoryCoordinatorImpl::GetInstance()->CreateHandle(render_process_id,
453 std::move(request)); 453 std::move(request));
454 } 454 }
455 455
456 } // namespace 456 } // namespace
457 457
458 RendererMainThreadFactoryFunction g_renderer_main_thread_factory = NULL; 458 RendererMainThreadFactoryFunction g_renderer_main_thread_factory = NULL;
459 459
460 base::MessageLoop* g_in_process_thread; 460 base::MessageLoop* g_in_process_thread;
461 461
462 // Stores the maximum number of renderer processes the content module can 462 // Stores the maximum number of renderer processes the content module can
463 // create. 463 // create.
(...skipping 2560 matching lines...) Expand 10 before | Expand all | Expand 10 after
3024 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; 3024 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error;
3025 3025
3026 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. 3026 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing.
3027 // Capture the error message in a crash key value. 3027 // Capture the error message in a crash key value.
3028 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); 3028 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error);
3029 bad_message::ReceivedBadMessage(render_process_id, 3029 bad_message::ReceivedBadMessage(render_process_id,
3030 bad_message::RPH_MOJO_PROCESS_ERROR); 3030 bad_message::RPH_MOJO_PROCESS_ERROR);
3031 } 3031 }
3032 3032
3033 } // namespace content 3033 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/memory/memory_monitor_android.cc ('k') | content/browser/service_worker/service_worker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698