OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 14 matching lines...) Expand all Loading... |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "V8Helpers.h" | 32 #include "V8Helpers.h" |
33 | 33 |
34 #include "DOMWindow.h" | 34 #include "DOMWindow.h" |
| 35 #include "Frame.h" |
35 #include "NPV8Object.h" | 36 #include "NPV8Object.h" |
36 #include "V8Proxy.h" | 37 #include "V8Proxy.h" |
37 | 38 |
38 namespace WebCore { | 39 namespace WebCore { |
39 | 40 |
40 v8::Local<v8::Context> toV8Context(NPP npp, NPObject* npObject) | 41 v8::Local<v8::Context> toV8Context(NPP npp, NPObject* npObject) |
41 { | 42 { |
42 V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject); | 43 V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject); |
| 44 DOMWindow* domWindow = object->rootObject; |
| 45 if (!domWindow || domWindow != domWindow->frame()->domWindow()) |
| 46 return v8::Local<v8::Context>(); |
43 return V8Proxy::mainWorldContext(object->rootObject->frame()); | 47 return V8Proxy::mainWorldContext(object->rootObject->frame()); |
44 } | 48 } |
45 | 49 |
46 V8Proxy* toV8Proxy(NPObject* npObject) | 50 V8Proxy* toV8Proxy(NPObject* npObject) |
47 { | 51 { |
48 V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject); | 52 V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject); |
49 Frame* frame = object->rootObject->frame(); | 53 Frame* frame = object->rootObject->frame(); |
50 return V8Proxy::retrieve(frame); | 54 return V8Proxy::retrieve(frame); |
51 } | 55 } |
52 | 56 |
53 } // namespace WebCore | 57 } // namespace WebCore |
OLD | NEW |