Remove ENABLE_UI_PROCESS_STORAGE define, it's always 1.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 Dec 2014 20:30:18 +0000 (20:30 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 Dec 2014 20:30:18 +0000 (20:30 +0000)
Rubber-stamped by Beth Dakin.

* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::localStorageNamespace):
(WebKit::WebPlatformStrategies::transientLocalStorageNamespace):
(WebKit::WebPlatformStrategies::sessionStorageNamespace):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176739 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

index c6863f0..f1bf9b4 100644 (file)
@@ -1,5 +1,16 @@
 2014-12-03  Anders Carlsson  <andersca@apple.com>
 
+        Remove ENABLE_UI_PROCESS_STORAGE define, it's always 1.
+
+        Rubber-stamped by Beth Dakin.
+
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebKit::WebPlatformStrategies::localStorageNamespace):
+        (WebKit::WebPlatformStrategies::transientLocalStorageNamespace):
+        (WebKit::WebPlatformStrategies::sessionStorageNamespace):
+
+2014-12-03  Anders Carlsson  <andersca@apple.com>
+
         Use an @autoreleasepool instead of NSAutoreleasePool.
 
         Rubber-stamped by Tim Horton.
index ee56978..e890d17 100644 (file)
@@ -68,9 +68,6 @@
 #include "WebResourceLoadScheduler.h"
 #endif
 
-// FIXME: Remove this #ifdef once we don't need the ability to turn the feature off.
-#define ENABLE_UI_PROCESS_STORAGE 1
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -340,31 +337,19 @@ void WebPlatformStrategies::populatePluginCache()
 
 PassRefPtr<StorageNamespace> WebPlatformStrategies::localStorageNamespace(PageGroup* pageGroup)
 {
-#if ENABLE(UI_PROCESS_STORAGE)
     return StorageNamespaceImpl::createLocalStorageNamespace(pageGroup);
-#else
-    return StorageStrategy::localStorageNamespace(pageGroup);
-#endif
 }
 
 PassRefPtr<StorageNamespace> WebPlatformStrategies::transientLocalStorageNamespace(PageGroup* pageGroup, SecurityOrigin*securityOrigin)
 {
-#if ENABLE(UI_PROCESS_STORAGE)
     UNUSED_PARAM(securityOrigin);
     // FIXME: This could be more clever and made to work across processes.
     return StorageStrategy::sessionStorageNamespace(*pageGroup->pages().begin());
-#else
-    return StorageStrategy::transientLocalStorageNamespace(pageGroup, securityOrigin);
-#endif
 }
 
 PassRefPtr<StorageNamespace> WebPlatformStrategies::sessionStorageNamespace(Page* page)
 {
-#if ENABLE(UI_PROCESS_STORAGE)
     return StorageNamespaceImpl::createSessionStorageNamespace(WebPage::fromCorePage(page));
-#else
-    return StorageStrategy::sessionStorageNamespace(page);
-#endif
 }
 
 #if PLATFORM(COCOA)