diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 06:38:27 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 06:38:27 +0000 |
| commit | 43b32af5e7637e43d27948cf8772498d6a4d67b5 (patch) | |
| tree | 44307969f3fd45dc944b4fe29105cbe83fc3812b | |
| parent | 14fa2eb42feec5805b6df55d4eb2c1c5897649c5 (diff) | |
| download | chromium_src-43b32af5e7637e43d27948cf8772498d6a4d67b5.zip chromium_src-43b32af5e7637e43d27948cf8772498d6a4d67b5.tar.gz chromium_src-43b32af5e7637e43d27948cf8772498d6a4d67b5.tar.bz2 | |
Chromium side of WebKit merge 41286:41362.
Review URL: http://codereview.chromium.org/27376
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10786 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 17 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 1 |
4 files changed, 20 insertions, 4 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41286", + "webkit_revision": "41362", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@10731", + "/trunk/deps/third_party/WebKit@10784", "src/third_party/icu38": "/trunk/deps/third_party/icu38@10692", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 0b09edc..c5086e4 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@41286
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@41362
\ No newline at end of file diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index cd7c230..e3f2175 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -966,7 +966,7 @@ DEFER : LayoutTests/plugins/netscape-construct.html = FAIL // MERGE 37604:38097 REGRESSIONS pending/security/block-test.html = CRASH FAIL // New test. We should fix it, but it doesn't need to block the current release -DEFER : LayoutTests/http/tests/security/originHeader/origin-header-for-empty.html = FAIL PASS +DEFER : LayoutTests/http/tests/security/originHeader/origin-header-for-empty.html = FAIL TIMEOUT PASS MAC : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = FAIL TIMEOUT @@ -1857,3 +1857,18 @@ WIN : LayoutTests/editing/selection/move-by-line-001.html = FAIL WIN : LayoutTests/svg/batik/text/textFeatures.svg = FAIL WIN : LayoutTests/transitions/transition-end-event-container.html = FAIL PASS +// Regressions from the 41286:41362 merge. +LINUX WIN : LayoutTests/fast/forms/button-default-title.html = FAIL +LayoutTests/fast/forms/control-clip.html = FAIL +LayoutTests/fast/forms/select-baseline.html = FAIL +LayoutTests/fast/repaint/button-spurious-layout-hint.html = FAIL +LayoutTests/dom/html/level2/html/HTMLAppletElement01.html = TIMEOUT +WIN : LayoutTests/fast/dom/object-embed-plugin-scripting.html = TIMEOUT +LINUX WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = PASS TIMEOUT + +// New tests added in the 41286:41362 merge. +// TODO(pamg): See which only need re-baselining. +DEFER : LayoutTests/http/tests/xmlhttprequest/workers/methods-async.html = TIMEOUT +DEFER : LayoutTests/http/tests/xmlhttprequest/workers/methods.html = TIMEOUT +DEFER : LayoutTests/fast/layers/inline-dirty-z-order-lists.html = FAIL +DEFER : LayoutTests/transforms/no_transform_hit_testing.html = FAIL diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 4423c59..7c2e33c 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -3955,6 +3955,7 @@ # Some of these are used instead of Chromium platform files, see # the specific exclusions in the "sources!" list below. ['include', '/third_party/WebKit/WebCore/loader/archive/cf/LegacyWebArchive\\.cpp$'], + ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/ColorMac\\.mm$'], ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'], ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/GraphicsContextMac\\.mm$'], ['include', '/third_party/WebKit/WebCore/platform/mac/BlockExceptions\\.mm$'], |