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

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

Issue 1327793003: Move WebCache memory dump provider to blink for sub-allocation edges. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Moving branch. Created 5 years, 2 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "platform/Logging.h" 47 #include "platform/Logging.h"
48 #include "platform/RuntimeEnabledFeatures.h" 48 #include "platform/RuntimeEnabledFeatures.h"
49 #include "platform/graphics/ImageDecodingStore.h" 49 #include "platform/graphics/ImageDecodingStore.h"
50 #include "platform/heap/Heap.h" 50 #include "platform/heap/Heap.h"
51 #include "platform/heap/glue/MessageLoopInterruptor.h" 51 #include "platform/heap/glue/MessageLoopInterruptor.h"
52 #include "platform/heap/glue/PendingGCRunner.h" 52 #include "platform/heap/glue/PendingGCRunner.h"
53 #include "public/platform/Platform.h" 53 #include "public/platform/Platform.h"
54 #include "public/platform/WebPrerenderingSupport.h" 54 #include "public/platform/WebPrerenderingSupport.h"
55 #include "public/platform/WebThread.h" 55 #include "public/platform/WebThread.h"
56 #include "web/IndexedDBClientImpl.h" 56 #include "web/IndexedDBClientImpl.h"
57 #include "web/WebCacheMemoryDumpProvider.h"
57 #include "wtf/Assertions.h" 58 #include "wtf/Assertions.h"
58 #include "wtf/CryptographicallyRandomNumber.h" 59 #include "wtf/CryptographicallyRandomNumber.h"
59 #include "wtf/MainThread.h" 60 #include "wtf/MainThread.h"
60 #include "wtf/Partitions.h" 61 #include "wtf/Partitions.h"
61 #include "wtf/WTF.h" 62 #include "wtf/WTF.h"
62 #include "wtf/text/AtomicString.h" 63 #include "wtf/text/AtomicString.h"
63 #include "wtf/text/TextEncoding.h" 64 #include "wtf/text/TextEncoding.h"
64 #include <v8.h> 65 #include <v8.h>
65 66
66 namespace blink { 67 namespace blink {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 180
180 ThreadState::attachMainThread(); 181 ThreadState::attachMainThread();
181 // currentThread() is null if we are running on a thread without a message l oop. 182 // currentThread() is null if we are running on a thread without a message l oop.
182 if (WebThread* currentThread = platform->currentThread()) { 183 if (WebThread* currentThread = platform->currentThread()) {
183 ASSERT(!s_pendingGCRunner); 184 ASSERT(!s_pendingGCRunner);
184 s_pendingGCRunner = new PendingGCRunner; 185 s_pendingGCRunner = new PendingGCRunner;
185 currentThread->addTaskObserver(s_pendingGCRunner); 186 currentThread->addTaskObserver(s_pendingGCRunner);
186 187
187 OwnPtr<MessageLoopInterruptor> interruptor = adoptPtr(new MessageLoopInt erruptor(currentThread->taskRunner())); 188 OwnPtr<MessageLoopInterruptor> interruptor = adoptPtr(new MessageLoopInt erruptor(currentThread->taskRunner()));
188 ThreadState::current()->addInterruptor(interruptor.release()); 189 ThreadState::current()->addInterruptor(interruptor.release());
190
191 WebCacheMemoryDumpProvider::initialize();
189 } 192 }
190 193
191 DEFINE_STATIC_LOCAL(ModulesInitializer, initializer, ()); 194 DEFINE_STATIC_LOCAL(ModulesInitializer, initializer, ());
192 initializer.init(); 195 initializer.init();
193 196
194 setIndexedDBClientCreateFunction(IndexedDBClientImpl::create); 197 setIndexedDBClientCreateFunction(IndexedDBClientImpl::create);
195 } 198 }
196 199
197 void shutdown() 200 void shutdown()
198 { 201 {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 ASSERT(!reloadPages); 282 ASSERT(!reloadPages);
280 Page::refreshPlugins(); 283 Page::refreshPlugins();
281 } 284 }
282 285
283 void decommitFreeableMemory() 286 void decommitFreeableMemory()
284 { 287 {
285 WTF::Partitions::decommitFreeableMemory(); 288 WTF::Partitions::decommitFreeableMemory();
286 } 289 }
287 290
288 } // namespace blink 291 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebCacheMemoryDumpProvider.cpp ('k') | third_party/WebKit/Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698