Changeset 83963 in webkit

Timestamp:

Apr 15, 2011 6:12:56 AM (13 years ago)

Author:

Adam Roben

Message:

Roll out r83954

It was causing fast/dom/Window/timer-null-script-execution-context.html to crash on multiple
bots.

See <​http://webkit.org/b/58610>.

Source/WebCore:

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::setTimeout):
(WebCore::JSDOMWindow::setInterval):

• bindings/js/JSWorkerContextCustom.cpp:

(WebCore::JSWorkerContext::setTimeout):
(WebCore::JSWorkerContext::setInterval):

• bindings/js/ScheduledAction.cpp:

(WebCore::ScheduledAction::create):

• bindings/js/ScheduledAction.h:
• bindings/v8/custom/V8DOMWindowCustom.cpp:

(WebCore::WindowSetTimeoutImpl):

• page/ContentSecurityPolicy.cpp:
• page/ContentSecurityPolicy.h:

LayoutTests:

• http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-allowed-expected.txt: Removed.
• http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-allowed.html: Removed.
• http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-blocked-expected.txt: Removed.
• http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-blocked.html: Removed.
• http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-allowed-expected.txt: Removed.
• http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-allowed.html: Removed.
• http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-blocked-expected.txt: Removed.
• http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-blocked.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-allowed-expected.txt (deleted)
• LayoutTests/http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-allowed.html (deleted)
• LayoutTests/http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-blocked-expected.txt (deleted)
• LayoutTests/http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-blocked.html (deleted)
• LayoutTests/http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-allowed-expected.txt (deleted)
• LayoutTests/http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-allowed.html (deleted)
• LayoutTests/http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-blocked-expected.txt (deleted)
• LayoutTests/http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-blocked.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (2 diffs)
• Source/WebCore/bindings/js/JSWorkerContextCustom.cpp (modified) (2 diffs)
• Source/WebCore/bindings/js/ScheduledAction.cpp (modified) (2 diffs)
• Source/WebCore/bindings/js/ScheduledAction.h (modified) (2 diffs)
• Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp (modified) (2 diffs)
• Source/WebCore/page/ContentSecurityPolicy.cpp (modified) (1 diff)
• Source/WebCore/page/ContentSecurityPolicy.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-15  Adam Roben  <aroben@apple.com>
+
+        Roll out r83954
+
+        It was causing fast/dom/Window/timer-null-script-execution-context.html to crash on multiple
+        bots.
+
+        See <http://webkit.org/b/58610>.
+
+        * http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-allowed-expected.txt: Removed.
+        * http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-allowed.html: Removed.
+        * http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-blocked-expected.txt: Removed.
+        * http/tests/security/contentSecurityPolicy/eval-scripts-setInterval-blocked.html: Removed.
+        * http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-allowed-expected.txt: Removed.
+        * http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-allowed.html: Removed.
+        * http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-blocked-expected.txt: Removed.
+        * http/tests/security/contentSecurityPolicy/eval-scripts-setTimeout-blocked.html: Removed.
+
 2011-04-15  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-15  Adam Roben  <aroben@apple.com>
+
+        Roll out r83954
+
+        It was causing fast/dom/Window/timer-null-script-execution-context.html to crash on multiple
+        bots.
+
+        See <http://webkit.org/b/58610>.
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::setTimeout):
+        (WebCore::JSDOMWindow::setInterval):
+        * bindings/js/JSWorkerContextCustom.cpp:
+        (WebCore::JSWorkerContext::setTimeout):
+        (WebCore::JSWorkerContext::setInterval):
+        * bindings/js/ScheduledAction.cpp:
+        (WebCore::ScheduledAction::create):
+        * bindings/js/ScheduledAction.h:
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::WindowSetTimeoutImpl):
+        * page/ContentSecurityPolicy.cpp:
+        * page/ContentSecurityPolicy.h:
+
 2011-04-15  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -733 +733 @@
 JSValue JSDOMWindow::setTimeout(ExecState* exec)
 {
-    OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec), impl()->document()->contentSecurityPolicy());
-    if (exec->hadException())
-        return jsUndefined();
-
-    if (!action)
-        return jsNumber(0);
-
+    OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec));
+    if (exec->hadException())
+        return jsUndefined();
     int delay = exec->argument(1).toInt32(exec);
 
