Changeset 104694 in webkit

Timestamp:

Jan 11, 2012 2:58:00 AM (12 years ago)

Author:

jochen@chromium.org

Message:

Move the check for canExecuteScripts out of V8Proxy::retrieve
​https://bugs.webkit.org/show_bug.cgi?id=75533

Reviewed by Adam Barth.

Source/WebCore:

This change doesn't move the check to custom/generated bindings for
individual objects, as these won't get executed if scripts are disabled
anyway.

No new tests. No functional change.

• bindings/v8/PageScriptDebugServer.cpp:

(WebCore::PageScriptDebugServer::addListener):

• bindings/v8/ScheduledAction.cpp:

(WebCore::ScheduledAction::execute):

• bindings/v8/ScriptCachedFrameData.cpp:

(WebCore::ScriptCachedFrameData::restore):

• bindings/v8/V8DOMWrapper.cpp:

(WebCore::V8DOMWrapper::instantiateV8Object):

• bindings/v8/V8EventListener.cpp:

(WebCore::V8EventListener::callListenerFunction):

• bindings/v8/V8LazyEventListener.cpp:

(WebCore::V8LazyEventListener::callListenerFunction):
(WebCore::V8LazyEventListener::prepareListenerObject):

• bindings/v8/V8Proxy.cpp:

(WebCore::V8Proxy::handleOutOfMemory):
(WebCore::V8Proxy::retrieve):
(WebCore::toV8Context):

Source/WebKit/chromium:

• src/WebDevToolsAgentImpl.cpp:

(WebKit::WebDevToolsAgentImpl::didClearWindowObject):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/v8/PageScriptDebugServer.cpp (modified) (1 diff)
• WebCore/bindings/v8/ScheduledAction.cpp (modified) (1 diff)
• WebCore/bindings/v8/ScriptCachedFrameData.cpp (modified) (1 diff)
• WebCore/bindings/v8/V8DOMWrapper.cpp (modified) (1 diff)
• WebCore/bindings/v8/V8EventListener.cpp (modified) (2 diffs)
• WebCore/bindings/v8/V8LazyEventListener.cpp (modified) (2 diffs)
• WebCore/bindings/v8/V8Proxy.cpp (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebDevToolsAgentImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-11  Jochen Eisinger  <jochen@chromium.org>
+
+        Move the check for canExecuteScripts out of V8Proxy::retrieve
+        https://bugs.webkit.org/show_bug.cgi?id=75533
+
+        Reviewed by Adam Barth.
+
+        This change doesn't move the check to custom/generated bindings for
+        individual objects, as these won't get executed if scripts are disabled
+        anyway.
+
+        No new tests. No functional change.
+
+        * bindings/v8/PageScriptDebugServer.cpp:
+        (WebCore::PageScriptDebugServer::addListener):
+        * bindings/v8/ScheduledAction.cpp:
+        (WebCore::ScheduledAction::execute):
+        * bindings/v8/ScriptCachedFrameData.cpp:
+        (WebCore::ScriptCachedFrameData::restore):
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::instantiateV8Object):
+        * bindings/v8/V8EventListener.cpp:
+        (WebCore::V8EventListener::callListenerFunction):
+        * bindings/v8/V8LazyEventListener.cpp:
+        (WebCore::V8LazyEventListener::callListenerFunction):
+        (WebCore::V8LazyEventListener::prepareListenerObject):
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::handleOutOfMemory):
+        (WebCore::V8Proxy::retrieve):
+        (WebCore::toV8Context):
+
 2012-01-11  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/bindings/v8/PageScriptDebugServer.cpp

