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

Side by Side Diff: Source/platform/EventTracer.cpp

Issue 813883002: replace COMPILE_ASSERT with static_assert in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: final fixups Created 6 years 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 | « Source/platform/CrossThreadCopier.cpp ('k') | Source/platform/JSONValues.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 20 matching lines...) Expand all
31 #include "config.h" 31 #include "config.h"
32 #include "platform/EventTracer.h" 32 #include "platform/EventTracer.h"
33 33
34 #include "public/platform/Platform.h" 34 #include "public/platform/Platform.h"
35 #include "public/platform/WebConvertableToTraceFormat.h" 35 #include "public/platform/WebConvertableToTraceFormat.h"
36 #include "wtf/Assertions.h" 36 #include "wtf/Assertions.h"
37 #include <stdio.h> 37 #include <stdio.h>
38 38
39 namespace blink { 39 namespace blink {
40 40
41 COMPILE_ASSERT(sizeof(Platform::TraceEventHandle) == sizeof(TraceEvent::TraceEve ntHandle), TraceEventHandle_types_must_be_compatible); 41 static_assert(sizeof(Platform::TraceEventHandle) == sizeof(TraceEvent::TraceEven tHandle), "TraceEventHandle types must be compatible");
42 42
43 // The dummy variable is needed to avoid a crash when someone updates the state variables 43 // The dummy variable is needed to avoid a crash when someone updates the state variables
44 // before EventTracer::initialize() is called. 44 // before EventTracer::initialize() is called.
45 long dummyTraceSamplingState = 0; 45 long dummyTraceSamplingState = 0;
46 long* traceSamplingState[3] = {&dummyTraceSamplingState, &dummyTraceSamplingStat e, &dummyTraceSamplingState }; 46 long* traceSamplingState[3] = {&dummyTraceSamplingState, &dummyTraceSamplingStat e, &dummyTraceSamplingState };
47 47
48 void EventTracer::initialize() 48 void EventTracer::initialize()
49 { 49 {
50 // current() might not exist in unit tests. 50 // current() might not exist in unit tests.
51 if (!Platform::current()) 51 if (!Platform::current())
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 { 98 {
99 return Platform::current()->addTraceEvent(phase, categoryEnabledFlag, name, id, numArgs, argNames, argTypes, argValues, 0, flags); 99 return Platform::current()->addTraceEvent(phase, categoryEnabledFlag, name, id, numArgs, argNames, argTypes, argValues, 0, flags);
100 } 100 }
101 101
102 void EventTracer::updateTraceEventDuration(const unsigned char* categoryEnabledF lag, const char* name, TraceEvent::TraceEventHandle handle) 102 void EventTracer::updateTraceEventDuration(const unsigned char* categoryEnabledF lag, const char* name, TraceEvent::TraceEventHandle handle)
103 { 103 {
104 Platform::current()->updateTraceEventDuration(categoryEnabledFlag, name, han dle); 104 Platform::current()->updateTraceEventDuration(categoryEnabledFlag, name, han dle);
105 } 105 }
106 106
107 } // namespace blink 107 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/CrossThreadCopier.cpp ('k') | Source/platform/JSONValues.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698