Index: third_party/WebKit/Source/platform/exported/Platform.cpp |
diff --git a/third_party/WebKit/Source/platform/exported/Platform.cpp b/third_party/WebKit/Source/platform/exported/Platform.cpp |
index 1eaf68863deafd16478d43dcc9f8d1a19e966a15..f92b4f709b65963292037a5421ee5f71aaacf7d5 100644 |
--- a/third_party/WebKit/Source/platform/exported/Platform.cpp |
+++ b/third_party/WebKit/Source/platform/exported/Platform.cpp |
@@ -33,12 +33,14 @@ |
#include "platform/Histogram.h" |
#include "platform/MemoryCacheDumpProvider.h" |
#include "platform/PartitionAllocMemoryDumpProvider.h" |
+#include "platform/PlatformMojoServices.h" |
#include "platform/fonts/FontCacheMemoryDumpProvider.h" |
#include "platform/heap/BlinkGCMemoryDumpProvider.h" |
#include "platform/heap/GCTaskRunner.h" |
#include "public/platform/Platform.h" |
#include "public/platform/ServiceRegistry.h" |
#include "public/platform/WebPrerenderingSupport.h" |
+#include "public/platform/WebPrescientNetworking.h" |
#include "wtf/HashMap.h" |
#include "wtf/OwnPtr.h" |
@@ -53,6 +55,8 @@ Platform::Platform() |
{ |
} |
+Platform::~Platform() = default; |
+ |
static void maxObservedSizeFunction(size_t sizeInMB) |
{ |
const size_t supportedMaxSizeInMB = 4 * 1024; |
@@ -94,11 +98,13 @@ void Platform::initialize(Platform* platform) |
base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(FontCacheMemoryDumpProvider::instance(), "FontCaches", base::ThreadTaskRunnerHandle::Get()); |
base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(MemoryCacheDumpProvider::instance(), "MemoryCache", base::ThreadTaskRunnerHandle::Get()); |
} |
+ s_platform->m_mojoServices.reset(new PlatformMojoServices); |
} |
void Platform::shutdown() |
{ |
ASSERT(isMainThread()); |
+ s_platform->m_mojoServices.reset(); |
if (s_platform->m_mainThread) { |
base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(FontCacheMemoryDumpProvider::instance()); |
base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(PartitionAllocMemoryDumpProvider::instance()); |
@@ -145,4 +151,9 @@ ServiceRegistry* Platform::serviceRegistry() |
return ServiceRegistry::getEmptyServiceRegistry(); |
} |
+PlatformMojoServices* Platform::mojoServices() |
+{ |
+ return m_mojoServices.get(); |
+} |
+ |
} // namespace blink |