@@ -77 +77 @@
 void PageScriptDebugServer::addListener(ScriptDebugListener* listener, Page* page)
 {
+    ScriptController* scriptController = page->mainFrame()->script();
+    if (!scriptController->canExecuteScripts(NotAboutToExecuteScript))
+        return;
     V8Proxy* proxy = V8Proxy::retrieve(page->mainFrame());
-    if (!proxy)
-        return;
 
     v8::HandleScope scope;

trunk/Source/WebCore/bindings/v8/ScheduledAction.cpp

@@ -95 +95 @@
 void ScheduledAction::execute(ScriptExecutionContext* context)
 {
-    V8Proxy* proxy = V8Proxy::retrieve(context);
-    if (proxy)
+    if (context->isDocument()) {
+        Frame* frame = static_cast<Document*>(context)->frame();
+        ScriptController* scriptController = frame->script();
+        if (!scriptController->canExecuteScripts(NotAboutToExecuteScript))
+            return;
+        V8Proxy* proxy = V8Proxy::retrieve(frame);
         execute(proxy);
+    }
 #if ENABLE(WORKERS)
-    else if (context->isWorkerContext())
+    else {
+        ASSERT(context->isWorkerContext());
         execute(static_cast<WorkerContext*>(context));
+    }
 #endif
-    // It's possible that Javascript is disabled and that we have neither a V8Proxy
-    // nor a WorkerContext.  Do nothing in that case.
 }
 

trunk/Source/WebCore/bindings/v8/ScriptCachedFrameData.cpp

@@ -60 +60 @@
         return;
 
+    if (!frame->script()->canExecuteScripts(NotAboutToExecuteScript))
+        return;
+
     v8::HandleScope handleScope;
     v8::Context::Scope contextScope(m_context.get());

trunk/Source/WebCore/bindings/v8/V8DOMWrapper.cpp

@@ -217 +217 @@
         if (!context.IsEmpty()) {
             v8::Handle<v8::Object> globalPrototype = v8::Handle<v8::Object>::Cast(context->Global()->GetPrototype());
-            if (isWrapperOfType(globalPrototype, &V8DOMWindow::info))
-                proxy = V8Proxy::retrieve(V8DOMWindow::toNative(globalPrototype)->frame());
+            if (isWrapperOfType(globalPrototype, &V8DOMWindow::info)) {
+                Frame* frame = V8DOMWindow::toNative(globalPrototype)->frame();
+                if (frame && frame->script()->canExecuteScripts(NotAboutToExecuteScript))
+                    proxy = V8Proxy::retrieve(frame);
+            }
 #if ENABLE(WORKERS)
             else

trunk/Source/WebCore/bindings/v8/V8EventListener.cpp

@@ -36 +36 @@
 #endif
 
+#include "Document.h"
+#include "Frame.h"
 #include "V8Proxy.h"
 
@@ -82 +84 @@
 #endif
 
-    if (V8Proxy* proxy = V8Proxy::retrieve(context))
-        return proxy->callFunction(handlerFunction, receiver, 1, parameters);
+    if (V8Proxy* proxy = V8Proxy::retrieve(context)) {
+        Frame* frame = static_cast<Document*>(context)->frame();
+        if (frame->script()->canExecuteScripts(NotAboutToExecuteScript))
+            return proxy->callFunction(handlerFunction, receiver, 1, parameters);
+    }
 
     return v8::Local<v8::Value>();

trunk/Source/WebCore/bindings/v8/V8LazyEventListener.cpp

@@ -66 +66 @@
     v8::Handle<v8::Value> parameters[1] = { jsEvent };
 
-    if (V8Proxy* proxy = V8Proxy::retrieve(context))
-        return proxy->callFunction(handlerFunction, receiver, 1, parameters);
+    if (V8Proxy* proxy = V8Proxy::retrieve(context)) {
+        Frame* frame = static_cast<Document*>(context)->frame();
+        if (frame->script()->canExecuteScripts(NotAboutToExecuteScript))
+            return proxy->callFunction(handlerFunction, receiver, 1, parameters);
+    }
 
     return v8::Local<v8::Value>();
@@ -89 +92 @@
     V8Proxy* proxy = V8Proxy::retrieve(context);
     if (!proxy)
+        return;
+    ASSERT(context->isDocument());
+    if (!static_cast<Document*>(context)->frame()->script()->canExecuteScripts(NotAboutToExecuteScript))
         return;
 

trunk/Source/WebCore/bindings/v8/V8Proxy.cpp

@@ -191 +191 @@
 
     V8Proxy* proxy = V8Proxy::retrieve(frame);
-    if (proxy) {
+    if (proxy && frame->script()->canExecuteScripts(NotAboutToExecuteScript)) {
         // Clean m_context, and event handlers.
         proxy->clearForClose();
@@ -506 +506 @@
 V8Proxy* V8Proxy::retrieve(Frame* frame)
 {
-    if (!frame)
-        return 0;
-    return frame->script()->canExecuteScripts(NotAboutToExecuteScript) ? frame->script()->proxy() : 0;
+    return frame ? frame->script()->proxy() : 0;
 }
 
@@ -709 +707 @@
 {
     if (context->isDocument()) {
-        if (V8Proxy* proxy = V8Proxy::retrieve(context))
-            return worldContext.adjustedContext(proxy);
+        if (V8Proxy* proxy = V8Proxy::retrieve(context)) {
+            Frame* frame = static_cast<Document*>(context)->frame();
+            if (frame->script()->canExecuteScripts(NotAboutToExecuteScript))
+                return worldContext.adjustedContext(proxy);
+        }
 #if ENABLE(WORKERS)
     } else if (context->isWorkerContext()) {

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-01-11  Jochen Eisinger  <jochen@chromium.org>
+
+        Move the check for canExecuteScripts out of V8Proxy::retrieve
+        https://bugs.webkit.org/show_bug.cgi?id=75533
+
+        Reviewed by Adam Barth.
+
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::didClearWindowObject):
+
 2012-01-10  Daniel Cheng  <dcheng@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

@@ -228 +228 @@
 {
     WebCore::V8Proxy* proxy = WebCore::V8Proxy::retrieve(webframe->frame());
-    if (proxy)
+    if (proxy && webframe->frame()->script()->canExecuteScripts(NotAboutToExecuteScript))
         proxy->setContextDebugId(m_hostId);
 }