OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 : V8EventListener(listener, isInline) | 48 : V8EventListener(listener, isInline) |
49 { | 49 { |
50 } | 50 } |
51 | 51 |
52 v8::Local<v8::Value> V8ErrorHandler::callListenerFunction(ScriptExecutionContext
* context, v8::Handle<v8::Value> jsEvent, Event* event) | 52 v8::Local<v8::Value> V8ErrorHandler::callListenerFunction(ScriptExecutionContext
* context, v8::Handle<v8::Value> jsEvent, Event* event) |
53 { | 53 { |
54 if (!event->hasInterface(eventNames().interfaceForErrorEvent)) | 54 if (!event->hasInterface(eventNames().interfaceForErrorEvent)) |
55 return V8EventListener::callListenerFunction(context, jsEvent, event); | 55 return V8EventListener::callListenerFunction(context, jsEvent, event); |
56 | 56 |
57 ErrorEvent* errorEvent = static_cast<ErrorEvent*>(event); | 57 ErrorEvent* errorEvent = static_cast<ErrorEvent*>(event); |
| 58 |
| 59 v8::Isolate* isolate = toV8Context(context, world())->GetIsolate(); |
| 60 if (errorEvent->world() && errorEvent->world() != world()) |
| 61 return v8::Null(isolate); |
| 62 |
58 v8::Local<v8::Object> listener = getListenerObject(context); | 63 v8::Local<v8::Object> listener = getListenerObject(context); |
59 v8::Isolate* isolate = toV8Context(context, world())->GetIsolate(); | |
60 v8::Local<v8::Value> returnValue; | 64 v8::Local<v8::Value> returnValue; |
61 if (!listener.IsEmpty() && listener->IsFunction()) { | 65 if (!listener.IsEmpty() && listener->IsFunction()) { |
62 v8::Local<v8::Function> callFunction = v8::Local<v8::Function>::Cast(lis
tener); | 66 v8::Local<v8::Function> callFunction = v8::Local<v8::Function>::Cast(lis
tener); |
63 v8::Local<v8::Object> thisValue = v8::Context::GetCurrent()->Global(); | 67 v8::Local<v8::Object> thisValue = v8::Context::GetCurrent()->Global(); |
64 | 68 |
65 v8::Local<v8::Value> error = jsEvent->ToObject()->GetHiddenValue(V8Hidde
nPropertyName::error()); | 69 v8::Local<v8::Value> error = jsEvent->ToObject()->GetHiddenValue(V8Hidde
nPropertyName::error()); |
66 if (error.IsEmpty()) | 70 if (error.IsEmpty()) |
67 error = v8::Null(isolate); | 71 error = v8::Null(isolate); |
68 | 72 |
69 v8::Handle<v8::Value> parameters[5] = { v8String(errorEvent->message(),
isolate), v8String(errorEvent->filename(), isolate), v8::Integer::New(errorEvent
->lineno(), isolate), v8::Integer::New(errorEvent->colno(), isolate), error }; | 73 v8::Handle<v8::Value> parameters[5] = { v8String(errorEvent->message(),
isolate), v8String(errorEvent->filename(), isolate), v8::Integer::New(errorEvent
->lineno(), isolate), v8::Integer::New(errorEvent->colno(), isolate), error }; |
(...skipping 16 matching lines...) Expand all Loading... |
86 v8::Local<v8::Object>::Cast(wrappedEvent)->SetHiddenValue(V8HiddenProper
tyName::error(), data); | 90 v8::Local<v8::Object>::Cast(wrappedEvent)->SetHiddenValue(V8HiddenProper
tyName::error(), data); |
87 } | 91 } |
88 } | 92 } |
89 | 93 |
90 bool V8ErrorHandler::shouldPreventDefault(v8::Local<v8::Value> returnValue) | 94 bool V8ErrorHandler::shouldPreventDefault(v8::Local<v8::Value> returnValue) |
91 { | 95 { |
92 return returnValue->IsBoolean() && returnValue->BooleanValue(); | 96 return returnValue->IsBoolean() && returnValue->BooleanValue(); |
93 } | 97 } |
94 | 98 |
95 } // namespace WebCore | 99 } // namespace WebCore |
OLD | NEW |