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

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 6a7182d9b26816f2a6e3aa36b68d90821a730e6b
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 02:25:16 2010 +0000

    2010-08-02  Rajiv Makhijani  <rajivmakhijani at chromium.org>
    
            Reviewed by Adam Barth.
    
            Committed by Dirk Pranke.
    
            Added missing "if (window.layoutTestController)" check.
            Removed expectation for test case that should now pass with this bugfix.
    
            https://bugs.webkit.org/show_bug.cgi?id=38705
    
            * 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.
    
            Committed by Dirk Pranke.
    
            Bug 38705 - [v8] chromium fails http/tests/sandbox-inherit-to-initial-document-2
            https://bugs.webkit.org/show_bug.cgi?id=38705
    
            WebCore::V8Proxy::retrieve(Frame* frame) calls WebCore::ScriptController::canExecuteScripts
            and returns 0 if canExecuteScripts is false. It should return the proxy regardless
            of whether the frame can execute scripts.
    
            * bindings/v8/V8Proxy.cpp:
            (WebCore::V8Proxy::retrieve): Removed canExecuteScripts check.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e9b08ec..dd57c11 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-02  Rajiv Makhijani  <rajivmakhijani at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Committed by Dirk Pranke.
+
+        Added missing "if (window.layoutTestController)" check.
+        Removed expectation for test case that should now pass with this bugfix.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38705
+
+        * http/tests/security/sandbox-inherit-to-initial-document-2.html: 
+        * platform/chromium/test_expectations.txt: 
+
 2010-08-02  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
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 4743a33..cfc952a 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,7 +35,9 @@ function test()
         doc.body.appendChild(scr);
     } else {
         document.getElementById("result").innerHTML = "FAIL: no inner frame";
-        layoutTestController.notifyDone();
+        if (window.layoutTestController) {
+            layoutTestController.notifyDone();
+        }
     }
 }
 </script>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 372dfab..2fcadad 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2739,8 +2739,6 @@ 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 aac8d9f..d754bd9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-02  Rajiv Makhijani  <rajivmakhijani at chromium.org>
+
+        Reviewed by Adam Barth. 
+
+        Committed by Dirk Pranke.
+
+        Bug 38705 - [v8] chromium fails http/tests/sandbox-inherit-to-initial-document-2
+        https://bugs.webkit.org/show_bug.cgi?id=38705
+
+        WebCore::V8Proxy::retrieve(Frame* frame) calls WebCore::ScriptController::canExecuteScripts
+        and returns 0 if canExecuteScripts is false. It should return the proxy regardless
+        of whether the frame can execute scripts.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::retrieve): Removed canExecuteScripts check.
+
 2010-08-02  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index 3f72112..6ac920a 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()->canExecuteScripts(NotAboutToExecuteScript) ? frame->script()->proxy() : 0;
+    return frame->script()->proxy();
 }
 
 V8Proxy* V8Proxy::retrieve(ScriptExecutionContext* context)

-- 
WebKit Debian packaging