Changeset 106680 in webkit
- Timestamp:
- Feb 3, 2012 11:32:34 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r106674 r106680 1 2012-02-03 Jochen Eisinger <jochen@chromium.org> 2 3 Remove unneccesary canExecuteScripts check from v8 bindings, and correctly indeicate when we're about to execute a script 4 https://bugs.webkit.org/show_bug.cgi?id=76704 5 6 Reviewed by Adam Barth. 7 8 * http/tests/security/isolatedWorld/resources/fail.html: 9 * http/tests/security/isolatedWorld/sandboxed-iframe-expected.txt: 10 * http/tests/security/isolatedWorld/sandboxed-iframe.html: 11 1 12 2012-02-03 Dan Bernstein <mitz@apple.com> 2 13 -
trunk/Source/WebCore/ChangeLog
r106679 r106680 1 2012-02-03 Jochen Eisinger <jochen@chromium.org> 2 3 Remove unneccesary canExecuteScripts check from v8 bindings, and correctly indeicate when we're about to execute a script 4 https://bugs.webkit.org/show_bug.cgi?id=76704 5 6 Reviewed by Adam Barth. 7 8 Test: http/tests/security/isolatedWorld/sandboxed-iframe.html 9 10 * bindings/v8/ScheduledAction.cpp: 11 (WebCore::ScheduledAction::execute): 12 * bindings/v8/V8EventListener.cpp: 13 (WebCore::V8EventListener::callListenerFunction): 14 * bindings/v8/V8LazyEventListener.cpp: 15 (WebCore::V8LazyEventListener::callListenerFunction): 16 * bindings/v8/V8Proxy.cpp: 17 (WebCore::V8Proxy::handleOutOfMemory): 18 (WebCore::toV8Context): 19 1 20 2012-02-03 Anders Carlsson <andersca@apple.com> 2 21 -
trunk/Source/WebCore/bindings/v8/ScheduledAction.cpp
r106043 r106680 98 98 Frame* frame = static_cast<Document*>(context)->frame(); 99 99 ScriptController* scriptController = frame->script(); 100 if (!scriptController->canExecuteScripts( NotAboutToExecuteScript))100 if (!scriptController->canExecuteScripts(AboutToExecuteScript)) 101 101 return; 102 102 V8Proxy* proxy = V8Proxy::retrieve(frame); -
trunk/Source/WebCore/bindings/v8/V8EventListener.cpp
r104694 r106680 86 86 if (V8Proxy* proxy = V8Proxy::retrieve(context)) { 87 87 Frame* frame = static_cast<Document*>(context)->frame(); 88 if (frame->script()->canExecuteScripts( NotAboutToExecuteScript))88 if (frame->script()->canExecuteScripts(AboutToExecuteScript)) 89 89 return proxy->callFunction(handlerFunction, receiver, 1, parameters); 90 90 } -
trunk/Source/WebCore/bindings/v8/V8LazyEventListener.cpp
r104694 r106680 68 68 if (V8Proxy* proxy = V8Proxy::retrieve(context)) { 69 69 Frame* frame = static_cast<Document*>(context)->frame(); 70 if (frame->script()->canExecuteScripts( NotAboutToExecuteScript))70 if (frame->script()->canExecuteScripts(AboutToExecuteScript)) 71 71 return proxy->callFunction(handlerFunction, receiver, 1, parameters); 72 72 } -
trunk/Source/WebCore/bindings/v8/V8Proxy.cpp
r106487 r106680 195 195 196 196 V8Proxy* proxy = V8Proxy::retrieve(frame); 197 if (proxy && frame->script()->canExecuteScripts(NotAboutToExecuteScript)) {197 if (proxy) { 198 198 // Clean m_context, and event handlers. 199 199 proxy->clearForClose(); … … 719 719 { 720 720 if (context->isDocument()) { 721 if (V8Proxy* proxy = V8Proxy::retrieve(context)) { 722 Frame* frame = static_cast<Document*>(context)->frame(); 723 if (frame->script()->canExecuteScripts(NotAboutToExecuteScript)) 724 return worldContext.adjustedContext(proxy); 725 } 721 if (V8Proxy* proxy = V8Proxy::retrieve(context)) 722 return worldContext.adjustedContext(proxy); 726 723 #if ENABLE(WORKERS) 727 724 } else if (context->isWorkerContext()) {
Note: See TracChangeset
for help on using the changeset viewer.