[webkit-changes] [140905] trunk/Source/WebKit2

Fri, 25 Jan 2013 23:57:51 -0800

Title: [140905] trunk/Source/WebKit2
Revision
140905
Author
[email protected]
Date
2013-01-25 23:59:35 -0800 (Fri, 25 Jan 2013)

Log Message

[EFL][WK2] Use C API inside ewk_database_manager and ewk_storage_manager
https://bugs.webkit.org/show_bug.cgi?id=107920

Reviewed by Benjamin Poulain.

Use C API inside ewk_database_manager and ewk_storage_manager instead
of accessing internal C++ classes directly, to avoid violating API
layering.

* UIProcess/API/efl/ewk_context.cpp:
(EwkContext::EwkContext):
* UIProcess/API/efl/ewk_database_manager.cpp:
(EwkDatabaseManager::EwkDatabaseManager):
(EwkDatabaseManager::getDatabaseOrigins):
* UIProcess/API/efl/ewk_database_manager_private.h:
(EwkDatabaseManager::create):
(EwkDatabaseManager):
* UIProcess/API/efl/ewk_storage_manager.cpp:
(EwkStorageManager::EwkStorageManager):
(EwkStorageManager::getStorageOrigins):
* UIProcess/API/efl/ewk_storage_manager_private.h:
(EwkStorageManager::create):
(EwkStorageManager):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (140904 => 140905)


--- trunk/Source/WebKit2/ChangeLog	2013-01-26 06:07:23 UTC (rev 140904)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-26 07:59:35 UTC (rev 140905)
@@ -1,3 +1,29 @@
+2013-01-25  Christophe Dumez  <[email protected]>
+
+        [EFL][WK2] Use C API inside ewk_database_manager and ewk_storage_manager
+        https://bugs.webkit.org/show_bug.cgi?id=107920
+
+        Reviewed by Benjamin Poulain.
+
+        Use C API inside ewk_database_manager and ewk_storage_manager instead
+        of accessing internal C++ classes directly, to avoid violating API
+        layering.
+
+        * UIProcess/API/efl/ewk_context.cpp:
+        (EwkContext::EwkContext):
+        * UIProcess/API/efl/ewk_database_manager.cpp:
+        (EwkDatabaseManager::EwkDatabaseManager):
+        (EwkDatabaseManager::getDatabaseOrigins):
+        * UIProcess/API/efl/ewk_database_manager_private.h:
+        (EwkDatabaseManager::create):
+        (EwkDatabaseManager):
+        * UIProcess/API/efl/ewk_storage_manager.cpp:
+        (EwkStorageManager::EwkStorageManager):
+        (EwkStorageManager::getStorageOrigins):
+        * UIProcess/API/efl/ewk_storage_manager_private.h:
+        (EwkStorageManager::create):
+        (EwkStorageManager):
+
 2013-01-25  Andreas Kling  <[email protected]>
 
         [Mac] Defer loading the Web Inspector bundle until it's necessary.

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (140904 => 140905)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp	2013-01-26 06:07:23 UTC (rev 140904)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp	2013-01-26 07:59:35 UTC (rev 140905)
@@ -26,6 +26,7 @@
 #include "NetworkInfoProvider.h"
 #include "RequestManagerClientEfl.h"
 #include "WKAPICast.h"
+#include "WKContext.h"
 #include "WKContextSoup.h"
 #include "WKNumber.h"
 #include "WKRetainPtr.h"
@@ -65,8 +66,8 @@
 
 EwkContext::EwkContext(PassRefPtr<WebContext> context)
     : m_context(context)
-    , m_databaseManager(EwkDatabaseManager::create(m_context))
-    , m_storageManager(EwkStorageManager::create(m_context))
+    , m_databaseManager(EwkDatabaseManager::create(WKContextGetDatabaseManager(toAPI(m_context.get()))))
+    , m_storageManager(EwkStorageManager::create(WKContextGetKeyValueStorageManager(toAPI(m_context.get()))))
 #if ENABLE(BATTERY_STATUS)
     , m_batteryProvider(BatteryProvider::create(m_context))
 #endif

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager.cpp (140904 => 140905)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager.cpp	2013-01-26 06:07:23 UTC (rev 140904)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager.cpp	2013-01-26 07:59:35 UTC (rev 140905)
@@ -28,21 +28,21 @@
 
 #include "WKAPICast.h"
 #include "WKArray.h"
-#include "WKDatabaseManager.h"
-#include "WebDatabaseManagerProxy.h"
 #include "ewk_database_manager_private.h"
 #include "ewk_error_private.h"
 #include "ewk_security_origin_private.h"
 
 using namespace WebKit;
 
-EwkDatabaseManager::EwkDatabaseManager(WebDatabaseManagerProxy* databaseManager)
+EwkDatabaseManager::EwkDatabaseManager(WKDatabaseManagerRef databaseManager)
     : m_databaseManager(databaseManager)
