OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "extensions/renderer/render_view_observer_natives.h" | 5 #include "extensions/renderer/render_view_observer_natives.h" |
6 | 6 |
7 #include "content/public/renderer/render_view.h" | 7 #include "content/public/renderer/render_view.h" |
8 #include "content/public/renderer/render_view_observer.h" | 8 #include "content/public/renderer/render_view_observer.h" |
9 #include "extensions/common/extension_api.h" | 9 #include "extensions/common/extension_api.h" |
10 #include "extensions/renderer/script_context.h" | 10 #include "extensions/renderer/script_context.h" |
11 #include "third_party/WebKit/public/web/WebFrame.h" | 11 #include "third_party/WebKit/public/web/WebFrame.h" |
12 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" | 12 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" |
13 | 13 |
14 namespace extensions { | 14 namespace extensions { |
15 | 15 |
16 namespace { | 16 namespace { |
17 | 17 |
18 // Deletes itself when done. | 18 // Deletes itself when done. |
19 class LoadWatcher : public content::RenderViewObserver { | 19 class LoadWatcher : public content::RenderViewObserver { |
20 public: | 20 public: |
21 LoadWatcher(ScriptContext* context, | 21 LoadWatcher(ScriptContext* context, |
22 content::RenderView* view, | 22 content::RenderView* view, |
23 v8::Handle<v8::Function> cb) | 23 v8::Handle<v8::Function> cb) |
24 : content::RenderViewObserver(view), context_(context), callback_(cb) {} | 24 : content::RenderViewObserver(view), |
| 25 context_(context), |
| 26 callback_(context->isolate(), cb) {} |
25 | 27 |
26 void DidCreateDocumentElement(blink::WebLocalFrame* frame) override { | 28 void DidCreateDocumentElement(blink::WebLocalFrame* frame) override { |
27 CallbackAndDie(true); | 29 CallbackAndDie(true); |
28 } | 30 } |
29 | 31 |
30 void DidFailProvisionalLoad(blink::WebLocalFrame* frame, | 32 void DidFailProvisionalLoad(blink::WebLocalFrame* frame, |
31 const blink::WebURLError& error) override { | 33 const blink::WebURLError& error) override { |
32 CallbackAndDie(false); | 34 CallbackAndDie(false); |
33 } | 35 } |
34 | 36 |
35 private: | 37 private: |
36 void CallbackAndDie(bool succeeded) { | 38 void CallbackAndDie(bool succeeded) { |
37 v8::Isolate* isolate = context_->isolate(); | 39 v8::Isolate* isolate = context_->isolate(); |
38 v8::HandleScope handle_scope(isolate); | 40 v8::HandleScope handle_scope(isolate); |
39 v8::Handle<v8::Value> args[] = {v8::Boolean::New(isolate, succeeded)}; | 41 v8::Handle<v8::Value> args[] = {v8::Boolean::New(isolate, succeeded)}; |
40 context_->CallFunction(callback_.NewHandle(isolate), 1, args); | 42 context_->CallFunction(v8::Local<v8::Function>::New(isolate, callback_), |
| 43 arraysize(args), args); |
41 delete this; | 44 delete this; |
42 } | 45 } |
43 | 46 |
44 ScriptContext* context_; | 47 ScriptContext* context_; |
45 ScopedPersistent<v8::Function> callback_; | 48 v8::UniquePersistent<v8::Function> callback_; |
46 DISALLOW_COPY_AND_ASSIGN(LoadWatcher); | 49 DISALLOW_COPY_AND_ASSIGN(LoadWatcher); |
47 }; | 50 }; |
48 } // namespace | 51 } // namespace |
49 | 52 |
50 RenderViewObserverNatives::RenderViewObserverNatives(ScriptContext* context) | 53 RenderViewObserverNatives::RenderViewObserverNatives(ScriptContext* context) |
51 : ObjectBackedNativeHandler(context) { | 54 : ObjectBackedNativeHandler(context) { |
52 RouteFunction("OnDocumentElementCreated", | 55 RouteFunction("OnDocumentElementCreated", |
53 base::Bind(&RenderViewObserverNatives::OnDocumentElementCreated, | 56 base::Bind(&RenderViewObserverNatives::OnDocumentElementCreated, |
54 base::Unretained(this))); | 57 base::Unretained(this))); |
55 } | 58 } |
(...skipping 11 matching lines...) Expand all Loading... |
67 LOG(WARNING) << "No render view found to register LoadWatcher."; | 70 LOG(WARNING) << "No render view found to register LoadWatcher."; |
68 return; | 71 return; |
69 } | 72 } |
70 | 73 |
71 new LoadWatcher(context(), view, args[1].As<v8::Function>()); | 74 new LoadWatcher(context(), view, args[1].As<v8::Function>()); |
72 | 75 |
73 args.GetReturnValue().Set(true); | 76 args.GetReturnValue().Set(true); |
74 } | 77 } |
75 | 78 |
76 } // namespace extensions | 79 } // namespace extensions |
OLD | NEW |