Changeset 64529 in webkit

Timestamp:

Aug 2, 2010 9:57:32 PM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-08-02 Pavel Feldman <​pfeldman@chromium.org>

Not reviewed. Rolling out r64525 for breaking chromium tests.

• bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::retrieve):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/sandbox-inherit-to-initial-document-2.html (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/v8/V8Proxy.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-02  Pavel Feldman  <pfeldman@chromium.org>
+
+        Not reviewed. Rolling out r64525 for breaking chromium tests.
+
+        * http/tests/security/sandbox-inherit-to-initial-document-2.html:
+        * platform/chromium/test_expectations.txt:
+
 2010-08-02  Rajiv Makhijani  <rajivmakhijani@chromium.org>
 

trunk/LayoutTests/http/tests/security/sandbox-inherit-to-initial-document-2.html

@@ -36 +36 @@
     } else {
         document.getElementById("result").innerHTML = "FAIL: no inner frame";
-        if (window.layoutTestController) {
-            layoutTestController.notifyDone();
-        }
+        layoutTestController.notifyDone();
     }
 }

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2740 +2740 @@
 BUG43960 MAC : fast/css/input-search-padding.html = IMAGE
 
+BUGWK38705 : http/tests/security/sandbox-inherit-to-initial-document-2.html = TEXT
+
 // WebKit roll 58791:58807
 BUG43319 MAC : transforms/2d/zoom-menulist.html = IMAGE PASS

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-02  Pavel Feldman  <pfeldman@chromium.org>
+
+        Not reviewed. Rolling out r64525 for breaking chromium tests.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::retrieve):
+
 2010-08-02  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/bindings/v8/V8Proxy.cpp

@@ -628 +628 @@
     if (!frame)
         return 0;
-    return frame->script()->proxy();
+    return frame->script()->canExecuteScripts(NotAboutToExecuteScript) ? frame->script()->proxy() : 0;
 }