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

Side by Side Diff: src/utils/SkEventTracer.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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 | « src/utils/SkDeferredCanvas.cpp ('k') | src/utils/SkFrontBufferedStream.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 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkEventTracer.h" 8 #include "SkEventTracer.h"
9 #include "SkOnce.h" 9 #include "SkOnce.h"
10 10
11 class SkDefaultEventTracer: public SkEventTracer { 11 class SkDefaultEventTracer: public SkEventTracer {
12 virtual SkEventTracer::Handle 12 virtual SkEventTracer::Handle
13 addTraceEvent(char phase, 13 addTraceEvent(char phase,
14 const uint8_t* categoryEnabledFlag, 14 const uint8_t* categoryEnabledFlag,
15 const char* name, 15 const char* name,
16 uint64_t id, 16 uint64_t id,
17 int numArgs, 17 int numArgs,
18 const char** argNames, 18 const char** argNames,
19 const uint8_t* argTypes, 19 const uint8_t* argTypes,
20 const uint64_t* argValues, 20 const uint64_t* argValues,
21 uint8_t flags) SK_OVERRIDE { return 0; } 21 uint8_t flags) override { return 0; }
22 22
23 virtual void 23 virtual void
24 updateTraceEventDuration(const uint8_t* categoryEnabledFlag, 24 updateTraceEventDuration(const uint8_t* categoryEnabledFlag,
25 const char* name, 25 const char* name,
26 SkEventTracer::Handle handle) SK_OVERRIDE {}; 26 SkEventTracer::Handle handle) override {};
27 27
28 const uint8_t* getCategoryGroupEnabled(const char* name) SK_OVERRIDE { 28 const uint8_t* getCategoryGroupEnabled(const char* name) override {
29 static uint8_t no = 0; 29 static uint8_t no = 0;
30 return &no; 30 return &no;
31 }; 31 };
32 virtual const char* getCategoryGroupName( 32 virtual const char* getCategoryGroupName(
33 const uint8_t* categoryEnabledFlag) SK_OVERRIDE { 33 const uint8_t* categoryEnabledFlag) override {
34 static const char* dummy = "dummy"; 34 static const char* dummy = "dummy";
35 return dummy; 35 return dummy;
36 }; 36 };
37 }; 37 };
38 38
39 SkEventTracer* SkEventTracer::gInstance; 39 SkEventTracer* SkEventTracer::gInstance;
40 40
41 static void cleanup_tracer() { 41 static void cleanup_tracer() {
42 // calling SetInstance will delete the existing instance. 42 // calling SetInstance will delete the existing instance.
43 SkEventTracer::SetInstance(NULL); 43 SkEventTracer::SetInstance(NULL);
44 } 44 }
45 45
46 static void intialize_default_tracer(SkEventTracer* current_instance) { 46 static void intialize_default_tracer(SkEventTracer* current_instance) {
47 if (NULL == current_instance) { 47 if (NULL == current_instance) {
48 SkEventTracer::SetInstance(SkNEW(SkDefaultEventTracer)); 48 SkEventTracer::SetInstance(SkNEW(SkDefaultEventTracer));
49 } 49 }
50 atexit(cleanup_tracer); 50 atexit(cleanup_tracer);
51 } 51 }
52 52
53 53
54 SK_DECLARE_STATIC_ONCE(once); 54 SK_DECLARE_STATIC_ONCE(once);
55 SkEventTracer* SkEventTracer::GetInstance() { 55 SkEventTracer* SkEventTracer::GetInstance() {
56 SkOnce(&once, intialize_default_tracer, SkEventTracer::gInstance); 56 SkOnce(&once, intialize_default_tracer, SkEventTracer::gInstance);
57 SkASSERT(SkEventTracer::gInstance); 57 SkASSERT(SkEventTracer::gInstance);
58 return SkEventTracer::gInstance; 58 return SkEventTracer::gInstance;
59 } 59 }
OLDNEW
« no previous file with comments | « src/utils/SkDeferredCanvas.cpp ('k') | src/utils/SkFrontBufferedStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698