Merge remote-tracking branch 'upstream/master' into speedup-gpu
This commit is contained in:
commit
8eed91d87a
79 changed files with 674 additions and 436 deletions
|
@ -66,7 +66,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
|
|||
v8::Isolate* isolate, const mate::Dictionary& options);
|
||||
|
||||
static void BuildPrototype(v8::Isolate* isolate,
|
||||
v8::Local<v8::ObjectTemplate> prototype);
|
||||
v8::Local<v8::FunctionTemplate> prototype);
|
||||
|
||||
int GetID() const;
|
||||
Type GetType() const;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue