| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 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 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "bindings/v8/V8EventListener.h" | 32 #include "bindings/v8/V8EventListener.h" |
| 33 | 33 |
| 34 #include "bindings/v8/ScriptController.h" | 34 #include "bindings/v8/ScriptController.h" |
| 35 #include "core/dom/Document.h" | 35 #include "core/dom/Document.h" |
| 36 #include "core/page/Frame.h" | 36 #include "core/page/Frame.h" |
| 37 | 37 |
| 38 namespace WebCore { | 38 namespace WebCore { |
| 39 | 39 |
| 40 V8EventListener::V8EventListener(v8::Local<v8::Object> listener, bool isAttribut
e) | 40 V8EventListener::V8EventListener(v8::Local<v8::Object> listener, bool isAttribut
e, v8::Isolate* isolate) |
| 41 : V8AbstractEventListener(isAttribute, DOMWrapperWorld::current(), v8::Isola
te::GetCurrent()) // FIXME: Remove GetCurrent(). | 41 : V8AbstractEventListener(isAttribute, DOMWrapperWorld::current(), isolate) |
| 42 { | 42 { |
| 43 setListenerObject(listener); | 43 setListenerObject(listener); |
| 44 } | 44 } |
| 45 | 45 |
| 46 v8::Local<v8::Function> V8EventListener::getListenerFunction(ScriptExecutionCont
ext* context) | 46 v8::Local<v8::Function> V8EventListener::getListenerFunction(ScriptExecutionCont
ext* context) |
| 47 { | 47 { |
| 48 v8::Local<v8::Object> listener = getListenerObject(context); | 48 v8::Local<v8::Object> listener = getListenerObject(context); |
| 49 | 49 |
| 50 // Has the listener been disposed? | 50 // Has the listener been disposed? |
| 51 if (listener.IsEmpty()) | 51 if (listener.IsEmpty()) |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 return v8::Local<v8::Value>(); | 86 return v8::Local<v8::Value>(); |
| 87 | 87 |
| 88 if (!frame->script()->canExecuteScripts(AboutToExecuteScript)) | 88 if (!frame->script()->canExecuteScripts(AboutToExecuteScript)) |
| 89 return v8::Local<v8::Value>(); | 89 return v8::Local<v8::Value>(); |
| 90 | 90 |
| 91 v8::Handle<v8::Value> parameters[1] = { jsEvent }; | 91 v8::Handle<v8::Value> parameters[1] = { jsEvent }; |
| 92 return frame->script()->callFunction(handlerFunction, receiver, WTF_ARRAY_LE
NGTH(parameters), parameters); | 92 return frame->script()->callFunction(handlerFunction, receiver, WTF_ARRAY_LE
NGTH(parameters), parameters); |
| 93 } | 93 } |
| 94 | 94 |
| 95 } // namespace WebCore | 95 } // namespace WebCore |
| OLD | NEW |