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

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

Issue 22887017: Revert "Throw an exception when denying access to 'Frame's 'location' setter." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/bindings/v8/ExceptionStatePlaceholder.cpp ('k') | Source/bindings/v8/V8ThrowException.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "bindings/v8/V8Initializer.h" 27 #include "bindings/v8/V8Initializer.h"
28 28
29 #include "V8DOMException.h"
30 #include "V8ErrorEvent.h" 29 #include "V8ErrorEvent.h"
31 #include "V8History.h" 30 #include "V8History.h"
32 #include "V8Location.h" 31 #include "V8Location.h"
33 #include "V8Window.h" 32 #include "V8Window.h"
34 #include "bindings/v8/DOMWrapperWorld.h" 33 #include "bindings/v8/DOMWrapperWorld.h"
35 #include "bindings/v8/ScriptCallStackFactory.h" 34 #include "bindings/v8/ScriptCallStackFactory.h"
36 #include "bindings/v8/ScriptController.h" 35 #include "bindings/v8/ScriptController.h"
37 #include "bindings/v8/ScriptProfiler.h" 36 #include "bindings/v8/ScriptProfiler.h"
38 #include "bindings/v8/V8Binding.h" 37 #include "bindings/v8/V8Binding.h"
39 #include "bindings/v8/V8ErrorHandler.h" 38 #include "bindings/v8/V8ErrorHandler.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 92
94 v8::Handle<v8::StackTrace> stackTrace = message->GetStackTrace(); 93 v8::Handle<v8::StackTrace> stackTrace = message->GetStackTrace();
95 RefPtr<ScriptCallStack> callStack; 94 RefPtr<ScriptCallStack> callStack;
96 // Currently stack trace is only collected when inspector is open. 95 // Currently stack trace is only collected when inspector is open.
97 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) 96 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0)
98 callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallSt ackSizeToCapture); 97 callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallSt ackSizeToCapture);
99 98
100 v8::Handle<v8::Value> resourceName = message->GetScriptResourceName(); 99 v8::Handle<v8::Value> resourceName = message->GetScriptResourceName();
101 bool shouldUseDocumentURL = resourceName.IsEmpty() || !resourceName->IsStrin g(); 100 bool shouldUseDocumentURL = resourceName.IsEmpty() || !resourceName->IsStrin g();
102 String resource = shouldUseDocumentURL ? firstWindow->document()->url() : to WebCoreString(resourceName); 101 String resource = shouldUseDocumentURL ? firstWindow->document()->url() : to WebCoreString(resourceName);
102 RefPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, resource, messag e->GetLineNumber(), message->GetStartColumn());
103 AccessControlStatus corsStatus = message->IsSharedCrossOrigin() ? SharableCr ossOrigin : NotSharableCrossOrigin; 103 AccessControlStatus corsStatus = message->IsSharedCrossOrigin() ? SharableCr ossOrigin : NotSharableCrossOrigin;
104 104
105 RefPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, resource, messag e->GetLineNumber(), message->GetStartColumn());
106 if (data->IsObject()) {
107 v8::Handle<v8::Object> obj = v8::Handle<v8::Object>::Cast(data);
108 WrapperTypeInfo* type = toWrapperTypeInfo(obj);
109 if (V8DOMException::info.isSubclass(type)) {
110 DOMException* exception = V8DOMException::toNative(obj);
111 if (exception && !exception->messageForConsole().isEmpty())
112 event->setUnsanitizedMessage("Uncaught " + exception->toStringFo rConsole());
113 }
114 }
115
116 // This method might be called while we're creating a new context. In this c ase, we 105 // This method might be called while we're creating a new context. In this c ase, we
117 // avoid storing the exception object, as we can't create a wrapper during c ontext creation. 106 // avoid storing the exception object, as we can't create a wrapper during c ontext creation.
118 DOMWrapperWorld* world = DOMWrapperWorld::current(); 107 DOMWrapperWorld* world = DOMWrapperWorld::current();
119 Frame* frame = firstWindow->document()->frame(); 108 Frame* frame = firstWindow->document()->frame();
120 if (world && frame && frame->script()->existingWindowShell(world)) 109 if (world && frame && frame->script()->existingWindowShell(world))
121 V8ErrorHandler::storeExceptionOnErrorEventWrapper(event.get(), data, v8: :Isolate::GetCurrent()); 110 V8ErrorHandler::storeExceptionOnErrorEventWrapper(event.get(), data, v8: :Isolate::GetCurrent());
122 firstWindow->document()->reportException(event.release(), callStack, corsSta tus); 111 firstWindow->document()->reportException(event.release(), callStack, corsSta tus);
123 } 112 }
124 113
125 static void failedAccessCheckCallbackInMainThread(v8::Local<v8::Object> host, v8 ::AccessType type, v8::Local<v8::Value> data) 114 static void failedAccessCheckCallbackInMainThread(v8::Local<v8::Object> host, v8 ::AccessType type, v8::Local<v8::Value> data)
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 198
210 v8::ResourceConstraints resourceConstraints; 199 v8::ResourceConstraints resourceConstraints;
211 uint32_t here; 200 uint32_t here;
212 resourceConstraints.set_stack_limit(&here - kWorkerMaxStackSize / sizeof(uin t32_t*)); 201 resourceConstraints.set_stack_limit(&here - kWorkerMaxStackSize / sizeof(uin t32_t*));
213 v8::SetResourceConstraints(&resourceConstraints); 202 v8::SetResourceConstraints(&resourceConstraints);
214 203
215 V8PerIsolateData::ensureInitialized(isolate); 204 V8PerIsolateData::ensureInitialized(isolate);
216 } 205 }
217 206
218 } // namespace WebCore 207 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/ExceptionStatePlaceholder.cpp ('k') | Source/bindings/v8/V8ThrowException.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698