bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision c78c0ad7 (#363565)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-12-09 11:10:16 -05:00
parent 535c4fbc30
commit 5dec0c5f57
62 changed files with 534 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef/browser/trace_subscriber.cc
View File

@ -37,7 +37,7 @@ CefTraceSubscriber::CefTraceSubscriber()
CefTraceSubscriber::~CefTraceSubscriber() {
CEF_REQUIRE_UIT();
if (collecting_trace_data_)
TracingController::GetInstance()->DisableRecording(NULL);
TracingController::GetInstance()->StopTracing(NULL);
}
bool CefTraceSubscriber::BeginTracing(
@ -50,13 +50,13 @@ bool CefTraceSubscriber::BeginTracing(
collecting_trace_data_ = true;
TracingController::EnableRecordingDoneCallback done_callback;
TracingController::StartTracingDoneCallback done_callback;
if (callback.get()) {
done_callback =
base::Bind(&CefCompletionCallback::OnComplete, callback.get());
}
TracingController::GetInstance()->EnableRecording(
TracingController::GetInstance()->StartTracing(
base::trace_event::TraceConfig(categories, ""),
done_callback);
return true;
@ -73,7 +73,7 @@ bool CefTraceSubscriber::EndTracing(
if (!callback.get()) {
// Discard the trace data.
collecting_trace_data_ = false;
TracingController::GetInstance()->DisableRecording(NULL);
TracingController::GetInstance()->StopTracing(NULL);
return true;
}
@ -91,7 +91,7 @@ bool CefTraceSubscriber::EndTracing(
base::Bind(&CefTraceSubscriber::OnTracingFileResult,
weak_factory_.GetWeakPtr(), callback, tracing_file);
TracingController::GetInstance()->DisableRecording(
TracingController::GetInstance()->StopTracing(
TracingController::CreateFileSink(tracing_file, result_callback));
return true;
}