@@ -751 +747 @@
 JSValue JSDOMWindow::setInterval(ExecState* exec)
 {
-    OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec), impl()->document()->contentSecurityPolicy());
+    OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec));
     if (exec->hadException())
         return jsUndefined();
     int delay = exec->argument(1).toInt32(exec);
-
-    if (!action)
-        return jsNumber(0);
 
     ExceptionCode ec = 0;

trunk/Source/WebCore/bindings/js/JSWorkerContextCustom.cpp

@@ -123 +123 @@
 JSValue JSWorkerContext::setTimeout(ExecState* exec)
 {
-    // FIXME: Should we enforce a Content-Security-Policy on workers?
-    OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec), 0);
+    OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec));
     if (exec->hadException())
         return jsUndefined();
@@ -133 +132 @@
 JSValue JSWorkerContext::setInterval(ExecState* exec)
 {
-    // FIXME: Should we enforce a Content-Security-Policy on workers?
-    OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec), 0);
+    OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec));
     if (exec->hadException())
         return jsUndefined();

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

@@ -25 +25 @@
 #include "ScheduledAction.h"
 
-#include "ContentSecurityPolicy.h"
 #include "DOMWindow.h"
 #include "Document.h"
@@ -48 +47 @@
 namespace WebCore {
 
-PassOwnPtr<ScheduledAction> ScheduledAction::create(ExecState* exec, DOMWrapperWorld* isolatedWorld, ContentSecurityPolicy* policy)
+PassOwnPtr<ScheduledAction> ScheduledAction::create(ExecState* exec, DOMWrapperWorld* isolatedWorld)
 {
     JSValue v = exec->argument(0);
     CallData callData;
     if (getCallData(v, callData) == CallTypeNone) {
-        if (policy && !policy->allowEval())
-            return 0;
         UString string = v.toString(exec);
         if (exec->hadException())

trunk/Source/WebCore/bindings/js/ScheduledAction.h

@@ -35 +35 @@
 
     class Document;
-    class ContentSecurityPolicy;
     class ScriptExecutionContext;
     class WorkerContext;
@@ -46 +45 @@
         WTF_MAKE_NONCOPYABLE(ScheduledAction); WTF_MAKE_FAST_ALLOCATED;
     public:
-        static PassOwnPtr<ScheduledAction> create(JSC::ExecState*, DOMWrapperWorld* isolatedWorld, ContentSecurityPolicy*);
+        static PassOwnPtr<ScheduledAction> create(JSC::ExecState*, DOMWrapperWorld* isolatedWorld);
 
         void execute(ScriptExecutionContext*);

trunk/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

@@ -33 +33 @@
 
 #include "Chrome.h"
-#include "ContentSecurityPolicy.h"
 #include "DOMTimer.h"
 #include "DOMWindow.h"
@@ -133 +132 @@
         id = DOMTimer::install(scriptContext, action, timeout, singleShot);
     } else {
-        if (!imp->document()->contentSecurityPolicy()->allowEval())
-            return v8::Integer::New(0);
         id = DOMTimer::install(scriptContext, new ScheduledAction(V8Proxy::context(imp->frame()), functionString), timeout, singleShot);
     }

trunk/Source/WebCore/page/ContentSecurityPolicy.cpp

@@ -499 +499 @@
 }
 
-bool ContentSecurityPolicy::allowEval() const
-{
-    return !m_scriptSrc || (m_options && m_options->evalScript());
-}
-
 bool ContentSecurityPolicy::allowScriptFromSource(const KURL& url) const
 {

trunk/Source/WebCore/page/ContentSecurityPolicy.h

@@ -50 +50 @@
     bool allowInlineEventHandlers() const;
     bool allowInlineScript() const;
-    bool allowEval() const;
 
     bool allowScriptFromSource(const KURL&) const;