| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 s_gcTaskRunner = nullptr; | 119 s_gcTaskRunner = nullptr; |
| 120 } | 120 } |
| 121 | 121 |
| 122 // Detach the main thread before starting the shutdown sequence | 122 // Detach the main thread before starting the shutdown sequence |
| 123 // so that the main thread won't get involved in a GC during the shutdown. | 123 // so that the main thread won't get involved in a GC during the shutdown. |
| 124 ThreadState::detachMainThread(); | 124 ThreadState::detachMainThread(); |
| 125 | 125 |
| 126 Heap::shutdown(); | 126 Heap::shutdown(); |
| 127 | 127 |
| 128 WTF::shutdown(); | 128 WTF::shutdown(); |
| 129 WebPrerenderingSupport::shutdown(); | |
| 130 WTF::Partitions::shutdown(); | 129 WTF::Partitions::shutdown(); |
| 131 | 130 |
| 132 s_platform->m_mainThread = nullptr; | 131 s_platform->m_mainThread = nullptr; |
| 133 s_platform = nullptr; | 132 s_platform = nullptr; |
| 134 } | 133 } |
| 135 | 134 |
| 136 void Platform::setCurrentPlatformForTesting(Platform* platform) | 135 void Platform::setCurrentPlatformForTesting(Platform* platform) |
| 137 { | 136 { |
| 138 ASSERT(platform); | 137 ASSERT(platform); |
| 139 s_platform = platform; | 138 s_platform = platform; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 ProviderToAdapterMap::iterator it = memoryDumpProviders().find(provider); | 172 ProviderToAdapterMap::iterator it = memoryDumpProviders().find(provider); |
| 174 if (it == memoryDumpProviders().end()) | 173 if (it == memoryDumpProviders().end()) |
| 175 return; | 174 return; |
| 176 WebMemoryDumpProviderAdapter* adapter = it->value.get(); | 175 WebMemoryDumpProviderAdapter* adapter = it->value.get(); |
| 177 base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
adapter); | 176 base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
adapter); |
| 178 adapter->set_is_registered(false); | 177 adapter->set_is_registered(false); |
| 179 memoryDumpProviders().remove(it); | 178 memoryDumpProviders().remove(it); |
| 180 } | 179 } |
| 181 | 180 |
| 182 } // namespace blink | 181 } // namespace blink |
| OLD | NEW |