Changeset 85972 in webkit

Timestamp:

May 6, 2011 1:13:43 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-06 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Wire up CSP's eval blocking to V8's new API
​https://bugs.webkit.org/show_bug.cgi?id=60384

• platform/chromium/http/tests/security/contentSecurityPolicy/eval-blocked-expected.txt: Added.
  • Boo different error messages.
• platform/chromium/test_expectations.txt:
  • Test progression.

2011-05-06 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Wire up CSP's eval blocking to V8's new API
​https://bugs.webkit.org/show_bug.cgi?id=60384

• bindings/v8/ScriptController.cpp: (WebCore::ScriptController::disableEval):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/http/tests/security/contentSecurityPolicy/eval-blocked-expected.txt (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/v8/ScriptController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Wire up CSP's eval blocking to V8's new API
+        https://bugs.webkit.org/show_bug.cgi?id=60384
+
+        * platform/chromium/http/tests/security/contentSecurityPolicy/eval-blocked-expected.txt: Added.
+            - Boo different error messages.
+        * platform/chromium/test_expectations.txt:
+            - Test progression.
+
 2011-05-06  David Hyatt  <hyatt@apple.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3299 +3299 @@
 // Chrome doesn't load favicons in DRT tests.
 BUGWK57259 : http/tests/misc/link-rel-icon-beforeload.html = FAIL PASS
-
-// We need help from V8 to implement this feature.
-// http://code.google.com/p/v8/issues/detail?id=1258
-BUGV8: http/tests/security/contentSecurityPolicy/eval-blocked.html = TEXT
 
 // These tests appears to timeout every 10 or 20 runs.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Wire up CSP's eval blocking to V8's new API
+        https://bugs.webkit.org/show_bug.cgi?id=60384
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::disableEval):
+
 2011-05-06  David Hyatt  <hyatt@apple.com>
 

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

@@ -308 +308 @@
 void ScriptController::disableEval()
 {
-    // FIXME: We need help from V8 to implement this function:
-    // http://code.google.com/p/v8/issues/detail?id=1258
+    m_proxy->windowShell()->initContextIfNeeded();
+
+    v8::HandleScope handleScope;
+    v8::Handle<v8::Context> v8Context = V8Proxy::mainWorldContext(m_frame);
+    if (v8Context.IsEmpty())
+        return;
+
+    v8Context->AllowCodeGenerationFromStrings(false);
 }