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

Side by Side Diff: webkit/glue/webkitplatformsupport_impl.cc

Issue 11557009: Remove support for TRACE_EVENT_IF_LONGER_THANx macros (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | Annotate | Revision Log
OLDNEW
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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 const unsigned char* category_enabled, 375 const unsigned char* category_enabled,
376 const char* name, 376 const char* name,
377 unsigned long long id, 377 unsigned long long id,
378 int num_args, 378 int num_args,
379 const char** arg_names, 379 const char** arg_names,
380 const unsigned char* arg_types, 380 const unsigned char* arg_types,
381 const unsigned long long* arg_values, 381 const unsigned long long* arg_values,
382 int threshold_begin_id, 382 int threshold_begin_id,
383 long long threshold, 383 long long threshold,
384 unsigned char flags) { 384 unsigned char flags) {
385 return TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id, 385 TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id,
386 num_args, arg_names, arg_types, 386 num_args, arg_names, arg_types,
387 arg_values, threshold_begin_id, 387 arg_values, flags);
388 threshold, flags); 388 return -1;
389 } 389 }
390 390
391 void WebKitPlatformSupportImpl::addTraceEvent(
392 char phase,
393 const unsigned char* category_enabled,
394 const char* name,
395 unsigned long long id,
396 int num_args,
397 const char** arg_names,
398 const unsigned char* arg_types,
399 const unsigned long long* arg_values,
400 unsigned char flags) {
401 TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id,
402 num_args, arg_names, arg_types,
403 arg_values, flags);
404 }
405
406
391 namespace { 407 namespace {
392 408
393 WebData loadAudioSpatializationResource(WebKitPlatformSupportImpl* platform, 409 WebData loadAudioSpatializationResource(WebKitPlatformSupportImpl* platform,
394 const char* name) { 410 const char* name) {
395 #ifdef IDR_AUDIO_SPATIALIZATION_T000_P000 411 #ifdef IDR_AUDIO_SPATIALIZATION_T000_P000
396 const size_t kExpectedSpatializationNameLength = 31; 412 const size_t kExpectedSpatializationNameLength = 31;
397 if (strlen(name) != kExpectedSpatializationNameLength) { 413 if (strlen(name) != kExpectedSpatializationNameLength) {
398 return WebData(); 414 return WebData();
399 } 415 }
400 416
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 #endif 894 #endif
879 895
880 if (device_source == WebKit::WebGestureEvent::Touchscreen) 896 if (device_source == WebKit::WebGestureEvent::Touchscreen)
881 return TouchFlingGestureCurve::CreateForTouchScreen(velocity, 897 return TouchFlingGestureCurve::CreateForTouchScreen(velocity,
882 cumulative_scroll); 898 cumulative_scroll);
883 899
884 return TouchFlingGestureCurve::CreateForTouchPad(velocity, cumulative_scroll); 900 return TouchFlingGestureCurve::CreateForTouchPad(velocity, cumulative_scroll);
885 } 901 }
886 902
887 } // namespace webkit_glue 903 } // namespace webkit_glue
OLDNEW
« gpu/command_buffer/client/cmd_buffer_helper.cc ('K') | « webkit/glue/webkitplatformsupport_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698