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 "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 void AddTraceEvent(char phase, | 214 void AddTraceEvent(char phase, |
215 const unsigned char* category_enabled, | 215 const unsigned char* category_enabled, |
216 const char* name, | 216 const char* name, |
217 unsigned long long id, | 217 unsigned long long id, |
218 int num_args, | 218 int num_args, |
219 const char** arg_names, | 219 const char** arg_names, |
220 const unsigned char* arg_types, | 220 const unsigned char* arg_types, |
221 const unsigned long long* arg_values, | 221 const unsigned long long* arg_values, |
222 unsigned char flags) { | 222 unsigned char flags) { |
223 TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id, num_args, | 223 TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id, num_args, |
224 arg_names, arg_types, arg_values, flags); | 224 arg_names, arg_types, arg_values, NULL, |
| 225 flags); |
225 } | 226 } |
226 #endif | 227 #endif |
227 | 228 |
228 } // namespace | 229 } // namespace |
229 | 230 |
230 class RenderThreadImpl::GpuVDAContextLostCallback | 231 class RenderThreadImpl::GpuVDAContextLostCallback |
231 : public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback { | 232 : public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback { |
232 public: | 233 public: |
233 GpuVDAContextLostCallback() {} | 234 GpuVDAContextLostCallback() {} |
234 virtual ~GpuVDAContextLostCallback() {} | 235 virtual ~GpuVDAContextLostCallback() {} |
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1286 | 1287 |
1287 void RenderThreadImpl::SetFlingCurveParameters( | 1288 void RenderThreadImpl::SetFlingCurveParameters( |
1288 const std::vector<float>& new_touchpad, | 1289 const std::vector<float>& new_touchpad, |
1289 const std::vector<float>& new_touchscreen) { | 1290 const std::vector<float>& new_touchscreen) { |
1290 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1291 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1291 new_touchscreen); | 1292 new_touchscreen); |
1292 | 1293 |
1293 } | 1294 } |
1294 | 1295 |
1295 } // namespace content | 1296 } // namespace content |
OLD | NEW |