Title: [149311] trunk/Source/WebCore
- Revision
- 149311
- Author
- [email protected]
- Date
- 2013-04-29 13:55:02 -0700 (Mon, 29 Apr 2013)
Log Message
Remove the last StorageSyncManager function
https://bugs.webkit.org/show_bug.cgi?id=115371
Reviewed by Sam Weinig.
Move the import scheduling to the StorageAreaSync constructor. Remove code to set m_importComplete to true
since that could only happen if the StorageSyncManager's thread is null which doesn't make any sense.
* storage/StorageAreaSync.cpp:
(WebCore::StorageAreaSync::StorageAreaSync):
(WebCore::StorageAreaSync::create):
* storage/StorageSyncManager.cpp:
* storage/StorageSyncManager.h:
(StorageSyncManager):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149310 => 149311)
--- trunk/Source/WebCore/ChangeLog 2013-04-29 20:28:34 UTC (rev 149310)
+++ trunk/Source/WebCore/ChangeLog 2013-04-29 20:55:02 UTC (rev 149311)
@@ -1,3 +1,20 @@
+2013-04-29 Anders Carlsson <[email protected]>
+
+ Remove the last StorageSyncManager function
+ https://bugs.webkit.org/show_bug.cgi?id=115371
+
+ Reviewed by Sam Weinig.
+
+ Move the import scheduling to the StorageAreaSync constructor. Remove code to set m_importComplete to true
+ since that could only happen if the StorageSyncManager's thread is null which doesn't make any sense.
+
+ * storage/StorageAreaSync.cpp:
+ (WebCore::StorageAreaSync::StorageAreaSync):
+ (WebCore::StorageAreaSync::create):
+ * storage/StorageSyncManager.cpp:
+ * storage/StorageSyncManager.h:
+ (StorageSyncManager):
+
2013-04-29 Daker Fernandes Pinheiro <[email protected]>
Remove unused method RenderMeter::valueRatio()
Modified: trunk/Source/WebCore/storage/StorageAreaSync.cpp (149310 => 149311)
--- trunk/Source/WebCore/storage/StorageAreaSync.cpp 2013-04-29 20:28:34 UTC (rev 149310)
+++ trunk/Source/WebCore/storage/StorageAreaSync.cpp 2013-04-29 20:55:02 UTC (rev 149311)
@@ -68,17 +68,16 @@
ASSERT(isMainThread());
ASSERT(m_storageArea);
ASSERT(m_syncManager);
+
+ // FIXME: If it can't import, then the default WebKit behavior should be that of private browsing,
+ // not silently ignoring it. https://bugs.webkit.org/show_bug.cgi?id=25894
+ m_syncManager->dispatch(bind(&StorageAreaSync::performImport, this));
}
PassRefPtr<StorageAreaSync> StorageAreaSync::create(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, const String& databaseIdentifier)
{
RefPtr<StorageAreaSync> area = adoptRef(new StorageAreaSync(storageSyncManager, storageArea, databaseIdentifier));
- // FIXME: If it can't import, then the default WebKit behavior should be that of private browsing,
- // not silently ignoring it. https://bugs.webkit.org/show_bug.cgi?id=25894
- if (!area->m_syncManager->scheduleImport(area.get()))
- area->m_importComplete = true;
-
return area.release();
}
Modified: trunk/Source/WebCore/storage/StorageSyncManager.cpp (149310 => 149311)
--- trunk/Source/WebCore/storage/StorageSyncManager.cpp 2013-04-29 20:28:34 UTC (rev 149310)
+++ trunk/Source/WebCore/storage/StorageSyncManager.cpp 2013-04-29 20:55:02 UTC (rev 149311)
@@ -90,11 +90,4 @@
}
}
-bool StorageSyncManager::scheduleImport(PassRefPtr<StorageAreaSync> area)
-{
- dispatch(bind(&StorageAreaSync::performImport, area));
-
- return m_thread;
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/storage/StorageSyncManager.h (149310 => 149311)
--- trunk/Source/WebCore/storage/StorageSyncManager.h 2013-04-29 20:28:34 UTC (rev 149310)
+++ trunk/Source/WebCore/storage/StorageSyncManager.h 2013-04-29 20:55:02 UTC (rev 149311)
@@ -42,8 +42,6 @@
static PassRefPtr<StorageSyncManager> create(const String& path);
~StorageSyncManager();
- bool scheduleImport(PassRefPtr<StorageAreaSync>);
-
void dispatch(const Function<void ()>&);
void close();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
