| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 25 matching lines...) Expand all Loading... |
| 36 #include "bindings/core/v8/SerializedScriptValue.h" | 36 #include "bindings/core/v8/SerializedScriptValue.h" |
| 37 #include "bindings/core/v8/V8Binding.h" | 37 #include "bindings/core/v8/V8Binding.h" |
| 38 #include "bindings/core/v8/V8DOMWrapper.h" | 38 #include "bindings/core/v8/V8DOMWrapper.h" |
| 39 #include "bindings/core/v8/V8Event.h" | 39 #include "bindings/core/v8/V8Event.h" |
| 40 #include "bindings/core/v8/V8HiddenValue.h" | 40 #include "bindings/core/v8/V8HiddenValue.h" |
| 41 #include "core/dom/ContextFeatures.h" | 41 #include "core/dom/ContextFeatures.h" |
| 42 #include "platform/RuntimeEnabledFeatures.h" | 42 #include "platform/RuntimeEnabledFeatures.h" |
| 43 | 43 |
| 44 namespace blink { | 44 namespace blink { |
| 45 | 45 |
| 46 static void setHiddenValueAndReturnValue(const v8::PropertyCallbackInfo<v8::Valu
e>& info, v8::Local<v8::Value> error) | 46 static void setHiddenValueAndReturnValue(const v8::FunctionCallbackInfo<v8::Valu
e>& info, v8::Local<v8::Value> error) |
| 47 { | 47 { |
| 48 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValu
e::error(info.GetIsolate()), error); | 48 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValu
e::error(info.GetIsolate()), error); |
| 49 v8SetReturnValue(info, error); | 49 v8SetReturnValue(info, error); |
| 50 } | 50 } |
| 51 | 51 |
| 52 void V8ErrorEvent::errorAttributeGetterCustom(const v8::PropertyCallbackInfo<v8:
:Value>& info) | 52 void V8ErrorEvent::errorAttributeGetterCustom(const v8::FunctionCallbackInfo<v8:
:Value>& info) |
| 53 { | 53 { |
| 54 v8::Isolate* isolate = info.GetIsolate(); | 54 v8::Isolate* isolate = info.GetIsolate(); |
| 55 v8::Local<v8::Value> cachedError = V8HiddenValue::getHiddenValue(isolate, in
fo.Holder(), V8HiddenValue::error(isolate)); | 55 v8::Local<v8::Value> cachedError = V8HiddenValue::getHiddenValue(isolate, in
fo.Holder(), V8HiddenValue::error(isolate)); |
| 56 if (!cachedError.IsEmpty()) { | 56 if (!cachedError.IsEmpty()) { |
| 57 v8SetReturnValue(info, cachedError); | 57 v8SetReturnValue(info, cachedError); |
| 58 return; | 58 return; |
| 59 } | 59 } |
| 60 | 60 |
| 61 ErrorEvent* event = V8ErrorEvent::toImpl(info.Holder()); | 61 ErrorEvent* event = V8ErrorEvent::toImpl(info.Holder()); |
| 62 ScriptValue error = event->error(ScriptState::current(isolate)); | 62 ScriptValue error = event->error(ScriptState::current(isolate)); |
| 63 if (!error.isEmpty()) | 63 if (!error.isEmpty()) |
| 64 setHiddenValueAndReturnValue(info, error.v8Value()); | 64 setHiddenValueAndReturnValue(info, error.v8Value()); |
| 65 else | 65 else |
| 66 setHiddenValueAndReturnValue(info, v8::Null(isolate)); | 66 setHiddenValueAndReturnValue(info, v8::Null(isolate)); |
| 67 } | 67 } |
| 68 | 68 |
| 69 } // namespace blink | 69 } // namespace blink |
| OLD | NEW |