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

Side by Side Diff: Source/bindings/v8/V8ErrorHandler.cpp

Issue 23637014: Have V8HiddenPropertyName static functions take an isolate in argument (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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) 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 v8::Isolate* isolate = toV8Context(context, world())->GetIsolate(); 59 v8::Isolate* isolate = toV8Context(context, world())->GetIsolate();
60 if (errorEvent->world() && errorEvent->world() != world()) 60 if (errorEvent->world() && errorEvent->world() != world())
61 return v8::Null(isolate); 61 return v8::Null(isolate);
62 62
63 v8::Local<v8::Object> listener = getListenerObject(context); 63 v8::Local<v8::Object> listener = getListenerObject(context);
64 v8::Local<v8::Value> returnValue; 64 v8::Local<v8::Value> returnValue;
65 if (!listener.IsEmpty() && listener->IsFunction()) { 65 if (!listener.IsEmpty() && listener->IsFunction()) {
66 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);
67 v8::Local<v8::Object> thisValue = v8::Context::GetCurrent()->Global(); 67 v8::Local<v8::Object> thisValue = v8::Context::GetCurrent()->Global();
68 68
69 v8::Local<v8::Value> error = jsEvent->ToObject()->GetHiddenValue(V8Hidde nPropertyName::error()); 69 v8::Local<v8::Value> error = jsEvent->ToObject()->GetHiddenValue(V8Hidde nPropertyName::error(isolate));
70 if (error.IsEmpty()) 70 if (error.IsEmpty())
71 error = v8::Null(isolate); 71 error = v8::Null(isolate);
72 72
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 }; 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 };
74 v8::TryCatch tryCatch; 74 v8::TryCatch tryCatch;
75 tryCatch.SetVerbose(true); 75 tryCatch.SetVerbose(true);
76 if (worldType(isolate) == WorkerWorld) 76 if (worldType(isolate) == WorkerWorld)
77 returnValue = V8ScriptRunner::callFunction(callFunction, context, th isValue, WTF_ARRAY_LENGTH(parameters), parameters, isolate); 77 returnValue = V8ScriptRunner::callFunction(callFunction, context, th isValue, WTF_ARRAY_LENGTH(parameters), parameters, isolate);
78 else 78 else
79 returnValue = ScriptController::callFunctionWithInstrumentation(0, c allFunction, thisValue, WTF_ARRAY_LENGTH(parameters), parameters, isolate); 79 returnValue = ScriptController::callFunctionWithInstrumentation(0, c allFunction, thisValue, WTF_ARRAY_LENGTH(parameters), parameters, isolate);
80 } 80 }
81 return returnValue; 81 return returnValue;
82 } 82 }
83 83
84 // static 84 // static
85 void V8ErrorHandler::storeExceptionOnErrorEventWrapper(ErrorEvent* event, v8::Ha ndle<v8::Value> data, v8::Isolate* isolate) 85 void V8ErrorHandler::storeExceptionOnErrorEventWrapper(ErrorEvent* event, v8::Ha ndle<v8::Value> data, v8::Isolate* isolate)
86 { 86 {
87 v8::Local<v8::Value> wrappedEvent = toV8(event, v8::Handle<v8::Object>(), is olate); 87 v8::Local<v8::Value> wrappedEvent = toV8(event, v8::Handle<v8::Object>(), is olate);
88 if (!wrappedEvent.IsEmpty()) { 88 if (!wrappedEvent.IsEmpty()) {
89 ASSERT(wrappedEvent->IsObject()); 89 ASSERT(wrappedEvent->IsObject());
90 v8::Local<v8::Object>::Cast(wrappedEvent)->SetHiddenValue(V8HiddenProper tyName::error(), data); 90 v8::Local<v8::Object>::Cast(wrappedEvent)->SetHiddenValue(V8HiddenProper tyName::error(isolate), data);
91 } 91 }
92 } 92 }
93 93
94 bool V8ErrorHandler::shouldPreventDefault(v8::Local<v8::Value> returnValue) 94 bool V8ErrorHandler::shouldPreventDefault(v8::Local<v8::Value> returnValue)
95 { 95 {
96 return returnValue->IsBoolean() && returnValue->BooleanValue(); 96 return returnValue->IsBoolean() && returnValue->BooleanValue();
97 } 97 }
98 98
99 } // namespace WebCore 99 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp ('k') | Source/bindings/v8/V8EventListenerList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698