summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 17:15:29 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 17:15:29 +0000
commitba6e39cbfcbc4b91edf95a6d82216ee22d2ad3d5 (patch)
tree0e36438bb68832e68e42375eb9462d2ea33ce2cd
parent9821c23f2d7ca532bec46158ecb4bdd73a2a5483 (diff)
downloadchromium_src-ba6e39cbfcbc4b91edf95a6d82216ee22d2ad3d5.zip
chromium_src-ba6e39cbfcbc4b91edf95a6d82216ee22d2ad3d5.tar.gz
chromium_src-ba6e39cbfcbc4b91edf95a6d82216ee22d2ad3d5.tar.bz2
Roll webkit to r47896. Rebaseline one test as the new results
are actually correct (the only results contained failing statements). This was fixed with the upstream change http://trac.webkit.org/changeset/47884. BUG=none TEST=none TBR=michaeln@chromium.org Review URL: http://codereview.chromium.org/182029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24891 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.pngbin9208 -> 9682 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.pngbin4440 -> 4461 bytes
5 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 656dfec..df449bd 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "47880",
+ "webkit_revision": "47896",
}
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum
index fb54c0c..b660ea94 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum
@@ -1 +1 @@
-1ce5eb1981b9b2a3dc36871e9624c892 \ No newline at end of file
+a1fc4a418b0f94c79ee35dc405b147cb \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.png
index 2f62a20..4d5cd5e 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum
index 1a11b9c..7b9e8fb 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.checksum
@@ -1 +1 @@
-1df2ea12ae1b4c89788fab402ae4815c \ No newline at end of file
+d50304da6c4b6623ed30f2b62929c998 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.png
index 530b56d..a37dbbe 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040304-c64-uri-00-a-g-expected.png
Binary files differ