summaryrefslogtreecommitdiff
path: root/Source/WebKit/win/WebKitCOMAPI.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-22 09:09:45 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-22 09:10:13 +0100
commit470286ecfe79d59df14944e5b5d34630fc739391 (patch)
tree43983212872e06cebefd2ae474418fa2908ca54c /Source/WebKit/win/WebKitCOMAPI.cpp
parent23037105e948c2065da5a937d3a2396b0ff45c1e (diff)
downloadqtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/win/WebKitCOMAPI.cpp')
-rw-r--r--Source/WebKit/win/WebKitCOMAPI.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebKit/win/WebKitCOMAPI.cpp b/Source/WebKit/win/WebKitCOMAPI.cpp
index 4d8ff095b..3c6f0687b 100644
--- a/Source/WebKit/win/WebKitCOMAPI.cpp
+++ b/Source/WebKit/win/WebKitCOMAPI.cpp
@@ -44,6 +44,11 @@ struct CLSIDHash {
struct CLSIDHashTraits : WTF::GenericHashTraits<CLSID> {
static void constructDeletedValue(CLSID& slot) { slot = CLSID_NULL; }
static bool isDeletedValue(const CLSID& value) { return value == CLSID_NULL; }
+ // FIXME: This is a work around for the regression introducing in r130643 when running DRT in debug mode on Windows.
+ // Expanding the size of the hash table causes an assertion failure ASSERT(!isDeletedBucket) when reinserting items into the new table,
+ // presumably due to the collision issues described in r132302.
+ // This work around avoids the issue entirely simply by making sure that the table will not have to resize in running DRT.
+ static const int minimumTableSize = 64;
};
static COMPtr<IClassFactory> classFactory(const CLSID& clsid)