summaryrefslogtreecommitdiffstats
path: root/WEBKIT_MERGE_REVISION
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-15 02:26:04 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-15 02:26:04 +0000
commitc80c19e07af7ac397019ccf2976cdd2f099cd1f5 (patch)
tree213d391a17df17e9500699a2482f427e09609eb4 /WEBKIT_MERGE_REVISION
parentfb62884c4a51b06d6f36fff2ad6e1e1dc3f26235 (diff)
downloadchromium_src-c80c19e07af7ac397019ccf2976cdd2f099cd1f5.zip
chromium_src-c80c19e07af7ac397019ccf2976cdd2f099cd1f5.tar.gz
chromium_src-c80c19e07af7ac397019ccf2976cdd2f099cd1f5.tar.bz2
WebKit merge 41613:41660 (Chromium side).
Layout tests changes (and baselines): * LayoutTests/fast/css/font-face-default-font.html Fixed by aa upstream. The change was in the test itself. * LayoutTests/fast/replaced/width100percent-searchfield.html Fixed by levin upstream -- the themeChromiumWin.css change. * LayoutTests/fast/forms/input-appearance-height.html * LayoutTests/fast/repaint/search-field-cancel.html Rebase needed due to themeChromiumWin.css change * LayoutTests/fast/layers/normal-flow-hit-test.html A slightly different font seems to be used in chromium which casued some pixel differences in this test. * LayoutTests/fast/forms/placeholder-pseudo-style.html * LayoutTests/fast/forms/search-placeholder-value-changed.html New tests which needed chromium baselines due to differences in the search input box display. * LayoutTests/fast/forms/placeholder-set-value.html Differences in fonts and search input boxes were the cause for the chromium baseline. Review URL: http://codereview.chromium.org/46071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11712 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 3541ea0..213d909 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@41613 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@41660 \ No newline at end of file