diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 17:38:46 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 17:38:46 +0000 |
| commit | 310cf7bf7b505c85a5c18a42ad2d05c56bc7d301 (patch) | |
| tree | 4880e7f57a9fbcd271db7dec7cc979908f3cd960 /webkit | |
| parent | 210d2de6ed1ddbe03ac992abd3cea8dbd8fc7292 (diff) | |
| download | chromium_src-310cf7bf7b505c85a5c18a42ad2d05c56bc7d301.zip chromium_src-310cf7bf7b505c85a5c18a42ad2d05c56bc7d301.tar.gz chromium_src-310cf7bf7b505c85a5c18a42ad2d05c56bc7d301.tar.bz2 | |
Revert 11539 which increased webkit failures on the mac
tbr=davemoore
Review URL: http://codereview.chromium.org/42134
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/port/bindings/v8/V8SVGPODTypeWrapper.h | 5 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/port/bindings/v8/V8SVGPODTypeWrapper.h b/webkit/port/bindings/v8/V8SVGPODTypeWrapper.h index 79553c2..55e9ee1 100644 --- a/webkit/port/bindings/v8/V8SVGPODTypeWrapper.h +++ b/webkit/port/bindings/v8/V8SVGPODTypeWrapper.h @@ -262,10 +262,7 @@ template<typename PODType, typename PODTypeCreator> struct PODTypeWrapperCacheInfoHash { static unsigned hash(const PODTypeWrapperCacheInfo<PODType, PODTypeCreator>& info) { - unsigned creator = reinterpret_cast<unsigned>(info.creator); - unsigned getter = reinterpret_cast<unsigned>(*(void**)&info.getter); - unsigned setter = reinterpret_cast<unsigned>(*(void**)&info.setter); - return (creator * 13) + getter ^ (setter >> 2); + return StringImpl::computeHash((::UChar*) &info, sizeof(PODTypeWrapperCacheInfo<PODType, PODTypeCreator>) / sizeof(::UChar)); } static bool equal(const PODTypeWrapperCacheInfo<PODType, PODTypeCreator>& a, const PODTypeWrapperCacheInfo<PODType, PODTypeCreator>& b) diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index f5125cb..eefd049 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1749,6 +1749,9 @@ SKIP DEFER : LayoutTests/fast/block/float/crash-on-absolute-positioning.html = F // a revert. WIN LINUX : LayoutTests/fast/repaint/transform-replaced-shadows.html = FAIL +DEFER WIN : LayoutTests/svg/dom/animated-tearoff-equality.xhtml = FAIL +DEFER WIN : LayoutTests/svg/dom/animated-tearoff-lifespan.xhtml = FAIL + // Started failing at r11441:11442, which has no code changes! WIN DEBUG : LayoutTests/editing/execCommand/paste-1.html = FAIL |