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

Side by Side Diff: third_party/WebKit/Source/core/CoreInitializer.cpp

Issue 2341333003: Use chromium trace_event implementation in blink (Closed)
Patch Set: Created 4 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
« no previous file with comments | « base/trace_event/trace_event.h ('k') | third_party/WebKit/Source/core/dom/DocumentTiming.cpp » ('j') | 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 #include "core/XMLNames.h" 46 #include "core/XMLNames.h"
47 #include "core/css/MediaQueryEvaluator.h" 47 #include "core/css/MediaQueryEvaluator.h"
48 #include "core/css/parser/CSSParserTokenRange.h" 48 #include "core/css/parser/CSSParserTokenRange.h"
49 #include "core/dom/Document.h" 49 #include "core/dom/Document.h"
50 #include "core/dom/StyleChangeReason.h" 50 #include "core/dom/StyleChangeReason.h"
51 #include "core/events/EventFactory.h" 51 #include "core/events/EventFactory.h"
52 #include "core/fetch/FetchInitiatorTypeNames.h" 52 #include "core/fetch/FetchInitiatorTypeNames.h"
53 #include "core/html/canvas/CanvasRenderingContextFactory.h" 53 #include "core/html/canvas/CanvasRenderingContextFactory.h"
54 #include "core/html/parser/HTMLParserThread.h" 54 #include "core/html/parser/HTMLParserThread.h"
55 #include "core/workers/WorkerThread.h" 55 #include "core/workers/WorkerThread.h"
56 #include "platform/EventTracer.h"
57 #include "platform/FontFamilyNames.h" 56 #include "platform/FontFamilyNames.h"
58 #include "platform/HTTPNames.h" 57 #include "platform/HTTPNames.h"
59 #include "platform/RuntimeEnabledFeatures.h" 58 #include "platform/RuntimeEnabledFeatures.h"
60 #include "platform/weborigin/KURL.h" 59 #include "platform/weborigin/KURL.h"
61 #include "platform/weborigin/SchemeRegistry.h" 60 #include "platform/weborigin/SchemeRegistry.h"
62 #include "platform/weborigin/SecurityPolicy.h" 61 #include "platform/weborigin/SecurityPolicy.h"
63 #include "wtf/allocator/Partitions.h" 62 #include "wtf/allocator/Partitions.h"
64 #include "wtf/text/AtomicStringTable.h" 63 #include "wtf/text/AtomicStringTable.h"
65 64
66 namespace blink { 65 namespace blink {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 HTTPNames::init(); 124 HTTPNames::init();
126 InputTypeNames::init(); 125 InputTypeNames::init();
127 MediaFeatureNames::init(); 126 MediaFeatureNames::init();
128 MediaTypeNames::init(); 127 MediaTypeNames::init();
129 128
130 MediaQueryEvaluator::init(); 129 MediaQueryEvaluator::init();
131 CSSParserTokenRange::initStaticEOFToken(); 130 CSSParserTokenRange::initStaticEOFToken();
132 131
133 StyleChangeExtraData::init(); 132 StyleChangeExtraData::init();
134 133
135 EventTracer::initialize();
136 KURL::initialize(); 134 KURL::initialize();
137 SchemeRegistry::initialize(); 135 SchemeRegistry::initialize();
138 SecurityPolicy::init(); 136 SecurityPolicy::init();
139 137
140 registerEventFactory(); 138 registerEventFactory();
141 139
142 StringImpl::freezeStaticStrings(); 140 StringImpl::freezeStaticStrings();
143 141
144 // Creates HTMLParserThread::shared and ScriptStreamerThread::shared, but 142 // Creates HTMLParserThread::shared and ScriptStreamerThread::shared, but
145 // does not start the threads. 143 // does not start the threads.
(...skipping 11 matching lines...) Expand all
157 // Make sure we stop the HTMLParserThread before Platform::current() is 155 // Make sure we stop the HTMLParserThread before Platform::current() is
158 // cleared. 156 // cleared.
159 ASSERT(Platform::current()); 157 ASSERT(Platform::current());
160 if (!RuntimeEnabledFeatures::parseHTMLOnMainThreadEnabled()) 158 if (!RuntimeEnabledFeatures::parseHTMLOnMainThreadEnabled())
161 HTMLParserThread::shutdown(); 159 HTMLParserThread::shutdown();
162 160
163 WorkerThread::terminateAndWaitForAllWorkers(); 161 WorkerThread::terminateAndWaitForAllWorkers();
164 } 162 }
165 163
166 } // namespace blink 164 } // namespace blink
OLDNEW
« no previous file with comments | « base/trace_event/trace_event.h ('k') | third_party/WebKit/Source/core/dom/DocumentTiming.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698