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

Side by Side Diff: third_party/WebKit/Source/web/WebKit.cpp

Issue 1477023003: Refactor the Heap into ThreadHeap to prepare for per thread heaps Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactored Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 s_webKitInitialized = true; 164 s_webKitInitialized = true;
165 165
166 WTF::Partitions::initialize(histogramEnumerationFunction); 166 WTF::Partitions::initialize(histogramEnumerationFunction);
167 ASSERT(platform); 167 ASSERT(platform);
168 Platform::initialize(platform); 168 Platform::initialize(platform);
169 169
170 WTF::initialize(currentTimeFunction, monotonicallyIncreasingTimeFunction, ad justAmountOfExternalAllocatedMemory); 170 WTF::initialize(currentTimeFunction, monotonicallyIncreasingTimeFunction, ad justAmountOfExternalAllocatedMemory);
171 WTF::initializeMainThread(callOnMainThreadFunction); 171 WTF::initializeMainThread(callOnMainThreadFunction);
172 Heap::init(); 172 Heap::init();
173 173
174 ThreadState::attachMainThread(); 174 ThreadState::prepareForMainThread();
haraken 2016/01/28 15:52:50 Nit: I'd prefer keeping "attach"/"attachMainThread
keishi 2016/02/29 06:02:34 Done.
175 // currentThread() is null if we are running on a thread without a message l oop. 175 // currentThread() is null if we are running on a thread without a message l oop.
176 if (WebThread* currentThread = platform->currentThread()) { 176 if (WebThread* currentThread = platform->currentThread()) {
177 ASSERT(!s_gcTaskRunner); 177 ASSERT(!s_gcTaskRunner);
178 s_gcTaskRunner = new GCTaskRunner(currentThread); 178 s_gcTaskRunner = new GCTaskRunner(currentThread);
179 } 179 }
180 180
181 DEFINE_STATIC_LOCAL(ModulesInitializer, initializer, ()); 181 DEFINE_STATIC_LOCAL(ModulesInitializer, initializer, ());
182 initializer.init(); 182 initializer.init();
183 183
184 setIndexedDBClientCreateFunction(IndexedDBClientImpl::create); 184 setIndexedDBClientCreateFunction(IndexedDBClientImpl::create);
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 ASSERT(!reloadPages); 303 ASSERT(!reloadPages);
304 Page::refreshPlugins(); 304 Page::refreshPlugins();
305 } 305 }
306 306
307 void decommitFreeableMemory() 307 void decommitFreeableMemory()
308 { 308 {
309 WTF::Partitions::decommitFreeableMemory(); 309 WTF::Partitions::decommitFreeableMemory();
310 } 310 }
311 311
312 } // namespace blink 312 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698