| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 | 71 |
| 72 if (event->serializedDetail()) { | 72 if (event->serializedDetail()) { |
| 73 result = event->serializedDetail()->deserialize(); | 73 result = event->serializedDetail()->deserialize(); |
| 74 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate
())); | 74 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate
())); |
| 75 return; | 75 return; |
| 76 } | 76 } |
| 77 | 77 |
| 78 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate())
, info.GetIsolate())); | 78 v8SetReturnValue(info, cacheState(info.Holder(), v8::Null(info.GetIsolate())
, info.GetIsolate())); |
| 79 } | 79 } |
| 80 | 80 |
| 81 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v
8::Value>& args) | 81 void V8CustomEvent::initCustomEventMethodCustom(const v8::FunctionCallbackInfo<v
8::Value>& info) |
| 82 { | 82 { |
| 83 CustomEvent* event = V8CustomEvent::toNative(args.Holder()); | 83 CustomEvent* event = V8CustomEvent::toNative(info.Holder()); |
| 84 ASSERT(!event->serializedDetail()); | 84 ASSERT(!event->serializedDetail()); |
| 85 | 85 |
| 86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, typeArg, args[0]); | 86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, typeArg, info[0]); |
| 87 V8TRYCATCH_VOID(bool, canBubbleArg, args[1]->BooleanValue()); | 87 V8TRYCATCH_VOID(bool, canBubbleArg, info[1]->BooleanValue()); |
| 88 V8TRYCATCH_VOID(bool, cancelableArg, args[2]->BooleanValue()); | 88 V8TRYCATCH_VOID(bool, cancelableArg, info[2]->BooleanValue()); |
| 89 v8::Handle<v8::Value> detailsArg = args[3]; | 89 v8::Handle<v8::Value> detailsArg = info[3]; |
| 90 | 90 |
| 91 event->initEvent(typeArg, canBubbleArg, cancelableArg); | 91 event->initEvent(typeArg, canBubbleArg, cancelableArg); |
| 92 | 92 |
| 93 if (!detailsArg.IsEmpty()) { | 93 if (!detailsArg.IsEmpty()) { |
| 94 args.Holder()->SetHiddenValue(V8HiddenPropertyName::detail(args.GetIsola
te()), detailsArg); | 94 info.Holder()->SetHiddenValue(V8HiddenPropertyName::detail(info.GetIsola
te()), detailsArg); |
| 95 if (isolatedWorldForIsolate(args.GetIsolate())) | 95 if (isolatedWorldForIsolate(info.GetIsolate())) |
| 96 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx
ceptions(detailsArg, args.GetIsolate())); | 96 event->setSerializedDetail(SerializedScriptValue::createAndSwallowEx
ceptions(detailsArg, info.GetIsolate())); |
| 97 } | 97 } |
| 98 } | 98 } |
| 99 | 99 |
| 100 } // namespace WebCore | 100 } // namespace WebCore |
| OLD | NEW |