Skip to content

Commit

Permalink
Fix race conditions of reference counters of TraceEvent::ConvertableT…
Browse files Browse the repository at this point in the history
…oTraceFormat [3'/4]

Remove WEB_CONVERTABLE_TO_TRACE_FORMAT_IS_MOVED as clean-up.
Follow-up of https://codereview.chromium.org/1121673002/.

BUG=478149

Review URL: https://codereview.chromium.org/1125583002

Cr-Commit-Position: refs/heads/master@{#328500}
  • Loading branch information
hiroshige-g authored and Commit bot committed May 6, 2015
1 parent 195bd52 commit 957444d
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions content/child/blink_platform_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -649,12 +649,7 @@ blink::Platform::TraceEventHandle BlinkPlatformImpl::addTraceEvent(
const char** arg_names,
const unsigned char* arg_types,
const unsigned long long* arg_values,
#ifndef WEB_CONVERTABLE_TO_TRACE_FORMAT_IS_MOVED
// TODO(hiroshige): Remove #ifndef once the Blink-side CL is landed.
const blink::WebConvertableToTraceFormat* convertable_values,
#else
blink::WebConvertableToTraceFormat* convertable_values,
#endif
unsigned char flags) {
scoped_refptr<base::trace_event::ConvertableToTraceFormat>
convertable_wrappers[2];
Expand Down

0 comments on commit 957444d

Please sign in to comment.