| Index: third_party/WebKit/Source/wtf/WTF.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/WTF.cpp b/third_party/WebKit/Source/wtf/WTF.cpp
|
| index cd17830b5378eb849802aa370def4a8eb394f77b..8cedd91ffbb1a07c42f3c05dc20bae8f4ba19bde 100644
|
| --- a/third_party/WebKit/Source/wtf/WTF.cpp
|
| +++ b/third_party/WebKit/Source/wtf/WTF.cpp
|
| @@ -42,32 +42,29 @@ extern void initializeThreading();
|
| bool s_initialized;
|
| bool s_shutdown;
|
|
|
| -void initialize(TimeFunction currentTimeFunction, TimeFunction monotonicallyIncreasingTimeFunction, TimeFunction systemTraceTimeFunction, HistogramEnumerationFunction histogramEnumerationFunction, AdjustAmountOfExternalAllocatedMemoryFunction adjustAmountOfExternalAllocatedMemoryFunction)
|
| -{
|
| - // WTF, and Blink in general, cannot handle being re-initialized, even if shutdown first.
|
| - // Make that explicit here.
|
| - ASSERT(!s_initialized);
|
| - ASSERT(!s_shutdown);
|
| - s_initialized = true;
|
| - setCurrentTimeFunction(currentTimeFunction);
|
| - setMonotonicallyIncreasingTimeFunction(monotonicallyIncreasingTimeFunction);
|
| - setSystemTraceTimeFunction(systemTraceTimeFunction);
|
| - Partitions::initialize(histogramEnumerationFunction);
|
| - ArrayBufferContents::setAdjustAmoutOfExternalAllocatedMemoryFunction(adjustAmountOfExternalAllocatedMemoryFunction);
|
| - initializeThreading();
|
| +void initialize(TimeFunction currentTimeFunction, TimeFunction monotonicallyIncreasingTimeFunction, TimeFunction systemTraceTimeFunction, HistogramEnumerationFunction histogramEnumerationFunction, AdjustAmountOfExternalAllocatedMemoryFunction adjustAmountOfExternalAllocatedMemoryFunction) {
|
| + // WTF, and Blink in general, cannot handle being re-initialized, even if shutdown first.
|
| + // Make that explicit here.
|
| + ASSERT(!s_initialized);
|
| + ASSERT(!s_shutdown);
|
| + s_initialized = true;
|
| + setCurrentTimeFunction(currentTimeFunction);
|
| + setMonotonicallyIncreasingTimeFunction(monotonicallyIncreasingTimeFunction);
|
| + setSystemTraceTimeFunction(systemTraceTimeFunction);
|
| + Partitions::initialize(histogramEnumerationFunction);
|
| + ArrayBufferContents::setAdjustAmoutOfExternalAllocatedMemoryFunction(adjustAmountOfExternalAllocatedMemoryFunction);
|
| + initializeThreading();
|
| }
|
|
|
| -void shutdown()
|
| -{
|
| - ASSERT(s_initialized);
|
| - ASSERT(!s_shutdown);
|
| - s_shutdown = true;
|
| - Partitions::shutdown();
|
| +void shutdown() {
|
| + ASSERT(s_initialized);
|
| + ASSERT(!s_shutdown);
|
| + s_shutdown = true;
|
| + Partitions::shutdown();
|
| }
|
|
|
| -bool isShutdown()
|
| -{
|
| - return s_shutdown;
|
| +bool isShutdown() {
|
| + return s_shutdown;
|
| }
|
|
|
| -} // namespace WTF
|
| +} // namespace WTF
|
|
|