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

Side by Side Diff: skia/ext/event_tracer_impl.cc

Issue 641523002: Replace OVERRIDE with its C++11 counterparts in src/skia (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « skia/ext/bitmap_platform_device_win.h ('k') | skia/ext/opacity_draw_filter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/debug/trace_event.h" 5 #include "base/debug/trace_event.h"
6 #include "skia/ext/event_tracer_impl.h" 6 #include "skia/ext/event_tracer_impl.h"
7 #include "third_party/skia/include/utils/SkEventTracer.h" 7 #include "third_party/skia/include/utils/SkEventTracer.h"
8 8
9 namespace skia { 9 namespace skia {
10 10
11 class SkChromiumEventTracer: public SkEventTracer { 11 class SkChromiumEventTracer: public SkEventTracer {
12 virtual const uint8_t* getCategoryGroupEnabled(const char* name) OVERRIDE; 12 virtual const uint8_t* getCategoryGroupEnabled(const char* name) override;
13 virtual const char* getCategoryGroupName( 13 virtual const char* getCategoryGroupName(
14 const uint8_t* categoryEnabledFlag) OVERRIDE; 14 const uint8_t* categoryEnabledFlag) override;
15 virtual SkEventTracer::Handle 15 virtual SkEventTracer::Handle
16 addTraceEvent(char phase, 16 addTraceEvent(char phase,
17 const uint8_t* categoryEnabledFlag, 17 const uint8_t* categoryEnabledFlag,
18 const char* name, 18 const char* name,
19 uint64_t id, 19 uint64_t id,
20 int32_t numArgs, 20 int32_t numArgs,
21 const char** argNames, 21 const char** argNames,
22 const uint8_t* argTypes, 22 const uint8_t* argTypes,
23 const uint64_t* argValues, 23 const uint64_t* argValues,
24 uint8_t flags) OVERRIDE; 24 uint8_t flags) override;
25 virtual void 25 virtual void
26 updateTraceEventDuration(const uint8_t* categoryEnabledFlag, 26 updateTraceEventDuration(const uint8_t* categoryEnabledFlag,
27 const char *name, 27 const char *name,
28 SkEventTracer::Handle handle) OVERRIDE; 28 SkEventTracer::Handle handle) override;
29 }; 29 };
30 30
31 const uint8_t* 31 const uint8_t*
32 SkChromiumEventTracer::getCategoryGroupEnabled(const char* name) { 32 SkChromiumEventTracer::getCategoryGroupEnabled(const char* name) {
33 return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(name); 33 return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(name);
34 } 34 }
35 35
36 const char* SkChromiumEventTracer::getCategoryGroupName( 36 const char* SkChromiumEventTracer::getCategoryGroupName(
37 const uint8_t* categoryEnabledFlag) { 37 const uint8_t* categoryEnabledFlag) {
38 return base::debug::TraceLog::GetCategoryGroupName( 38 return base::debug::TraceLog::GetCategoryGroupName(
(...skipping 30 matching lines...) Expand all
69 } 69 }
70 70
71 } // namespace skia 71 } // namespace skia
72 72
73 73
74 void InitSkiaEventTracer() { 74 void InitSkiaEventTracer() {
75 // Initialize the binding to Skia's tracing events. Skia will 75 // Initialize the binding to Skia's tracing events. Skia will
76 // take ownership of and clean up the memory allocated here. 76 // take ownership of and clean up the memory allocated here.
77 SkEventTracer::SetInstance(new skia::SkChromiumEventTracer()); 77 SkEventTracer::SetInstance(new skia::SkChromiumEventTracer());
78 } 78 }
OLDNEW
« no previous file with comments | « skia/ext/bitmap_platform_device_win.h ('k') | skia/ext/opacity_draw_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698