| 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 24 matching lines...) Expand all Loading... |
| 35 #include "Frame.h" | 35 #include "Frame.h" |
| 36 #include "NPV8Object.h" | 36 #include "NPV8Object.h" |
| 37 #include "V8Proxy.h" | 37 #include "V8Proxy.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 v8::Local<v8::Context> toV8Context(NPP npp, NPObject* npObject) | 41 v8::Local<v8::Context> toV8Context(NPP npp, NPObject* npObject) |
| 42 { | 42 { |
| 43 V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject); | 43 V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject); |
| 44 DOMWindow* domWindow = object->rootObject; | 44 DOMWindow* domWindow = object->rootObject; |
| 45 if (!domWindow || domWindow != domWindow->frame()->domWindow()) | 45 if (!domWindow || !domWindow->frame() || domWindow != domWindow->frame()->do
mWindow()) |
| 46 return v8::Local<v8::Context>(); | 46 return v8::Local<v8::Context>(); |
| 47 return V8Proxy::mainWorldContext(object->rootObject->frame()); | 47 return V8Proxy::mainWorldContext(object->rootObject->frame()); |
| 48 } | 48 } |
| 49 | 49 |
| 50 V8Proxy* toV8Proxy(NPObject* npObject) | 50 V8Proxy* toV8Proxy(NPObject* npObject) |
| 51 { | 51 { |
| 52 V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject); | 52 V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject); |
| 53 Frame* frame = object->rootObject->frame(); | 53 Frame* frame = object->rootObject->frame(); |
| 54 return V8Proxy::retrieve(frame); | 54 return V8Proxy::retrieve(frame); |
| 55 } | 55 } |
| 56 | 56 |
| 57 } // namespace WebCore | 57 } // namespace WebCore |
| OLD | NEW |