Upgrade CEF to 3.3029.1611.g44e39a8 / Chromium 58.0.3029.81.

[casparcg] / dependencies64 / cef / linux / include / capi / cef_trace_capi.h

diff --git a/dependencies64/cef/include/capi/cef_trace_capi.h b/dependencies64/cef/linux/include/capi/cef_trace_capi.h
similarity index 89%
rename from dependencies64/cef/include/capi/cef_trace_capi.h
rename to dependencies64/cef/linux/include/capi/cef_trace_capi.h
index 787b738ed0a306ae9f6dcf9c1ebaafe5cda435d8..c753eb40dd02868788cbd076117011d285cd313e 100644 (file)
--- a/dependencies64/cef/include/capi/cef_trace_capi.h
+++ b/dependencies64/cef/linux/include/capi/cef_trace_capi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2017 Marshall A. Greenblatt. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -39,6 +39,7 @@
 #pragma once
 
 #include "include/capi/cef_base_capi.h"
+#include "include/capi/cef_callback_capi.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,7 +55,7 @@ typedef struct _cef_end_tracing_callback_t {
   ///
   // Base structure.
   ///
-  cef_base_t base;
+  cef_base_ref_counted_t base;
 
   ///
   // Called after all processes have sent their trace data. |tracing_file| is
@@ -68,9 +69,9 @@ typedef struct _cef_end_tracing_callback_t {
 
 
 ///
-// Start tracing events on all processes. Tracing begins immediately locally,
-// and asynchronously on child processes as soon as they receive the
-// BeginTracing request.
+// Start tracing events on all processes. Tracing is initialized asynchronously
+// and |callback| will be executed on the UI thread after initialization is
+// complete.
 //
 // If CefBeginTracing was called previously, or if a CefEndTracingAsync call is
 // pending, CefBeginTracing will fail and return false (0).
@@ -84,7 +85,8 @@ typedef struct _cef_end_tracing_callback_t {
 //
 // This function must be called on the browser process UI thread.
 ///
-CEF_EXPORT int cef_begin_tracing(const cef_string_t* categories);
+CEF_EXPORT int cef_begin_tracing(const cef_string_t* categories,
+    struct _cef_completion_callback_t* callback);
 
 ///
 // Stop tracing events on all processes.
@@ -99,7 +101,7 @@ CEF_EXPORT int cef_begin_tracing(const cef_string_t* categories);
 //
 // This function must be called on the browser process UI thread.
 ///
-CEF_EXPORT int cef_end_tracing_async(const cef_string_t* tracing_file,
+CEF_EXPORT int cef_end_tracing(const cef_string_t* tracing_file,
     cef_end_tracing_callback_t* callback);
 
 ///