1
=== modified file 'shared/renderer/oxide_script_message_handler_renderer.cc'
2
--- shared/renderer/oxide_script_message_handler_renderer.cc	2016-04-20 22:09:41 +0000
3
+++ shared/renderer/oxide_script_message_handler_renderer.cc	2016-05-10 18:23:17 +0000
4
@@ -46,10 +46,11 @@
5
46
bool ScriptMessageHandlerRenderer::ReceiveMessageCallback(
46
bool ScriptMessageHandlerRenderer::ReceiveMessageCallback(
6
47
    ScriptMessage* message,
47
    ScriptMessage* message,
7
48
    std::unique_ptr<base::Value>* error_payload) {
48
    std::unique_ptr<base::Value>* error_payload) {
9
49
  v8::HandleScope handle_scope(manager_->isolate());
49
  v8::Isolate* isolate = manager_->isolate();
10
50
  v8::HandleScope handle_scope(isolate);
11
50
  v8::Context::Scope context_scope(manager_->GetV8Context());
51
  v8::Context::Scope context_scope(manager_->GetV8Context());
12
51
52
14
52
  v8::Handle<v8::Function> function(callback_.NewHandle(manager_->isolate()));
53
  v8::Handle<v8::Function> function(callback_.NewHandle(isolate));
15
53
54
16
54
  ScriptMessageImplRenderer* m =
55
  ScriptMessageImplRenderer* m =
17
55
      static_cast<ScriptMessageImplRenderer *>(message);
56
      static_cast<ScriptMessageImplRenderer *>(message);
18
@@ -58,9 +59,9 @@
19
58
    m->GetHandle()
59
    m->GetHandle()
20
59
  };
60
  };
21
60
61
23
61
  v8::TryCatch try_catch;
62
  v8::TryCatch try_catch(isolate);
24
62
  {
63
  {
26
63
    v8::MicrotasksScope microtasks(manager_->isolate(),
64
    v8::MicrotasksScope microtasks(isolate,
27
64
                                   v8::MicrotasksScope::kDoNotRunMicrotasks);
65
                                   v8::MicrotasksScope::kDoNotRunMicrotasks);
28
65
    manager_->frame()->GetWebFrame()->callFunctionEvenIfScriptDisabled(
66
    manager_->frame()->GetWebFrame()->callFunctionEvenIfScriptDisabled(
29
66
        function, manager_->GetV8Context()->Global(), arraysize(argv), argv);
67
        function, manager_->GetV8Context()->Global(), arraysize(argv), argv);
30
67
68
31
=== modified file 'shared/renderer/oxide_script_message_manager.cc'
32
--- shared/renderer/oxide_script_message_manager.cc	2016-04-20 22:09:41 +0000
33
+++ shared/renderer/oxide_script_message_manager.cc	2016-05-10 18:23:17 +0000
34
@@ -124,7 +124,7 @@
35
124
  v8::MicrotasksScope microstasks(isolate,
124
  v8::MicrotasksScope microstasks(isolate,
36
125
                                  v8::MicrotasksScope::kDoNotRunMicrotasks);
125
                                  v8::MicrotasksScope::kDoNotRunMicrotasks);
37
126
126
39
127
  v8::TryCatch try_catch;
127
  v8::TryCatch try_catch(isolate);
40
128
  v8::Local<v8::Function> function(script->Run().As<v8::Function>());
128
  v8::Local<v8::Function> function(script->Run().As<v8::Function>());
41
129
  if (try_catch.HasCaught()) {
129
  if (try_catch.HasCaught()) {
42
130
    LOG(ERROR) << "Caught exception when running script";
130
    LOG(ERROR) << "Caught exception when running script";
43
131
131
44
=== modified file 'shared/renderer/oxide_script_message_request_impl_renderer.cc'
45
--- shared/renderer/oxide_script_message_request_impl_renderer.cc	2016-04-20 22:09:41 +0000
46
+++ shared/renderer/oxide_script_message_request_impl_renderer.cc	2016-05-10 18:23:17 +0000
47
@@ -40,7 +40,7 @@
48
40
    v8::Handle<v8::Function> function,
40
    v8::Handle<v8::Function> function,
49
41
    int argc,
41
    int argc,
50
42
    v8::Local<v8::Value> argv[]) {
42
    v8::Local<v8::Value> argv[]) {
52
43
  v8::TryCatch try_catch;
43
  v8::TryCatch try_catch(manager()->isolate());
53
44
  {
44
  {
54
45
    v8::MicrotasksScope microtasks(manager()->isolate(),
45
    v8::MicrotasksScope microtasks(manager()->isolate(),
55
46
                                   v8::MicrotasksScope::kDoNotRunMicrotasks);
46
                                   v8::MicrotasksScope::kDoNotRunMicrotasks);
56
47
47
57
=== modified file 'shared/renderer/oxide_script_referenced_object.cc'
58
--- shared/renderer/oxide_script_referenced_object.cc	2015-01-16 22:46:17 +0000
59
+++ shared/renderer/oxide_script_referenced_object.cc	2016-05-10 18:23:17 +0000
60
@@ -39,9 +39,12 @@
61
39
  data_.reset(isolate, v8::External::New(isolate, this));
39
  data_.reset(isolate, v8::External::New(isolate, this));
62
40
40
63
41
  if (!handle.IsEmpty()) {
41
  if (!handle.IsEmpty()) {
67
42
    handle->SetHiddenValue(
42
    handle->SetPrivate(
68
43
        v8::String::NewFromUtf8(isolate, kWrappedNativeObject),
43
        manager_->GetV8Context(),
69
44
        data_.NewHandle(isolate));
44
        v8::Private::ForApi(
70
45
            isolate,
71
46
            v8::String::NewFromUtf8(isolate, kWrappedNativeObject)),
72
47
        data_.NewHandle(isolate)).FromJust();
73
45
  }
48
  }
74
46
}
49
}
75
47
50
76
@@ -60,14 +63,20 @@
77
60
  v8::Isolate* isolate = v8::Isolate::GetCurrent();
63
  v8::Isolate* isolate = v8::Isolate::GetCurrent();
78
61
  v8::HandleScope handle_scope(isolate);
64
  v8::HandleScope handle_scope(isolate);
79
62
65
83
63
  v8::Local<v8::Value> val(handle->GetHiddenValue(
66
  v8::Local<v8::Value> value;
84
64
      v8::String::NewFromUtf8(isolate, kWrappedNativeObject)));
67
  handle->GetPrivate(
85
65
  if (val.IsEmpty() || !val->IsExternal()) {
68
      isolate->GetCallingContext(),
86
69
      v8::Private::ForApi(
87
70
          isolate,
88
71
          v8::String::NewFromUtf8(isolate, kWrappedNativeObject)))
89
72
     .ToLocal(&value);
90
73
91
74
  if (value.IsEmpty() || !value->IsExternal()) {
92
66
    return nullptr;
75
    return nullptr;
93
67
  }
76
  }
94
68
77
95
69
  return reinterpret_cast<ScriptReferencedObjectBase *>(
78
  return reinterpret_cast<ScriptReferencedObjectBase *>(
97
70
      val.As<v8::External>()->Value());
79
      value.As<v8::External>()->Value());
98
71
}
80
}
99
72
81
100
73
} // namespace oxide
82
} // namespace oxide
101
74
83
102
=== modified file 'shared/renderer/oxide_script_referenced_object.h'
103
--- shared/renderer/oxide_script_referenced_object.h	2016-01-04 13:40:25 +0000
104
+++ shared/renderer/oxide_script_referenced_object.h	2016-05-10 18:23:17 +0000
105
@@ -53,7 +53,7 @@
106
53
 private:
