mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

tracing: fix docs and allow null values in file path conversion fromv8

Browse source
This commit is contained in:
Robo 2015-11-13 02:36:38 +05:30
parent ce0167756e
commit 3d5437e0a4
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/common/native_mate_converters/file_path_converter.h
View file

@ -21,6 +21,9 @@ struct Converter<base::FilePath> {
static bool FromV8(v8::Isolate* isolate, static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val, v8::Local<v8::Value> val,
base::FilePath* out) { base::FilePath* out) {
if (val->IsNull())
return true;
base::FilePath::StringType path; base::FilePath::StringType path;
if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) { if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
*out = base::FilePath(path); *out = base::FilePath(path);

9
docs/api/content-tracing.md
View file

@ -6,9 +6,14 @@ so you need to open `chrome://tracing/` in a Chrome browser and load the
generated file to view the result. generated file to view the result.
```javascript ```javascript
var contentTracing = require('content-tracing'); const contentTracing = require('content-tracing');
contentTracing.startRecording('*', contentTracing.DEFAULT_OPTIONS, function() { const options = {
categoryFilter: '*',
traceOptions: 'record-until-full,enable-sampling'
}
contentTracing.startRecording(options, function() {
console.log('Tracing started'); console.log('Tracing started');
setTimeout(function() { setTimeout(function() {