| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/glue/webkitplatformsupport_impl.h" | 5 #include "webkit/glue/webkitplatformsupport_impl.h" | 
| 6 | 6 | 
| 7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) | 
| 8 #include <malloc.h> | 8 #include <malloc.h> | 
| 9 #endif | 9 #endif | 
| 10 | 10 | 
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 321     const unsigned long long* arg_values, | 321     const unsigned long long* arg_values, | 
| 322     int threshold_begin_id, | 322     int threshold_begin_id, | 
| 323     long long threshold, | 323     long long threshold, | 
| 324     unsigned char flags) { | 324     unsigned char flags) { | 
| 325   return TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id, | 325   return TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id, | 
| 326                                          num_args, arg_names, arg_types, | 326                                          num_args, arg_names, arg_types, | 
| 327                                          arg_values, threshold_begin_id, | 327                                          arg_values, threshold_begin_id, | 
| 328                                          threshold, flags); | 328                                          threshold, flags); | 
| 329 } | 329 } | 
| 330 | 330 | 
| 331 unsigned long long WebKitPlatformSupportImpl::manglePointerForTracing( |  | 
| 332     void* pointer) { |  | 
| 333   return TRACE_EVENT_API_GET_ID_FROM_POINTER(pointer); |  | 
| 334 } |  | 
| 335 |  | 
| 336 namespace { | 331 namespace { | 
| 337 | 332 | 
| 338 WebData loadAudioSpatializationResource(WebKitPlatformSupportImpl* platform, | 333 WebData loadAudioSpatializationResource(WebKitPlatformSupportImpl* platform, | 
| 339                                         const char* name) { | 334                                         const char* name) { | 
| 340 #ifdef IDR_AUDIO_SPATIALIZATION_T000_P000 | 335 #ifdef IDR_AUDIO_SPATIALIZATION_T000_P000 | 
| 341   const size_t kExpectedSpatializationNameLength = 31; | 336   const size_t kExpectedSpatializationNameLength = 31; | 
| 342   if (strlen(name) != kExpectedSpatializationNameLength) { | 337   if (strlen(name) != kExpectedSpatializationNameLength) { | 
| 343     return WebData(); | 338     return WebData(); | 
| 344   } | 339   } | 
| 345 | 340 | 
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 721   worker_task_runner->OnWorkerRunLoopStarted(runLoop); | 716   worker_task_runner->OnWorkerRunLoopStarted(runLoop); | 
| 722 } | 717 } | 
| 723 | 718 | 
| 724 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( | 719 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( | 
| 725     const WebKit::WebWorkerRunLoop& runLoop) { | 720     const WebKit::WebWorkerRunLoop& runLoop) { | 
| 726   WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); | 721   WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); | 
| 727   worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 722   worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 
| 728 } | 723 } | 
| 729 | 724 | 
| 730 }  // namespace webkit_glue | 725 }  // namespace webkit_glue | 
| OLD | NEW | 
|---|