Changeset 91943 in webkit

Timestamp:

Jul 28, 2011, 12:27:11 PM (14 years ago)

Author:

beidson@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=65323
r91931 causes NOTREACHED to be hit via StorageTracker

Change the meaning of the "has been initialized" flag to "needs initialization", and only set it to true
if the ::initializeTracker() method has been called.

Reviewed by Sam Weinig.

• storage/StorageTracker.cpp:

(WebCore::StorageTracker::initializeTracker): Set m_needsInitialization to true since the calling WebKit port expects full

initialization instead of a dummy tracker.

(WebCore::StorageTracker::internalInitialize):
(WebCore::StorageTracker::tracker): Only initialize the tracker if it was created in the above initializeTracker().
(WebCore::StorageTracker::StorageTracker):

• storage/StorageTracker.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• storage/StorageTracker.cpp (modified) (4 diffs)
• storage/StorageTracker.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-28  Brady Eidson  <beidson@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=65323
+        r91931 causes NOTREACHED to be hit via StorageTracker
+
+        Change the meaning of the "has been initialized" flag to "needs initialization", and only set it to true
+        if the ::initializeTracker() method has been called.
+
+        Reviewed by Sam Weinig.
+
+        * storage/StorageTracker.cpp:
+        (WebCore::StorageTracker::initializeTracker): Set m_needsInitialization to true since the calling WebKit port expects full
+          initialization instead of a dummy tracker.
+        (WebCore::StorageTracker::internalInitialize):
+        (WebCore::StorageTracker::tracker): Only initialize the tracker if it was created in the above initializeTracker().
+        (WebCore::StorageTracker::StorageTracker):
+        * storage/StorageTracker.h:
+
 2011-07-28  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/storage/StorageTracker.cpp

@@ -58 +58 @@
     
     storageTracker->m_client = client;
+    storageTracker->m_needsInitialization = true;
 }
 
@@ -73 +74 @@
     storageTracker->importOriginIdentifiers();
     
-    m_isInitialized = true;
+    m_needsInitialization = false;
 }
 
@@ -80 +81 @@
     if (!storageTracker)
         storageTracker = new StorageTracker("");
-    if (!storageTracker->m_isInitialized)
+    if (storageTracker->m_needsInitialization)
         storageTracker->internalInitialize();
     
@@ -91 +92 @@
     , m_thread(LocalStorageThread::create())
     , m_isActive(false)
-    , m_isInitialized(false)
+    , m_needsInitialization(false)
 {
 }

trunk/Source/WebCore/storage/StorageTracker.h

@@ -113 +113 @@
     
     bool m_isActive;
-    bool m_isInitialized;
+    bool m_needsInitialization;
 };