diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 5 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 2 |
4 files changed, 3 insertions, 8 deletions
@@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@11958", + "/trunk/deps/third_party/WebKit@11976", "src/third_party/icu38": "/trunk/deps/third_party/icu38@11496", diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index d05093e..4854789 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -565,7 +565,7 @@ env.Command(['$DERIVED_DIR/UserAgentStyleSheets.h', '$PORT_DIR/css/svg.css', '$PORT_DIR/css/html4.css', '$PORT_DIR/css/quirks.css', - '$PORT_DIR/css/themeWin.css', + '$PORT_DIR/css/themeChromiumWin.css', '$PORT_DIR/css/themeWinQuirks.css'], '$PERL ${SOURCES[0].posix} ${TARGETS.posix} ${SOURCES[1:].posix}') diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index db0382cc..8ba23d9 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1806,14 +1806,9 @@ DEFER MAC LINUX WIN : LayoutTests/fast/js/console-non-string-values.html = FAIL // New failures from 41613:41660 -- They likely just need to be rebaselined // for Mac and Linux, since that is what was done for Windows. -DEFER LINUX : LayoutTests/fast/forms/placeholder-pseudo-style.html = FAIL DEFER LINUX : LayoutTests/fast/layers/normal-flow-hit-test.html = FAIL DEFER MAC LINUX : LayoutTests/fast/forms/placeholder-set-value.html = FAIL -// New failures from 41613:41660 -- Linux should start using themeChromiumWin.css -// instead of themeWin.css and then this test should pass. -LINUX : LayoutTests/fast/forms/search-placeholder-value-changed.html = FAIL - // New failures from 41660:41709 // Newly added tests. DEFER LINUX WIN : LayoutTests/editing/pasteboard/5089327.html = FAIL diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 596b157..8eba3cb 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -491,7 +491,7 @@ '../third_party/WebKit/WebCore/css/html4.css', '../third_party/WebKit/WebCore/css/quirks.css', '../third_party/WebKit/WebCore/css/view-source.css', - '../third_party/WebKit/WebCore/css/themeWin.css', + '../third_party/WebKit/WebCore/css/themeChromiumWin.css', '../third_party/WebKit/WebCore/css/themeWinQuirks.css', '../third_party/WebKit/WebCore/css/svg.css', '../third_party/WebKit/WebCore/css/mediaControls.css', |