summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-28 21:37:44 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-28 21:37:44 +0000
commit928afbc588e8b48b9c7af579a63b11d904c80089 (patch)
treea733926bf68163b49ddc382a653ba88157f43ea8
parenta090a3e31f10c6fd8f5ca72c2bbf4839f9bb4f1d (diff)
downloadchromium_src-928afbc588e8b48b9c7af579a63b11d904c80089.zip
chromium_src-928afbc588e8b48b9c7af579a63b11d904c80089.tar.gz
chromium_src-928afbc588e8b48b9c7af579a63b11d904c80089.tar.bz2
Recommit r4065, r4066 along with rebaselined test expectation
Review URL: http://codereview.chromium.org/8847 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4092 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_test_results/v8/LayoutTests/fast/forms/search-display-none-cancel-button-expected.txt5
2 files changed, 3 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 0509085..731d2f5 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@63",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@4078",
+ "/trunk/deps/third_party/WebKit@4091",
"src/third_party/cygwin":
"/trunk/deps/third_party/cygwin@3248",
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/forms/search-display-none-cancel-button-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/fast/forms/search-display-none-cancel-button-expected.txt
index 1fa14b8..735a3a4 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/fast/forms/search-display-none-cancel-button-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/forms/search-display-none-cancel-button-expected.txt
@@ -9,11 +9,10 @@ layer at (0,0) size 800x600
RenderTextControl {INPUT} at (0,20) size 110x20 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderBlock {DIV} at (2,3) size 106x14
RenderBlock {DIV} at (0,0) size 8x11
- RenderBlock {DIV} at (93,0) size 13x11
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (18,31) size 85x14
- RenderBlock {DIV} at (8,0) size 85x14
+layer at (18,31) size 98x14
+ RenderBlock {DIV} at (8,0) size 98x14
RenderText {#text} at (1,0) size 17x14
text run at (1,0) width 17: "test"