| OLD | NEW |
| 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 "content/child/blink_platform_impl.h" | 5 #include "content/child/blink_platform_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 674 if (arg_types[i] == TRACE_VALUE_TYPE_CONVERTABLE) { | 674 if (arg_types[i] == TRACE_VALUE_TYPE_CONVERTABLE) { |
| 675 convertable_wrappers[i] = | 675 convertable_wrappers[i] = |
| 676 new ConvertableToTraceFormatWrapper(convertable_values[i]); | 676 new ConvertableToTraceFormatWrapper(convertable_values[i]); |
| 677 } | 677 } |
| 678 } | 678 } |
| 679 } | 679 } |
| 680 base::TimeTicks timestamp_tt = | 680 base::TimeTicks timestamp_tt = |
| 681 base::TimeTicks() + base::TimeDelta::FromSecondsD(timestamp); | 681 base::TimeTicks() + base::TimeDelta::FromSecondsD(timestamp); |
| 682 base::trace_event::TraceEventHandle handle = | 682 base::trace_event::TraceEventHandle handle = |
| 683 TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP( | 683 TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP( |
| 684 phase, category_group_enabled, name, id, trace_event_internal::kNoId, | 684 phase, category_group_enabled, name, id, bind_id, |
| 685 bind_id, base::PlatformThread::CurrentId(), timestamp_tt, num_args, | 685 base::PlatformThread::CurrentId(), timestamp_tt, num_args, arg_names, |
| 686 arg_names, arg_types, arg_values, convertable_wrappers, flags); | 686 arg_types, arg_values, convertable_wrappers, flags); |
| 687 blink::Platform::TraceEventHandle result; | 687 blink::Platform::TraceEventHandle result; |
| 688 memcpy(&result, &handle, sizeof(result)); | 688 memcpy(&result, &handle, sizeof(result)); |
| 689 return result; | 689 return result; |
| 690 } | 690 } |
| 691 | 691 |
| 692 void BlinkPlatformImpl::updateTraceEventDuration( | 692 void BlinkPlatformImpl::updateTraceEventDuration( |
| 693 const unsigned char* category_group_enabled, | 693 const unsigned char* category_group_enabled, |
| 694 const char* name, | 694 const char* name, |
| 695 TraceEventHandle handle) { | 695 TraceEventHandle handle) { |
| 696 base::trace_event::TraceEventHandle traceEventHandle; | 696 base::trace_event::TraceEventHandle traceEventHandle; |
| (...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1309 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( | 1309 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( |
| 1310 static_cast<ui::DomKey>(dom_key))); | 1310 static_cast<ui::DomKey>(dom_key))); |
| 1311 } | 1311 } |
| 1312 | 1312 |
| 1313 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { | 1313 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { |
| 1314 return static_cast<int>( | 1314 return static_cast<int>( |
| 1315 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); | 1315 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); |
| 1316 } | 1316 } |
| 1317 | 1317 |
| 1318 } // namespace content | 1318 } // namespace content |
| OLD | NEW |