Commit 6be996ee authored by beidson@apple.com's avatar beidson@apple.com

Reviewed and landed by Brady Eidson.

Patch by Anton D'Auria <adauria@apple.com> on 2011-03-13
Invalid assertion in StorageTracker - PageGroup::numberOfPageGroups() == 1
https://bugs.webkit.org/show_bug.cgi?id=56240

This assertion is invalid until LocalStorage is either global or is isolated by PageGroup.

* storage/StorageTracker.cpp:
(WebCore::StorageTracker::origins):
(WebCore::StorageTracker::deleteAllOrigins):
(WebCore::StorageTracker::deleteOrigin):



git-svn-id: svn://svn.chromium.org/blink/trunk@81002 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e0e67015
2011-03-13 Anton D'Auria <adauria@apple.com>
Reviewed and landed by Brady Eidson.
Invalid assertion in StorageTracker - PageGroup::numberOfPageGroups() == 1
https://bugs.webkit.org/show_bug.cgi?id=56240
This assertion is invalid until LocalStorage is either global or is isolated by PageGroup.
* storage/StorageTracker.cpp:
(WebCore::StorageTracker::origins):
(WebCore::StorageTracker::deleteAllOrigins):
(WebCore::StorageTracker::deleteOrigin):
2011-03-13 Pratik Solanki <psolanki@apple.com>
Reviewed by Dan Bernstein.
......
......@@ -283,10 +283,6 @@ void StorageTracker::origins(Vector<RefPtr<SecurityOrigin> >& result)
if (!m_isActive)
return;
// FIXME: StorageTracker is currently a singleton and should be assumed
// to have undefined behavior with more than one PageGroup.
ASSERT(PageGroup::numberOfPageGroups() == 1);
MutexLocker lockOrigins(m_originSetGuard);
OriginSet::const_iterator end = m_originSet.end();
......@@ -303,10 +299,6 @@ void StorageTracker::deleteAllOrigins()
if (!m_isActive)
return;
// FIXME: StorageTracker is currently a singleton and should be assumed
// to have undefined behavior with more than one PageGroup.
ASSERT(PageGroup::numberOfPageGroups() == 1);
{
MutexLocker lockOrigins(m_originSetGuard);
willDeleteAllOrigins();
......@@ -368,10 +360,6 @@ void StorageTracker::deleteOrigin(SecurityOrigin* origin)
if (!m_isActive)
return;
// FIXME: StorageTracker is currently a singleton and should be assumed
// to have undefined behavior with more than one PageGroup.
ASSERT(PageGroup::numberOfPageGroups() == 1);
// Before deleting database, we need to clear in-memory local storage data
// in StorageArea, and to close the StorageArea db. It's possible for an
// item to be added immediately after closing the db and cause StorageAreaSync
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment