diff options
author | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 21:03:19 +0000 |
---|---|---|
committer | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 21:03:19 +0000 |
commit | dbf5e6c9053bf8e4c5fb08a1ca3005636380b5bb (patch) | |
tree | 1e3578945b576d886be3fc78ee2be5533fabc85d | |
parent | 601479840d0368bec3fe9e0ebe7b46e599c1a6f0 (diff) | |
download | chromium_src-dbf5e6c9053bf8e4c5fb08a1ca3005636380b5bb.zip chromium_src-dbf5e6c9053bf8e4c5fb08a1ca3005636380b5bb.tar.gz chromium_src-dbf5e6c9053bf8e4c5fb08a1ca3005636380b5bb.tar.bz2 |
WebKit merge 48610:48642.
BUG=none.
Test=Covered by layout tests.
Review URL: http://codereview.chromium.org/208065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26859 0039d316-1c4b-4281-b951-d872f2087c98
3 files changed, 7 insertions, 4 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "48610", + "webkit_revision": "48642", "ffmpeg_revision": "26428", } diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt deleted file mode 100644 index 74ecc31..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt +++ /dev/null @@ -1 +0,0 @@ -This test isn't expected to pass. See test expectations. diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 77ed886..b5b0f670 100755 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1354,7 +1354,7 @@ BUG10667 MAC : chrome/plugins/nested-plugin-objects.html = FAIL BUG10667 MAC : chrome/plugins/refcount-leaks.html = FAIL BUG10667 MAC : chrome/plugins/return-npobject.html = FAIL BUG10667 MAC : chrome/plugins/script-object-invoke.html = FAIL -BUG10667 MAC : pending/plugins/iframe-shims.html = FAIL +BUG10667 MAC : LayoutTests/plugins/iframe-shims.html = FAIL // NEW FOR MERGE 36102:37604 @@ -2282,7 +2282,6 @@ BUG21764 : LayoutTests/fast/forms/ValidityState-typeMismatch-url.html = FAIL // New test added in r48336 (V8 bug) BUG21767 : LayoutTests/fast/js/Object-keys.html = FAIL -BUG21767 : LayoutTests/http/tests/security/cross-frame-access-enumeration.html = TIMEOUT // WK roll to 48371 BUG21841 MAC : LayoutTests/plugins/destroy-during-npp-new.html = FAIL @@ -2335,3 +2334,8 @@ BUG22552 MAC LINUX : LayoutTests/fast/events/drag-in-frames.html = CRASH // WebKit merge 48500:48585, due to newly added support for MathML. BUG22554 SKIP : LayoutTests/mathml = FAIL + +// WebKit merge 48610:48642 +BUG_PAUL : LayoutTests/fast/dom/HTMLImageElement/image-loading-gc.html = TIMEOUT +BUG_PAUL LINUX : LayoutTests/editing/selection/click-outside-editable-div.html = FAIL +BUG_PAUL LINUX : LayoutTests/fast/events/frame-tab-focus.html = FAIL |