diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 19:29:38 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 19:29:38 +0000 |
| commit | 773bcf71f43cb1d193054ac0f511e6bb7aaa3cb0 (patch) | |
| tree | c9cd0ecd4fea7d7b03a4dad0da01e85ab3f4db12 | |
| parent | ed8b1b805203b6ccdb5517d0c30cc689dde65e98 (diff) | |
| download | chromium_src-773bcf71f43cb1d193054ac0f511e6bb7aaa3cb0.zip chromium_src-773bcf71f43cb1d193054ac0f511e6bb7aaa3cb0.tar.gz chromium_src-773bcf71f43cb1d193054ac0f511e6bb7aaa3cb0.tar.bz2 | |
Revert 11539 restoring 11548
Mac failures seem to be flaky, and not caused by 11548
tbr=davemoore
Review URL: http://codereview.chromium.org/42141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11563 0039d316-1c4b-4281-b951-d872f2087c98
| -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 55e9ee1..79553c2 100644 --- a/webkit/port/bindings/v8/V8SVGPODTypeWrapper.h +++ b/webkit/port/bindings/v8/V8SVGPODTypeWrapper.h @@ -262,7 +262,10 @@ template<typename PODType, typename PODTypeCreator> struct PODTypeWrapperCacheInfoHash { static unsigned hash(const PODTypeWrapperCacheInfo<PODType, PODTypeCreator>& info) { - return StringImpl::computeHash((::UChar*) &info, sizeof(PODTypeWrapperCacheInfo<PODType, PODTypeCreator>) / sizeof(::UChar)); + 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); } 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 eefd049..f5125cb 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1749,9 +1749,6 @@ 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 |