-{ }
+{
+    ASSERT(databaseManager);
+}
 
 void EwkDatabaseManager::getDatabaseOrigins(WKDatabaseManagerGetDatabaseOriginsFunction callback, void* context) const
 {
-    WKDatabaseManagerGetDatabaseOrigins(toAPI(m_databaseManager.get()), context, callback);
+    WKDatabaseManagerGetDatabaseOrigins(m_databaseManager.get(), context, callback);
 }
 
 Eina_List* EwkDatabaseManager::createOriginList(WKArrayRef origins) const

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager_private.h (140904 => 140905)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager_private.h	2013-01-26 06:07:23 UTC (rev 140904)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager_private.h	2013-01-26 07:59:35 UTC (rev 140905)
@@ -27,8 +27,7 @@
 #define ewk_database_manager_private_h
 
 #include "WKDatabaseManager.h"
-#include "WebContext.h"
-#include "WebDatabaseManagerProxy.h"
+#include "WKRetainPtr.h"
 #include "ewk_security_origin_private.h"
 #include <WebKit2/WKBase.h>
 #include <wtf/PassOwnPtr.h>
@@ -37,19 +36,19 @@
 
 class EwkDatabaseManager {
 public:
-    static PassOwnPtr<EwkDatabaseManager> create(PassRefPtr<WebContext> context)
+    static PassOwnPtr<EwkDatabaseManager> create(WKDatabaseManagerRef databaseManager)
     {
-        ASSERT(context);
-        return adoptPtr(new EwkDatabaseManager(context->supplement<WebDatabaseManagerProxy>()));
+        ASSERT(databaseManager);
+        return adoptPtr(new EwkDatabaseManager(databaseManager));
     }
 
     Eina_List* createOriginList(WKArrayRef wkList) const;
     void getDatabaseOrigins(WKDatabaseManagerGetDatabaseOriginsFunction callback, void* context) const;
 
 private:
-    explicit EwkDatabaseManager(WebDatabaseManagerProxy*);
+    explicit EwkDatabaseManager(WKDatabaseManagerRef);
 
-    RefPtr<WebDatabaseManagerProxy> m_databaseManager;
+    WKRetainPtr<WKDatabaseManagerRef> m_databaseManager;
     mutable HashMap<WKSecurityOriginRef, RefPtr<EwkSecurityOrigin> > m_wrapperCache;
 };
 #endif // ewk_database_manager_private_h

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp (140904 => 140905)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp	2013-01-26 06:07:23 UTC (rev 140904)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp	2013-01-26 07:59:35 UTC (rev 140905)
@@ -28,20 +28,21 @@
 
 #include "WKAPICast.h"
 #include "WKArray.h"
-#include "WebKeyValueStorageManagerProxy.h"
 #include "ewk_error_private.h"
 #include "ewk_security_origin_private.h"
 #include "ewk_storage_manager_private.h"
 
 using namespace WebKit;
 
-EwkStorageManager::EwkStorageManager(WebKeyValueStorageManagerProxy* storageManagerProxy)
-    : m_storageManager(storageManagerProxy)
-{ }
+EwkStorageManager::EwkStorageManager(WKKeyValueStorageManagerRef storageManager)
+    : m_storageManager(storageManager)
+{
+    ASSERT(storageManager);
+}
 
 void EwkStorageManager::getStorageOrigins(void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback) const
 {
-    WKKeyValueStorageManagerGetKeyValueStorageOrigins(toAPI(m_storageManager.get()), context, callback);
+    WKKeyValueStorageManagerGetKeyValueStorageOrigins(m_storageManager.get(), context, callback);
 }
 
 Eina_List* EwkStorageManager::createOriginList(WKArrayRef origins) const

Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h (140904 => 140905)


--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h	2013-01-26 06:07:23 UTC (rev 140904)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h	2013-01-26 07:59:35 UTC (rev 140905)
@@ -27,8 +27,7 @@
 #define ewk_storage_manager_private_h
 
 #include "WKKeyValueStorageManager.h"
-#include "WebContext.h"
-#include "WebKeyValueStorageManagerProxy.h"
+#include "WKRetainPtr.h"
 #include "ewk_security_origin_private.h"
 #include <WebKit2/WKBase.h>
 #include <wtf/PassOwnPtr.h>
@@ -37,19 +36,19 @@
 
 class EwkStorageManager {
 public:
-    static PassOwnPtr<EwkStorageManager> create(PassRefPtr<WebContext> context)
+    static PassOwnPtr<EwkStorageManager> create(WKKeyValueStorageManagerRef storageManager)
     {
-        ASSERT(context);
-        return adoptPtr(new EwkStorageManager(context->supplement<WebKeyValueStorageManagerProxy>()));
+        ASSERT(storageManager);
+        return adoptPtr(new EwkStorageManager(storageManager));
     }
 
     Eina_List* createOriginList(WKArrayRef wkList) const;
     void getStorageOrigins(void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback) const;
 
 private:
-    explicit EwkStorageManager(WebKeyValueStorageManagerProxy* storageManagerProxy);
+    explicit EwkStorageManager(WKKeyValueStorageManagerRef);
 
-    RefPtr<WebKeyValueStorageManagerProxy> m_storageManager;
+    WKRetainPtr<WKKeyValueStorageManagerRef> m_storageManager;
     mutable HashMap<WKSecurityOriginRef, RefPtr<EwkSecurityOrigin> > m_wrapperCache;
 };
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to