Log Message
Possible ASSERT(!storageTracker) in Lazily Initialized StorageTracker https://bugs.webkit.org/show_bug.cgi?id=67957
Reviewed by Darin Adler. The storageTracker singleton may already have been created through StorageTracker::tracker before initializeTracker gets called. Update the ASSERT in this case to check that there is no client for the tracker. No test, this depends on how the port initializes the tracker. * storage/StorageTracker.cpp: (WebCore::StorageTracker::initializeTracker):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95012 => 95013)
--- trunk/Source/WebCore/ChangeLog 2011-09-13 04:15:59 UTC (rev 95012)
+++ trunk/Source/WebCore/ChangeLog 2011-09-13 04:41:42 UTC (rev 95013)
@@ -1,3 +1,20 @@
+2011-09-12 Joseph Pecoraro <joep...@webkit.org>
+
+ Possible ASSERT(!storageTracker) in Lazily Initialized StorageTracker
+ https://bugs.webkit.org/show_bug.cgi?id=67957
+
+ Reviewed by Darin Adler.
+
+ The storageTracker singleton may already have been created
+ through StorageTracker::tracker before initializeTracker
+ gets called. Update the ASSERT in this case to check that
+ there is no client for the tracker.
+
+ No test, this depends on how the port initializes the tracker.
+
+ * storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::initializeTracker):
+
2011-09-12 Adam Klein <ad...@chromium.org>
Fix out-of-bounds access in Gradient::sortStopsIfNecessary
Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (95012 => 95013)
--- trunk/Source/WebCore/storage/StorageTracker.cpp 2011-09-13 04:15:59 UTC (rev 95012)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp 2011-09-13 04:41:42 UTC (rev 95013)
@@ -51,7 +51,7 @@
void StorageTracker::initializeTracker(const String& storagePath, StorageTrackerClient* client)
{
ASSERT(isMainThread());
- ASSERT(!storageTracker);
+ ASSERT(!storageTracker || !storageTracker->m_client);
if (!storageTracker)
storageTracker = new StorageTracker(storagePath);
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
