Diff
Modified: trunk/Source/WebKit2/ChangeLog (136484 => 136485)
--- trunk/Source/WebKit2/ChangeLog 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-04 08:33:03 UTC (rev 136485)
@@ -1,3 +1,60 @@
+2012-12-04 Jaehun Lim <[email protected]>
+
+ [EFL][WK2] Use consistent class names inside Ewk classes
+ https://bugs.webkit.org/show_bug.cgi?id=103015
+
+ Reviewed by Gyuyoung Kim.
+
+ WebKit EFL doesn't use '_' in class names.
+ This patch removes the remaining uses of '_' inside Ewk classes.
+
+ * UIProcess/API/efl/EwkViewImpl.cpp:
+ (EwkViewImpl::EwkViewImpl):
+ (EwkViewImpl::~EwkViewImpl):
+ (EwkViewImpl::informIconChange):
+ (EwkViewImpl::requestColorPicker):
+ (EwkViewImpl::requestPopupMenu):
+ * UIProcess/API/efl/ewk_back_forward_list.cpp:
+ (EwkBackForwardList::nextItem):
+ (EwkBackForwardList::previousItem):
+ (EwkBackForwardList::currentItem):
+ (EwkBackForwardList::itemAt):
+ (EwkBackForwardList::getFromCacheOrCreate):
+ (EwkBackForwardList::createEinaList):
+ * UIProcess/API/efl/ewk_back_forward_list_private.h:
+ (EwkBackForwardList):
+ * UIProcess/API/efl/ewk_context.cpp:
+ (EwkContext::EwkContext):
+ (EwkContext::cookieManager):
+ (EwkContext::databaseManager):
+ (EwkContext::ensureFaviconDatabase):
+ (EwkContext::faviconDatabase):
+ (EwkContext::storageManager):
+ * UIProcess/API/efl/ewk_context_private.h:
+ (EwkContext):
+ * UIProcess/API/efl/ewk_cookie_manager.cpp:
+ (EwkCookieManager::cookiesDidChange):
+ (getAcceptPolicyCallback):
+ (getHostnamesWithCookiesCallback):
+ * UIProcess/API/efl/ewk_cookie_manager_private.h:
+ (EwkCookieManager::create):
+ * UIProcess/API/efl/ewk_database_manager.cpp:
+ (EwkDatabaseManager::createOriginList):
+ (getDatabaseOriginsCallback):
+ * UIProcess/API/efl/ewk_database_manager_private.h:
+ (EwkDatabaseManager):
+ * UIProcess/API/efl/ewk_favicon_database.cpp:
+ (EwkFaviconDatabase::didChangeIconForPageURL):
+ (EwkFaviconDatabase::iconDataReadyForPageURL):
+ * UIProcess/API/efl/ewk_popup_menu.cpp:
+ (EwkPopupMenu::EwkPopupMenu):
+ (EwkPopupMenu::~EwkPopupMenu):
+ * UIProcess/API/efl/ewk_storage_manager.cpp:
+ (EwkStorageManager::createOriginList):
+ (getStorageOriginsCallback):
+ * UIProcess/API/efl/ewk_storage_manager_private.h:
+ (EwkStorageManager):
+
2012-12-03 Huang Dongsung <[email protected]>
Coordinated Graphics: Reorder messages to LayerTreeCoordinatorProxy
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2012-12-04 08:33:03 UTC (rev 136485)
@@ -129,11 +129,11 @@
#if ENABLE(VIBRATION)
, m_vibrationClient(VibrationClientEfl::create(this))
#endif
- , m_backForwardList(Ewk_Back_Forward_List::create(toAPI(m_pageProxy->backForwardList())))
+ , m_backForwardList(EwkBackForwardList::create(toAPI(m_pageProxy->backForwardList())))
#if USE(TILED_BACKING_STORE)
, m_scaleFactor(1)
#endif
- , m_settings(Ewk_Settings::create(this))
+ , m_settings(EwkSettings::create(this))
, m_cursorIdentifier(0)
, m_mouseEventsEnabled(false)
#if ENABLE(TOUCH_EVENTS)
@@ -171,7 +171,7 @@
setMouseEventsEnabled(true);
// Listen for favicon changes.
- Ewk_Favicon_Database* iconDatabase = m_context->faviconDatabase();
+ EwkFaviconDatabase* iconDatabase = m_context->faviconDatabase();
ASSERT(iconDatabase);
iconDatabase->watchChanges(IconChangeCallbackData(EwkViewImpl::onFaviconChanged, this));
@@ -184,7 +184,7 @@
m_pageProxy->close();
// Unregister icon change callback.
- Ewk_Favicon_Database* iconDatabase = m_context->faviconDatabase();
+ EwkFaviconDatabase* iconDatabase = m_context->faviconDatabase();
ASSERT(iconDatabase);
iconDatabase->unwatchChanges(EwkViewImpl::onFaviconChanged);
@@ -616,7 +616,7 @@
*/
void EwkViewImpl::informIconChange()
{
- Ewk_Favicon_Database* iconDatabase = m_context->faviconDatabase();
+ EwkFaviconDatabase* iconDatabase = m_context->faviconDatabase();
ASSERT(iconDatabase);
m_faviconURL = ewk_favicon_database_icon_url_get(iconDatabase, m_url);
@@ -718,7 +718,7 @@
if (m_colorPicker)
dismissColorPicker();
- m_colorPicker = Ewk_Color_Picker::create(listener, color);
+ m_colorPicker = EwkColorPicker::create(listener, color);
sd->api->input_picker_color_request(sd, m_colorPicker.get());
}
@@ -790,7 +790,7 @@
if (m_popupMenu)
closePopupMenu();
- m_popupMenu = Ewk_Popup_Menu::create(this, popupMenuProxy, items, selectedIndex);
+ m_popupMenu = EwkPopupMenu::create(this, popupMenuProxy, items, selectedIndex);
sd->api->popup_menu_show(sd, rect, static_cast<Ewk_Text_Direction>(textDirection), pageScaleFactor, m_popupMenu.get());
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list.cpp (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list.cpp 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list.cpp 2012-12-04 08:33:03 UTC (rev 136485)
@@ -39,22 +39,22 @@
: m_wkList(listRef)
{ }
-Ewk_Back_Forward_List_Item* EwkBackForwardList::nextItem() const
+EwkBackForwardListItem* EwkBackForwardList::nextItem() const
{
return getFromCacheOrCreate(WKBackForwardListGetForwardItem(m_wkList.get()));
}
-Ewk_Back_Forward_List_Item* EwkBackForwardList::previousItem() const
+EwkBackForwardListItem* EwkBackForwardList::previousItem() const
{
return getFromCacheOrCreate(WKBackForwardListGetBackItem(m_wkList.get()));
}
-Ewk_Back_Forward_List_Item* EwkBackForwardList::currentItem() const
+EwkBackForwardListItem* EwkBackForwardList::currentItem() const
{
return getFromCacheOrCreate(WKBackForwardListGetCurrentItem(m_wkList.get()));
}
-Ewk_Back_Forward_List_Item* EwkBackForwardList::itemAt(int index) const
+EwkBackForwardListItem* EwkBackForwardList::itemAt(int index) const
{
return getFromCacheOrCreate(WKBackForwardListGetItemAtIndex(m_wkList.get(), index));
}
@@ -84,12 +84,12 @@
return adoptWK(WKBackForwardListCopyForwardListWithLimit(m_wkList.get(), limit));
}
-Ewk_Back_Forward_List_Item* EwkBackForwardList::getFromCacheOrCreate(WKBackForwardListItemRef wkItem) const
+EwkBackForwardListItem* EwkBackForwardList::getFromCacheOrCreate(WKBackForwardListItemRef wkItem) const
{
if (!wkItem)
return 0;
- RefPtr<Ewk_Back_Forward_List_Item> item = m_wrapperCache.get(wkItem);
+ RefPtr<EwkBackForwardListItem> item = m_wrapperCache.get(wkItem);
if (!item) {
item = EwkBackForwardListItem::create(wkItem);
m_wrapperCache.set(wkItem, item);
@@ -108,7 +108,7 @@
const size_t count = WKArrayGetSize(wkList);
for (size_t i = 0; i < count; ++i) {
WKBackForwardListItemRef wkItem = static_cast<WKBackForwardListItemRef>(WKArrayGetItemAtIndex(wkList, i));
- Ewk_Back_Forward_List_Item* item = getFromCacheOrCreate(wkItem);
+ EwkBackForwardListItem* item = getFromCacheOrCreate(wkItem);
result = eina_list_append(result, ewk_object_ref(item));
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_private.h (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_private.h 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_private.h 2012-12-04 08:33:03 UTC (rev 136485)
@@ -27,13 +27,12 @@
#define ewk_back_forward_list_private_h
#include "WKRetainPtr.h"
-#include "ewk_back_forward_list_item.h"
#include "ewk_back_forward_list_item_private.h"
#include <WebKit2/WKBase.h>
#include <wtf/HashMap.h>
#include <wtf/PassOwnPtr.h>
-typedef HashMap<WKBackForwardListItemRef, RefPtr<Ewk_Back_Forward_List_Item> > ItemsMap;
+typedef HashMap<WKBackForwardListItemRef, RefPtr<EwkBackForwardListItem> > ItemsMap;
class EwkBackForwardList {
public:
@@ -42,10 +41,10 @@
return adoptPtr(new EwkBackForwardList(listRef));
}
- Ewk_Back_Forward_List_Item* previousItem() const;
- Ewk_Back_Forward_List_Item* currentItem() const;
- Ewk_Back_Forward_List_Item* nextItem() const;
- Ewk_Back_Forward_List_Item* itemAt(int index) const;
+ EwkBackForwardListItem* previousItem() const;
+ EwkBackForwardListItem* currentItem() const;
+ EwkBackForwardListItem* nextItem() const;
+ EwkBackForwardListItem* itemAt(int index) const;
WKRetainPtr<WKArrayRef> backList(int limit = -1) const;
WKRetainPtr<WKArrayRef> forwardList(int limit = -1) const;
@@ -57,7 +56,7 @@
private:
explicit EwkBackForwardList(WKBackForwardListRef listRef);
- Ewk_Back_Forward_List_Item* getFromCacheOrCreate(WKBackForwardListItemRef wkItem) const;
+ EwkBackForwardListItem* getFromCacheOrCreate(WKBackForwardListItemRef wkItem) const;
WKRetainPtr<WKBackForwardListRef> m_wkList;
mutable ItemsMap m_wrapperCache;
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-12-04 08:33:03 UTC (rev 136485)
@@ -63,8 +63,8 @@
EwkContext::EwkContext(PassRefPtr<WebContext> context)
: m_context(context)
- , m_databaseManager(Ewk_Database_Manager::create(m_context))
- , m_storageManager(Ewk_Storage_Manager::create(m_context))
+ , m_databaseManager(EwkDatabaseManager::create(m_context))
+ , m_storageManager(EwkStorageManager::create(m_context))
#if ENABLE(BATTERY_STATUS)
, m_batteryProvider(BatteryProvider::create(m_context))
#endif
@@ -131,15 +131,15 @@
return defaultInstance;
}
-Ewk_Cookie_Manager* EwkContext::cookieManager()
+EwkCookieManager* EwkContext::cookieManager()
{
if (!m_cookieManager)
- m_cookieManager = Ewk_Cookie_Manager::create(WKContextGetCookieManager(toAPI(m_context.get())));
+ m_cookieManager = EwkCookieManager::create(WKContextGetCookieManager(toAPI(m_context.get())));
return m_cookieManager.get();
}
-Ewk_Database_Manager* EwkContext::databaseManager()
+EwkDatabaseManager* EwkContext::databaseManager()
{
return m_databaseManager.get();
}
@@ -149,7 +149,7 @@
if (m_faviconDatabase)
return;
- m_faviconDatabase = Ewk_Favicon_Database::create(m_context.get()->iconDatabase());
+ m_faviconDatabase = EwkFaviconDatabase::create(m_context.get()->iconDatabase());
}
bool EwkContext::setFaviconDatabaseDirectoryPath(const String& databaseDirectory)
@@ -168,7 +168,7 @@
return true;
}
-Ewk_Favicon_Database* EwkContext::faviconDatabase()
+EwkFaviconDatabase* EwkContext::faviconDatabase()
{
ensureFaviconDatabase();
ASSERT(m_faviconDatabase);
@@ -176,7 +176,7 @@
return m_faviconDatabase.get();
}
-Ewk_Storage_Manager* EwkContext::storageManager() const
+EwkStorageManager* EwkContext::storageManager() const
{
return m_storageManager.get();
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2012-12-04 08:33:03 UTC (rev 136485)
@@ -55,14 +55,14 @@
~EwkContext();
- Ewk_Cookie_Manager* cookieManager();
+ EwkCookieManager* cookieManager();
- Ewk_Database_Manager* databaseManager();
+ EwkDatabaseManager* databaseManager();
bool setFaviconDatabaseDirectoryPath(const String& databaseDirectory);
- Ewk_Favicon_Database* faviconDatabase();
+ EwkFaviconDatabase* faviconDatabase();
- Ewk_Storage_Manager* storageManager() const;
+ EwkStorageManager* storageManager() const;
WebKit::RequestManagerClientEfl* requestManager();
@@ -89,10 +89,10 @@
RefPtr<WebContext> m_context;
- OwnPtr<Ewk_Cookie_Manager> m_cookieManager;
- OwnPtr<Ewk_Database_Manager> m_databaseManager;
- OwnPtr<Ewk_Favicon_Database> m_faviconDatabase;
- OwnPtr<Ewk_Storage_Manager> m_storageManager;
+ OwnPtr<EwkCookieManager> m_cookieManager;
+ OwnPtr<EwkDatabaseManager> m_databaseManager;
+ OwnPtr<EwkFaviconDatabase> m_faviconDatabase;
+ OwnPtr<EwkStorageManager> m_storageManager;
#if ENABLE(BATTERY_STATUS)
RefPtr<WebKit::BatteryProvider> m_batteryProvider;
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp 2012-12-04 08:33:03 UTC (rev 136485)
@@ -110,7 +110,7 @@
void EwkCookieManager::cookiesDidChange(WKCookieManagerRef, const void* clientInfo)
{
- Ewk_Cookie_Manager* manager = static_cast<Ewk_Cookie_Manager*>(const_cast<void*>(clientInfo));
+ EwkCookieManager* manager = static_cast<EwkCookieManager*>(const_cast<void*>(clientInfo));
if (!manager->isWatchingForChanges())
return;
@@ -155,7 +155,7 @@
static void getAcceptPolicyCallback(WKHTTPCookieAcceptPolicy policy, WKErrorRef wkError, void* data)
{
Get_Policy_Async_Data* callbackData = static_cast<Get_Policy_Async_Data*>(data);
- OwnPtr<Ewk_Error> ewkError = Ewk_Error::create(wkError);
+ OwnPtr<EwkError> ewkError = EwkError::create(wkError);
callbackData->callback(static_cast<Ewk_Cookie_Accept_Policy>(policy), ewkError.get(), callbackData->userData);
@@ -185,7 +185,7 @@
{
Eina_List* hostnames = 0;
Get_Hostnames_Async_Data* callbackData = static_cast<Get_Hostnames_Async_Data*>(context);
- OwnPtr<Ewk_Error> ewkError = Ewk_Error::create(wkError);
+ OwnPtr<EwkError> ewkError = EwkError::create(wkError);
const size_t hostnameCount = WKArrayGetSize(wkHostnames);
for (size_t i = 0; i < hostnameCount; ++i) {
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h 2012-12-04 08:33:03 UTC (rev 136485)
@@ -52,7 +52,7 @@
public:
static PassOwnPtr<EwkCookieManager> create(WKCookieManagerRef cookieManagerRef)
{
- return adoptPtr(new Ewk_Cookie_Manager(cookieManagerRef));
+ return adoptPtr(new EwkCookieManager(cookieManagerRef));
}
~EwkCookieManager();
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager.cpp (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager.cpp 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager.cpp 2012-12-04 08:33:03 UTC (rev 136485)
@@ -32,7 +32,6 @@
#include "WebDatabaseManagerProxy.h"
#include "ewk_database_manager_private.h"
#include "ewk_error_private.h"
-#include "ewk_security_origin.h"
#include "ewk_security_origin_private.h"
using namespace WebKit;
@@ -53,7 +52,7 @@
for (size_t i = 0; i < length; ++i) {
WKSecurityOriginRef wkOriginRef = static_cast<WKSecurityOriginRef>(WKArrayGetItemAtIndex(origins, i));
- RefPtr<Ewk_Security_Origin> origin = m_wrapperCache.get(wkOriginRef);
+ RefPtr<EwkSecurityOrigin> origin = m_wrapperCache.get(wkOriginRef);
if (!origin) {
origin = EwkSecurityOrigin::create(wkOriginRef);
m_wrapperCache.set(wkOriginRef, origin);
@@ -80,7 +79,7 @@
{
OwnPtr<Ewk_Database_Origins_Async_Get_Context*> webDatabaseContext = adoptPtr(static_cast<Ewk_Database_Origins_Async_Get_Context*>(context));
Eina_List* originList = webDatabaseContext->manager->createOriginList(origins);
- OwnPtr<Ewk_Error> ewkError = Ewk_Error::create(wkError);
+ OwnPtr<EwkError> ewkError = EwkError::create(wkError);
webDatabaseContext->callback(originList, ewkError.get(), webDatabaseContext->userData);
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager_private.h (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager_private.h 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_database_manager_private.h 2012-12-04 08:33:03 UTC (rev 136485)
@@ -29,7 +29,7 @@
#include "WKDatabaseManager.h"
#include "WebContext.h"
#include "WebDatabaseManagerProxy.h"
-#include "ewk_security_origin.h"
+#include "ewk_security_origin_private.h"
#include <WebKit2/WKBase.h>
#include <wtf/PassOwnPtr.h>
@@ -50,6 +50,6 @@
explicit EwkDatabaseManager(WebDatabaseManagerProxy*);
RefPtr<WebDatabaseManagerProxy> m_databaseManager;
- mutable HashMap<WKSecurityOriginRef, RefPtr<Ewk_Security_Origin> > m_wrapperCache;
+ mutable HashMap<WKSecurityOriginRef, RefPtr<EwkSecurityOrigin> > m_wrapperCache;
};
#endif // ewk_database_manager_private_h
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2012-12-04 08:33:03 UTC (rev 136485)
@@ -127,7 +127,7 @@
void EwkFaviconDatabase::didChangeIconForPageURL(WKIconDatabaseRef, WKURLRef pageURLRef, const void* clientInfo)
{
- const Ewk_Favicon_Database* ewkIconDatabase = static_cast<const Ewk_Favicon_Database*>(clientInfo);
+ const EwkFaviconDatabase* ewkIconDatabase = static_cast<const EwkFaviconDatabase*>(clientInfo);
if (ewkIconDatabase->m_changeListeners.isEmpty())
return;
@@ -157,7 +157,7 @@
void EwkFaviconDatabase::iconDataReadyForPageURL(WKIconDatabaseRef, WKURLRef pageURL, const void* clientInfo)
{
- Ewk_Favicon_Database* ewkIconDatabase = const_cast<Ewk_Favicon_Database*>(static_cast<const Ewk_Favicon_Database*>(clientInfo));
+ EwkFaviconDatabase* ewkIconDatabase = const_cast<EwkFaviconDatabase*>(static_cast<const EwkFaviconDatabase*>(clientInfo));
String urlString = toImpl(pageURL)->string();
if (!ewkIconDatabase->m_iconRequests.contains(urlString))
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_popup_menu.cpp (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_popup_menu.cpp 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_popup_menu.cpp 2012-12-04 08:33:03 UTC (rev 136485)
@@ -42,14 +42,14 @@
{
const size_t size = items.size();
for (size_t i = 0; i < size; ++i)
- m_popupMenuItems = eina_list_append(m_popupMenuItems, Ewk_Popup_Menu_Item::create(items[i]).leakPtr());
+ m_popupMenuItems = eina_list_append(m_popupMenuItems, EwkPopupMenuItem::create(items[i]).leakPtr());
}
EwkPopupMenu::~EwkPopupMenu()
{
void* item;
EINA_LIST_FREE(m_popupMenuItems, item)
- delete static_cast<Ewk_Popup_Menu_Item*>(item);
+ delete static_cast<EwkPopupMenuItem*>(item);
}
void EwkPopupMenu::close()
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager.cpp 2012-12-04 08:33:03 UTC (rev 136485)
@@ -30,7 +30,6 @@
#include "WKArray.h"
#include "WebKeyValueStorageManagerProxy.h"
#include "ewk_error_private.h"
-#include "ewk_security_origin.h"
#include "ewk_security_origin_private.h"
#include "ewk_storage_manager_private.h"
@@ -52,7 +51,7 @@
for (size_t i = 0; i < length; ++i) {
WKSecurityOriginRef wkOriginRef = static_cast<WKSecurityOriginRef>(WKArrayGetItemAtIndex(origins, i));
- RefPtr<Ewk_Security_Origin> origin = m_wrapperCache.get(wkOriginRef);
+ RefPtr<EwkSecurityOrigin> origin = m_wrapperCache.get(wkOriginRef);
if (!origin) {
origin = EwkSecurityOrigin::create(wkOriginRef);
m_wrapperCache.set(wkOriginRef, origin);
@@ -82,7 +81,7 @@
originList = webStorageContext->manager->createOriginList(origins);
- OwnPtr<Ewk_Error> ewkError = Ewk_Error::create(wkError);
+ OwnPtr<EwkError> ewkError = EwkError::create(wkError);
webStorageContext->callback(originList, ewkError.get(), webStorageContext->userData);
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h (136484 => 136485)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h 2012-12-04 08:28:53 UTC (rev 136484)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_storage_manager_private.h 2012-12-04 08:33:03 UTC (rev 136485)
@@ -50,7 +50,7 @@
explicit EwkStorageManager(WebKeyValueStorageManagerProxy* storageManagerProxy);
RefPtr<WebKeyValueStorageManagerProxy> m_storageManager;
- mutable HashMap<WKSecurityOriginRef, RefPtr<Ewk_Security_Origin> > m_wrapperCache;
+ mutable HashMap<WKSecurityOriginRef, RefPtr<EwkSecurityOrigin> > m_wrapperCache;
};
#endif // ewk_storage_manager_private_h
