Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Side by Side Diff: Source/bindings/v8/custom/V8ErrorEventCustom.cpp

Issue 20351002: Add 'error' parameter to 'window.onerror' handlers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rework. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 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
11 * copyright notice, this list of conditions and the following disclaimer 11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the 12 * in the documentation and/or other materials provided with the
13 * distribution. 13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its 14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from 15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission. 16 * this software without specific prior written permission.
17 * 17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "V8ErrorEvent.h"
32 33
33 #include "V8Worker.h" 34 #include "RuntimeEnabledFeatures.h"
34 #include "bindings/v8/ExceptionState.h" 35 #include "V8Event.h"
36 #include "bindings/v8/DOMWrapperWorld.h"
37 #include "bindings/v8/Dictionary.h"
38 #include "bindings/v8/ScriptState.h"
35 #include "bindings/v8/SerializedScriptValue.h" 39 #include "bindings/v8/SerializedScriptValue.h"
36 #include "bindings/v8/V8Binding.h" 40 #include "bindings/v8/V8Binding.h"
37 #include "bindings/v8/V8Utilities.h" 41 #include "bindings/v8/V8DOMWrapper.h"
42 #include "bindings/v8/V8HiddenPropertyName.h"
43 #include "core/dom/ContextFeatures.h"
38 #include "core/page/Frame.h" 44 #include "core/page/Frame.h"
39 #include "core/workers/Worker.h"
40 #include "core/workers/WorkerGlobalScope.h"
41 #include "wtf/ArrayBuffer.h"
42 45
43 namespace WebCore { 46 namespace WebCore {
44 47
45 void V8Worker::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::Value> & args) 48 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> errorWrapper, v8: :Handle<v8::Value> error)
46 { 49 {
dcarney 2013/07/30 10:48:55 this function can go
47 Worker* worker = V8Worker::toNative(args.Holder()); 50 errorWrapper->SetHiddenValue(V8HiddenPropertyName::error(), error);
48 MessagePortArray ports; 51 return error;
49 ArrayBufferArray arrayBuffers; 52 }
50 if (args.Length() > 1) { 53
51 if (!extractTransferables(args[1], ports, arrayBuffers, args.GetIsolate( ))) 54
52 return; 55 void V8ErrorEvent::errorAttrGetterCustom(v8::Local<v8::String>, const v8::Proper tyCallbackInfo<v8::Value>& info)
56 {
57 ErrorEvent* event = V8ErrorEvent::toNative(info.Holder());
58 v8::Handle<v8::Object> error = event->error().v8Value()->ToObject();
59
60 if (DOMWrapperWorld::current()->worldId() != error->GetHiddenValue(V8HiddenP ropertyName::worldId())->IntegerValue()) {
61 v8SetReturnValue(info, v8::Null(info.GetIsolate()));
62 return;
53 } 63 }
54 bool didThrow = false; 64
55 RefPtr<SerializedScriptValue> message = 65 v8SetReturnValue(info, error);
56 SerializedScriptValue::create(args[0],
57 &ports,
58 &arrayBuffers,
59 didThrow,
60 args.GetIsolate());
61 if (didThrow)
62 return;
63 ExceptionState es(args.GetIsolate());
64 worker->postMessage(message.release(), &ports, es);
65 es.throwIfNeeded();
66 } 66 }
67 67
68 } // namespace WebCore 68 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698