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

apavlov at chromium.org apavlov at chromium.org
Wed Dec 22 14:31:16 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 2ada79f4607be5a05b437daeaa1c2b1c2b737086
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 10:22:16 2010 +0000

    2010-10-12  Alexander Pavlov  <apavlov at chromium.org>
    
            [Chromium] Unreviewed, build fix.
    
            Rebaseline http/tests/security/cross-frame-access-get.html for chromium-mac and chromium-win
    
            * platform/chromium-mac/http/tests/security/cross-frame-access-get-expected.txt:
            * platform/chromium-win/http/tests/security/cross-frame-access-get-expected.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6dbfc67..dc12c9d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-12  Alexander Pavlov  <apavlov at chromium.org>
+
+        [Chromium] Unreviewed, build fix.
+
+        Rebaseline http/tests/security/cross-frame-access-get.html for chromium-mac and chromium-win
+
+        * platform/chromium-mac/http/tests/security/cross-frame-access-get-expected.txt:
+        * platform/chromium-win/http/tests/security/cross-frame-access-get-expected.txt:
+
 2010-10-12  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Update test expectations for r69564.
diff --git a/LayoutTests/platform/chromium-mac/http/tests/security/cross-frame-access-get-expected.txt b/LayoutTests/platform/chromium-mac/http/tests/security/cross-frame-access-get-expected.txt
index bdcc56f..d3cdabf 100644
--- a/LayoutTests/platform/chromium-mac/http/tests/security/cross-frame-access-get-expected.txt
+++ b/LayoutTests/platform/chromium-mac/http/tests/security/cross-frame-access-get-expected.txt
@@ -374,6 +374,8 @@ CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http
 
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-get.html. Domains, protocols and ports must match.
 
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-get.html. Domains, protocols and ports must match.
+
 This test checks cross-frame access security (rdar://problem/5251309).
 
 
@@ -515,6 +517,7 @@ PASS: canGet('targetWindow.captureEvents') should be 'false' and is.
 PASS: canGet('targetWindow.clearInterval') should be 'false' and is.
 PASS: canGet('targetWindow.clearTimeout') should be 'false' and is.
 PASS: canGet('targetWindow.confirm') should be 'false' and is.
+PASS: canGet('targetWindow.constructor') should be 'false' and is.
 PASS: canGet('targetWindow.find') should be 'false' and is.
 PASS: canGet('targetWindow.getComputedStyle') should be 'false' and is.
 PASS: canGet('targetWindow.getMatchedCSSRules') should be 'false' and is.
diff --git a/LayoutTests/platform/chromium-win/http/tests/security/cross-frame-access-get-expected.txt b/LayoutTests/platform/chromium-win/http/tests/security/cross-frame-access-get-expected.txt
index bdcc56f..d3cdabf 100644
--- a/LayoutTests/platform/chromium-win/http/tests/security/cross-frame-access-get-expected.txt
+++ b/LayoutTests/platform/chromium-win/http/tests/security/cross-frame-access-get-expected.txt
@@ -374,6 +374,8 @@ CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http
 
 CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-get.html. Domains, protocols and ports must match.
 
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-get.html. Domains, protocols and ports must match.
+
 This test checks cross-frame access security (rdar://problem/5251309).
 
 
@@ -515,6 +517,7 @@ PASS: canGet('targetWindow.captureEvents') should be 'false' and is.
 PASS: canGet('targetWindow.clearInterval') should be 'false' and is.
 PASS: canGet('targetWindow.clearTimeout') should be 'false' and is.
 PASS: canGet('targetWindow.confirm') should be 'false' and is.
+PASS: canGet('targetWindow.constructor') should be 'false' and is.
 PASS: canGet('targetWindow.find') should be 'false' and is.
 PASS: canGet('targetWindow.getComputedStyle') should be 'false' and is.
 PASS: canGet('targetWindow.getMatchedCSSRules') should be 'false' and is.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list