Title: [134472] trunk/Source/WebKit/win
- Revision
- 134472
- Author
- roger_f...@apple.com
- Date
- 2012-11-13 13:11:24 -0800 (Tue, 13 Nov 2012)
Log Message
REGRESSION(r130643): Assertion failure when running DRT in debug mode
https://bugs.webkit.org/show_bug.cgi?id=101791
Reviewed by Darin Adler.
When running DRT in debug mode, we hit an assertion failure in initializing the WebKit instance.
This failure started occuring in r130643 and this work around follows the work around in r132302.
* WebKitCOMAPI.cpp:
(CLSIDHashTraits):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (134471 => 134472)
--- trunk/Source/WebKit/win/ChangeLog 2012-11-13 21:10:37 UTC (rev 134471)
+++ trunk/Source/WebKit/win/ChangeLog 2012-11-13 21:11:24 UTC (rev 134472)
@@ -1,5 +1,18 @@
2012-11-12 Roger Fong <roger_f...@apple.com>
+ REGRESSION(r130643): Assertion failure when running DRT in debug mode
+ https://bugs.webkit.org/show_bug.cgi?id=101791
+
+ Reviewed by Darin Adler.
+
+ When running DRT in debug mode, we hit an assertion failure in initializing the WebKit instance.
+ This failure started occuring in r130643 and this work around follows the work around in r132302.
+
+ * WebKitCOMAPI.cpp:
+ (CLSIDHashTraits):
+
+2012-11-12 Roger Fong <roger_f...@apple.com>
+
Web Inspector: Fix docking behaviour on Windows.
https://bugs.webkit.org/show_bug.cgi?id=101978
Modified: trunk/Source/WebKit/win/WebKitCOMAPI.cpp (134471 => 134472)
--- trunk/Source/WebKit/win/WebKitCOMAPI.cpp 2012-11-13 21:10:37 UTC (rev 134471)
+++ trunk/Source/WebKit/win/WebKitCOMAPI.cpp 2012-11-13 21:11:24 UTC (rev 134472)
@@ -44,6 +44,11 @@
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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
