[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0e222492cfddacb9e4cf96784740121195e72134
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 04:57:32 2010 +0000

    2010-08-02  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed. Rolling out r64525 for breaking chromium tests.
    
            * bindings/v8/V8Proxy.cpp:
            (WebCore::V8Proxy::retrieve):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64529 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dd57c11..96aadfe 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-02  Pavel Feldman  <pfeldman at 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 at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/http/tests/security/sandbox-inherit-to-initial-document-2.html b/LayoutTests/http/tests/security/sandbox-inherit-to-initial-document-2.html
index cfc952a..4743a33 100644
--- a/LayoutTests/http/tests/security/sandbox-inherit-to-initial-document-2.html
+++ b/LayoutTests/http/tests/security/sandbox-inherit-to-initial-document-2.html
@@ -35,9 +35,7 @@ function test()
         doc.body.appendChild(scr);
     } else {
         document.getElementById("result").innerHTML = "FAIL: no inner frame";
-        if (window.layoutTestController) {
-            layoutTestController.notifyDone();
-        }
+        layoutTestController.notifyDone();
     }
 }
 </script>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 2fcadad..372dfab 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2739,6 +2739,8 @@ BUG43963 LINUX : fast/forms/searchfield-heights.html = IMAGE+TEXT TEXT
 BUG43960 WIN LINUX : fast/css/input-search-padding.html = IMAGE+TEXT
 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
 BUG43319 MAC : fast/forms/select-empty-option-height.html = TIMEOUT IMAGE PASS
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index db216c5..9a4bbf8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-02  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed. Rolling out r64525 for breaking chromium tests.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::retrieve):
+
 2010-08-02  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix, add stubs for FontCustomPlatformData to compile code that uses them.
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index 6ac920a..3f72112 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -627,7 +627,7 @@ V8Proxy* V8Proxy::retrieve(Frame* frame)
 {
     if (!frame)
         return 0;
-    return frame->script()->proxy();
+    return frame->script()->canExecuteScripts(NotAboutToExecuteScript) ? frame->script()->proxy() : 0;
 }
 
 V8Proxy* V8Proxy::retrieve(ScriptExecutionContext* context)

-- 
WebKit Debian packaging