summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-24 22:04:01 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-24 22:04:01 +0000
commit2073de3cf523d1096d3416ac071b6f6968dbeb79 (patch)
treed35c08a138e8d01ab3afe6f48b60c29122438239 /WEBKIT_MERGE_REVISION
parent366ffe559b8d2a422792394114d8cdb2746e8ad5 (diff)
downloadchromium_src-2073de3cf523d1096d3416ac071b6f6968dbeb79.zip
chromium_src-2073de3cf523d1096d3416ac071b6f6968dbeb79.tar.gz
chromium_src-2073de3cf523d1096d3416ac071b6f6968dbeb79.tar.bz2
Chromium side of WebKit merge 42725:42805.
In addition to the tests that were rebaselined or disabled, the following tests fail on my machine but I suspect it's my local ssl problem and will risk it on buildbot. Will promptly disable them if they don't work there. LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT Review URL: http://codereview.chromium.org/92157 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'WEBKIT_MERGE_REVISION')
-rw-r--r--WEBKIT_MERGE_REVISION2
1 files changed, 1 insertions, 1 deletions
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index b53f7f9..9af57c6 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@42725 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@42805 \ No newline at end of file