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

Side by Side Diff: Source/wtf/WTF.cpp

Issue 1190883003: Set HistogramEnumerationFunction even when Partitions are initialized (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | Annotate | Revision Log
« Source/wtf/Partitions.cpp ('K') | « Source/wtf/Partitions.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 void initialize(TimeFunction currentTimeFunction, TimeFunction monotonicallyIncr easingTimeFunction, TimeFunction systemTraceTimeFunction, HistogramEnumerationFu nction histogramEnumerationFunction, AdjustAmountOfExternalAllocatedMemoryFuncti on adjustAmountOfExternalAllocatedMemoryFunction) 46 void initialize(TimeFunction currentTimeFunction, TimeFunction monotonicallyIncr easingTimeFunction, TimeFunction systemTraceTimeFunction, HistogramEnumerationFu nction histogramEnumerationFunction, AdjustAmountOfExternalAllocatedMemoryFuncti on adjustAmountOfExternalAllocatedMemoryFunction)
47 { 47 {
48 // WTF, and Blink in general, cannot handle being re-initialized, even if sh utdown first. 48 // WTF, and Blink in general, cannot handle being re-initialized, even if sh utdown first.
49 // Make that explicit here. 49 // Make that explicit here.
50 ASSERT(!s_initialized); 50 ASSERT(!s_initialized);
51 ASSERT(!s_shutdown); 51 ASSERT(!s_shutdown);
52 s_initialized = true; 52 s_initialized = true;
53 setCurrentTimeFunction(currentTimeFunction); 53 setCurrentTimeFunction(currentTimeFunction);
54 setMonotonicallyIncreasingTimeFunction(monotonicallyIncreasingTimeFunction); 54 setMonotonicallyIncreasingTimeFunction(monotonicallyIncreasingTimeFunction);
55 setSystemTraceTimeFunction(systemTraceTimeFunction); 55 setSystemTraceTimeFunction(systemTraceTimeFunction);
56 Partitions::initialize(histogramEnumerationFunction); 56 Partitions::initialize();
57 Partitions::setHistogramEnumeration(histogramEnumerationFunction);
57 ArrayBufferContents::setAdjustAmoutOfExternalAllocatedMemoryFunction(adjustA mountOfExternalAllocatedMemoryFunction); 58 ArrayBufferContents::setAdjustAmoutOfExternalAllocatedMemoryFunction(adjustA mountOfExternalAllocatedMemoryFunction);
58 initializeThreading(); 59 initializeThreading();
59 } 60 }
60 61
61 void shutdown() 62 void shutdown()
62 { 63 {
63 ASSERT(s_initialized); 64 ASSERT(s_initialized);
64 ASSERT(!s_shutdown); 65 ASSERT(!s_shutdown);
65 s_shutdown = true; 66 s_shutdown = true;
66 Partitions::shutdown(); 67 Partitions::shutdown();
67 } 68 }
68 69
69 bool isShutdown() 70 bool isShutdown()
70 { 71 {
71 return s_shutdown; 72 return s_shutdown;
72 } 73 }
73 74
74 } // namespace WTF 75 } // namespace WTF
OLDNEW
« Source/wtf/Partitions.cpp ('K') | « Source/wtf/Partitions.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698