| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "base/threading/thread_task_runner_handle.h" | 31 #include "base/threading/thread_task_runner_handle.h" |
| 32 #include "base/trace_event/memory_dump_manager.h" | 32 #include "base/trace_event/memory_dump_manager.h" |
| 33 #include "platform/Histogram.h" | 33 #include "platform/Histogram.h" |
| 34 #include "platform/MemoryCoordinator.h" |
| 34 #include "platform/PartitionAllocMemoryDumpProvider.h" | 35 #include "platform/PartitionAllocMemoryDumpProvider.h" |
| 35 #include "platform/fonts/FontCacheMemoryDumpProvider.h" | 36 #include "platform/fonts/FontCacheMemoryDumpProvider.h" |
| 36 #include "platform/heap/BlinkGCMemoryDumpProvider.h" | 37 #include "platform/heap/BlinkGCMemoryDumpProvider.h" |
| 37 #include "platform/heap/GCTaskRunner.h" | 38 #include "platform/heap/GCTaskRunner.h" |
| 38 #include "platform/tracing/MemoryCacheDumpProvider.h" | 39 #include "platform/tracing/MemoryCacheDumpProvider.h" |
| 39 #include "public/platform/InterfaceProvider.h" | 40 #include "public/platform/InterfaceProvider.h" |
| 40 #include "public/platform/Platform.h" | 41 #include "public/platform/Platform.h" |
| 41 #include "public/platform/WebPrerenderingSupport.h" | 42 #include "public/platform/WebPrerenderingSupport.h" |
| 42 #include "wtf/HashMap.h" | 43 #include "wtf/HashMap.h" |
| 43 | 44 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 71 void Platform::initialize(Platform* platform) { | 72 void Platform::initialize(Platform* platform) { |
| 72 ASSERT(!s_platform); | 73 ASSERT(!s_platform); |
| 73 ASSERT(platform); | 74 ASSERT(platform); |
| 74 s_platform = platform; | 75 s_platform = platform; |
| 75 s_platform->m_mainThread = platform->currentThread(); | 76 s_platform->m_mainThread = platform->currentThread(); |
| 76 | 77 |
| 77 WTF::Partitions::initialize(maxObservedSizeFunction); | 78 WTF::Partitions::initialize(maxObservedSizeFunction); |
| 78 WTF::initialize(callOnMainThreadFunction); | 79 WTF::initialize(callOnMainThreadFunction); |
| 79 | 80 |
| 80 ProcessHeap::init(); | 81 ProcessHeap::init(); |
| 82 MemoryCoordinator::initialize(); |
| 81 if (base::ThreadTaskRunnerHandle::IsSet()) | 83 if (base::ThreadTaskRunnerHandle::IsSet()) |
| 82 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 84 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| 83 BlinkGCMemoryDumpProvider::instance(), "BlinkGC", | 85 BlinkGCMemoryDumpProvider::instance(), "BlinkGC", |
| 84 base::ThreadTaskRunnerHandle::Get()); | 86 base::ThreadTaskRunnerHandle::Get()); |
| 85 | 87 |
| 86 ThreadState::attachMainThread(); | 88 ThreadState::attachMainThread(); |
| 87 | 89 |
| 88 // TODO(ssid): remove this check after fixing crbug.com/486782. | 90 // TODO(ssid): remove this check after fixing crbug.com/486782. |
| 89 if (s_platform->m_mainThread) { | 91 if (s_platform->m_mainThread) { |
| 90 ASSERT(!s_gcTaskRunner); | 92 ASSERT(!s_gcTaskRunner); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 | 145 |
| 144 WebThread* Platform::mainThread() const { | 146 WebThread* Platform::mainThread() const { |
| 145 return m_mainThread; | 147 return m_mainThread; |
| 146 } | 148 } |
| 147 | 149 |
| 148 InterfaceProvider* Platform::interfaceProvider() { | 150 InterfaceProvider* Platform::interfaceProvider() { |
| 149 return InterfaceProvider::getEmptyInterfaceProvider(); | 151 return InterfaceProvider::getEmptyInterfaceProvider(); |
| 150 } | 152 } |
| 151 | 153 |
| 152 } // namespace blink | 154 } // namespace blink |
| OLD | NEW |