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

Unified Diff: third_party/WebKit/Source/web/WebKit.cpp

Issue 1778773003: Change the order of Platform::initialize and WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebKit.cpp
diff --git a/third_party/WebKit/Source/web/WebKit.cpp b/third_party/WebKit/Source/web/WebKit.cpp
index 3fa474fa4fd4cc62daa165da2db647021f935768..db4d075a7e8d77833150465e511e7bb8bd4b4608 100644
--- a/third_party/WebKit/Source/web/WebKit.cpp
+++ b/third_party/WebKit/Source/web/WebKit.cpp
@@ -157,10 +157,10 @@ void initializeWithoutV8(Platform* platform)
WTF::Partitions::initialize(maxObservedSizeFunction);
ASSERT(platform);
sof 2016/03/09 19:07:52 nit: keep this assert alongside the platform init
- Platform::initialize(platform);
-
WTF::initialize(adjustAmountOfExternalAllocatedMemory);
WTF::initializeMainThread(callOnMainThreadFunction);
+
+ Platform::initialize(platform);
Heap::init();
ThreadState::attachMainThread();
@@ -229,8 +229,9 @@ void shutdownWithoutV8()
ASSERT(!s_endOfTaskRunner);
Heap::shutdown();
- WTF::shutdown();
Platform::shutdown();
+
+ WTF::shutdown();
WebPrerenderingSupport::shutdown();
WTF::Partitions::shutdown();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698