53
 private:
107
54
  template <class U>
54
  template <class U>
108
55
  static void NearDeathCallback(
55
  static void NearDeathCallback(
110
56
      const v8::WeakCallbackData<v8::Object, scoped_refptr<U> >& data) {
56
      const v8::WeakCallbackInfo<scoped_refptr<U> >& data) {
111
57
    scoped_refptr<U>* refptr = data.GetParameter();
57
    scoped_refptr<U>* refptr = data.GetParameter();
112
58
    (*refptr)->handle_.reset();
58
    (*refptr)->handle_.reset();
113
59
    delete refptr;
59
    delete refptr;
114
60
60
115
=== modified file 'shared/renderer/oxide_user_script_slave.cc'
116
--- shared/renderer/oxide_user_script_slave.cc	2016-04-20 22:09:41 +0000
117
+++ shared/renderer/oxide_user_script_slave.cc	2016-05-10 18:23:17 +0000
118
@@ -141,7 +141,7 @@
119
141
141
120
142
  v8::Local<v8::Script> script(v8::Script::Compile(wrapped_src));
142
  v8::Local<v8::Script> script(v8::Script::Compile(wrapped_src));
121
143
143
123
144
  v8::TryCatch try_catch;
144
  v8::TryCatch try_catch(isolate);
124
145
  {
145
  {
125
146
    v8::MicrotasksScope microtasks(isolate,
146
    v8::MicrotasksScope microtasks(isolate,
126
147
                                   v8::MicrotasksScope::kDoNotRunMicrotasks);
147
                                   v8::MicrotasksScope::kDoNotRunMicrotasks);
127
148
148
128
=== modified file 'shared/renderer/oxide_v8_scoped_persistent.h'
129
--- shared/renderer/oxide_v8_scoped_persistent.h	2014-02-28 12:53:41 +0000
130
+++ shared/renderer/oxide_v8_scoped_persistent.h	2016-05-10 18:23:17 +0000
131
@@ -62,8 +62,8 @@
132
62
62
133
63
  template <typename P>
63
  template <typename P>
134
64
  void SetWeak(P* parameters,
64
  void SetWeak(P* parameters,
137
65
               typename v8::WeakCallbackData<T, P>::Callback callback) {
65
               typename v8::WeakCallbackInfo<P>::Callback callback) {
138
66
    handle_.SetWeak(parameters, callback);
66
    handle_.SetWeak(parameters, callback, v8::WeakCallbackType::kParameter);
139
67
  }
67
  }
140
68
68
141
69
 private:
69
 private:
Reviewer	Review Type	Date Requested	Status
Chris Coulson		2016-02-10	Approve on 2016-05-10
Review via email: mp+285633@code.launchpad.net