From 6791c532eed5275bbd918976653dcbe6d2381615 Mon Sep 17 00:00:00 2001 From: "dglazkov@google.com" Date: Thu, 19 Feb 2009 20:45:53 +0000 Subject: WebKit Merge 41057:41077, Chromium Side R=brettw BUG=NONE Review URL: http://codereview.chromium.org/21513 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10030 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 4 ++-- WEBKIT_MERGE_REVISION | 2 +- .../forms/inline-ignored-on-legend-expected.checksum | 1 - .../fast/forms/inline-ignored-on-legend-expected.png | Bin 3279 -> 0 bytes .../fast/forms/inline-ignored-on-legend-expected.txt | 16 ---------------- 5 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.checksum delete mode 100644 webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.png delete mode 100644 webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.txt diff --git a/DEPS b/DEPS index 53a483d..0495949 100644 --- a/DEPS +++ b/DEPS @@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41057", + "webkit_revision": "41077", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@10017", + "/trunk/deps/third_party/WebKit@10029", "src/third_party/icu38": "/trunk/deps/third_party/icu38@9252", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 9e0a55c..969bd09 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@41057 \ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@41077 \ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.checksum deleted file mode 100644 index b7ef39c..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -45876812ec2b60fb2409f3b70c6d5ecc \ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.png deleted file mode 100644 index b10a053..0000000 Binary files a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.png and /dev/null differ diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.txt deleted file mode 100644 index 42a9dbf..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/inline-ignored-on-legend-expected.txt +++ /dev/null @@ -1,16 +0,0 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x600 - RenderBlock {HTML} at (0,0) size 800x600 - RenderBody {BODY} at (0,0) size 800x600 - RenderBlock (floating) {FORM} at (0,0) size 97x42 - RenderFieldSet {FIELDSET} at (0,0) size 97x42 [border: (2px groove #C0C0C0)] - RenderBlock {LEGEND} at (2,0) size 93x20 - RenderText {#text} at (0,0) size 93x19 - text run at (0,0) width 93: "Member Login:" - RenderBlock (anonymous) at (2,20) size 93x20 - RenderTextControl {INPUT} at (0,0) size 80x20 [bgcolor=#FFFFFF] [border: (2px inset #000000)] - RenderText {#text} at (0,0) size 0x0 - RenderBlock (floating) {DIV} at (0,42) size 800x0 -layer at (4,22) size 76x16 - RenderBlock {DIV} at (2,2) size 76x16 -- cgit v1.1