Diff
Modified: trunk/Source/WebKit2/ChangeLog (135460 => 135461)
--- trunk/Source/WebKit2/ChangeLog 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-22 02:06:38 UTC (rev 135461)
@@ -1,3 +1,46 @@
+2012-11-21 Jinwoo Song <[email protected]>
+
+ [EFL][WK2] Use consistent class names in the clients
+ https://bugs.webkit.org/show_bug.cgi?id=102684
+
+ Reviewed by Gyuyoung Kim.
+
+ WebKit EFL classes do not use '_' since r135117 but '_' is still remained
+ in some clients classes. This patch removed the '_' to make class names
+ to be consistent.
+
+ * UIProcess/efl/ContextHistoryClientEfl.cpp:
+ (WebKit::ContextHistoryClientEfl::didNavigateWithNavigationData):
+ * UIProcess/efl/DownloadManagerEfl.cpp:
+ (WebKit::DownloadManagerEfl::didFail):
+ * UIProcess/efl/FormClientEfl.cpp:
+ (WebKit::FormClientEfl::willSubmitForm):
+ * UIProcess/efl/PageLoadClientEfl.cpp:
+ (WebKit::PageLoadClientEfl::didReceiveIntentForFrame):
+ (WebKit::PageLoadClientEfl::registerIntentServiceForFrame):
+ (WebKit::PageLoadClientEfl::didFailLoadWithErrorForFrame):
+ (WebKit::PageLoadClientEfl::didFailProvisionalLoadWithErrorForFrame):
+ (WebKit::PageLoadClientEfl::didReceiveAuthenticationChallengeInFrame):
+ * UIProcess/efl/PagePolicyClientEfl.cpp:
+ (WebKit::PagePolicyClientEfl::decidePolicyForNavigationAction):
+ (WebKit::PagePolicyClientEfl::decidePolicyForNewWindowAction):
+ * UIProcess/efl/PageUIClientEfl.cpp:
+ (WebKit::PageUIClientEfl::runOpenPanel):
+ * UIProcess/efl/RequestManagerClientEfl.cpp:
+ (WebKit::EwkUrlSchemeHandler::EwkUrlSchemeHandler):
+ (WebKit::RequestManagerClientEfl::didReceiveURIRequest):
+ (WebKit::RequestManagerClientEfl::registerURLSchemeHandler):
+ * UIProcess/efl/RequestManagerClientEfl.h:
+ (RequestManagerClientEfl):
+ * UIProcess/efl/ResourceLoadClientEfl.cpp:
+ (WebKit::ResourceLoadClientEfl::didInitiateLoadForResource):
+ (WebKit::ResourceLoadClientEfl::didSendRequestForResource):
+ (WebKit::ResourceLoadClientEfl::didReceiveResponseForResource):
+ (WebKit::ResourceLoadClientEfl::didFinishLoadForResource):
+ (WebKit::ResourceLoadClientEfl::didFailLoadForResource):
+ * UIProcess/efl/ResourceLoadClientEfl.h:
+ (ResourceLoadClientEfl):
+
2012-11-21 Jaehun Lim <[email protected]>
[EFL][WK2] Remove #include "ewk_view_private.h" in PageViewportControllerClientEfl.cpp
Modified: trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2012-11-22 02:06:38 UTC (rev 135461)
@@ -53,7 +53,7 @@
if (!historyClient->m_navigate)
return;
- RefPtr<Ewk_Navigation_Data> navigationDataEwk = EwkNavigationData::create(navigationData);
+ RefPtr<EwkNavigationData> navigationDataEwk = EwkNavigationData::create(navigationData);
historyClient->m_navigate(EwkViewImpl::viewFromPageViewMap(page), navigationDataEwk.get(), historyClient->m_userData);
}
Modified: trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2012-11-22 02:06:38 UTC (rev 135461)
@@ -89,7 +89,7 @@
EwkDownloadJob* download = downloadManager->downloadJob(downloadId);
ASSERT(download);
- OwnPtr<Ewk_Error> ewkError = Ewk_Error::create(error);
+ OwnPtr<EwkError> ewkError = EwkError::create(error);
download->setState(EWK_DOWNLOAD_JOB_STATE_FAILED);
Ewk_Download_Job_Error downloadError = { download, ewkError.get() };
download->viewImpl()->smartCallback<DownloadJobFailed>().call(&downloadError);
Modified: trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp 2012-11-22 02:06:38 UTC (rev 135461)
@@ -43,7 +43,7 @@
{
FormClientEfl* formClient = toFormClientEfl(clientInfo);
- RefPtr<Ewk_Form_Submission_Request> request = EwkFormSubmissionRequest::create(values, listener);
+ RefPtr<EwkFormSubmissionRequest> request = EwkFormSubmissionRequest::create(values, listener);
formClient->m_viewImpl->smartCallback<NewFormSubmissionRequest>().call(request.get());
}
Modified: trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp 2012-11-22 02:06:38 UTC (rev 135461)
@@ -59,7 +59,7 @@
void PageLoadClientEfl::didReceiveIntentForFrame(WKPageRef, WKFrameRef, WKIntentDataRef intent, WKTypeRef, const void* clientInfo)
{
EwkViewImpl* viewImpl = toPageLoadClientEfl(clientInfo)->viewImpl();
- RefPtr<Ewk_Intent> ewkIntent = EwkIntent::create(intent);
+ RefPtr<EwkIntent> ewkIntent = EwkIntent::create(intent);
viewImpl->smartCallback<IntentRequest>().call(ewkIntent.get());
}
#endif
@@ -68,7 +68,7 @@
void PageLoadClientEfl::registerIntentServiceForFrame(WKPageRef, WKFrameRef, WKIntentServiceInfoRef serviceInfo, WKTypeRef, const void* clientInfo)
{
EwkViewImpl* viewImpl = toPageLoadClientEfl(clientInfo)->viewImpl();
- RefPtr<Ewk_Intent_Service> ewkIntentService = EwkIntentService::create(serviceInfo);
+ RefPtr<EwkIntentService> ewkIntentService = EwkIntentService::create(serviceInfo);
viewImpl->smartCallback<IntentServiceRegistration>().call(ewkIntentService.get());
}
#endif
@@ -95,7 +95,7 @@
return;
EwkViewImpl* viewImpl = toPageLoadClientEfl(clientInfo)->viewImpl();
- OwnPtr<Ewk_Error> ewkError = Ewk_Error::create(error);
+ OwnPtr<EwkError> ewkError = EwkError::create(error);
viewImpl->smartCallback<LoadError>().call(ewkError.get());
viewImpl->smartCallback<LoadFinished>().call();
}
@@ -126,7 +126,7 @@
return;
EwkViewImpl* viewImpl = toPageLoadClientEfl(clientInfo)->viewImpl();
- OwnPtr<Ewk_Error> ewkError = Ewk_Error::create(error);
+ OwnPtr<EwkError> ewkError = EwkError::create(error);
viewImpl->smartCallback<ProvisionalLoadFailed>().call(ewkError.get());
}
@@ -166,7 +166,7 @@
{
EwkViewImpl* viewImpl = toPageLoadClientEfl(clientInfo)->viewImpl();
- RefPtr<Ewk_Auth_Request> authenticationRequest = EwkAuthRequest::create(toImpl(authenticationChallenge));
+ RefPtr<EwkAuthRequest> authenticationRequest = EwkAuthRequest::create(toImpl(authenticationChallenge));
viewImpl->smartCallback<AuthenticationRequest>().call(authenticationRequest.get());
}
Modified: trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp 2012-11-22 02:06:38 UTC (rev 135461)
@@ -48,7 +48,7 @@
{
PagePolicyClientEfl* policyClient = toPagePolicyClientEfl(clientInfo);
- RefPtr<Ewk_Navigation_Policy_Decision> decision = EwkNavigationPolicyDecision::create(navigationType, mouseButton, modifiers, request, 0, listener);
+ RefPtr<EwkNavigationPolicyDecision> decision = EwkNavigationPolicyDecision::create(navigationType, mouseButton, modifiers, request, 0, listener);
policyClient->m_viewImpl->smartCallback<NavigationPolicyDecision>().call(decision.get());
}
@@ -56,7 +56,7 @@
{
PagePolicyClientEfl* policyClient = toPagePolicyClientEfl(clientInfo);
- RefPtr<Ewk_Navigation_Policy_Decision> decision = EwkNavigationPolicyDecision::create(navigationType, mouseButton, modifiers, request, toImpl(frameName)->string().utf8().data(), listener);
+ RefPtr<EwkNavigationPolicyDecision> decision = EwkNavigationPolicyDecision::create(navigationType, mouseButton, modifiers, request, toImpl(frameName)->string().utf8().data(), listener);
policyClient->m_viewImpl->smartCallback<NewWindowPolicyDecision>().call(decision.get());
}
Modified: trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2012-11-22 02:06:38 UTC (rev 135461)
@@ -179,7 +179,7 @@
void PageUIClientEfl::runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener, const void* clientInfo)
{
EwkViewImpl* viewImpl = toPageUIClientEfl(clientInfo)->m_viewImpl;
- RefPtr<Ewk_File_Chooser_Request> fileChooserRequest = EwkFileChooserRequest::create(toImpl(parameters), toImpl(listener));
+ RefPtr<EwkFileChooserRequest> fileChooserRequest = EwkFileChooserRequest::create(toImpl(parameters), toImpl(listener));
viewImpl->smartCallback<FileChooserRequest>().call(fileChooserRequest.get());
}
Modified: trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.cpp 2012-11-22 02:06:38 UTC (rev 135461)
@@ -34,16 +34,16 @@
namespace WebKit {
-struct Ewk_Url_Scheme_Handler {
+struct EwkUrlSchemeHandler {
Ewk_Url_Scheme_Request_Cb callback;
void* userData;
- Ewk_Url_Scheme_Handler()
+ EwkUrlSchemeHandler()
: callback(0)
, userData(0)
{ }
- Ewk_Url_Scheme_Handler(Ewk_Url_Scheme_Request_Cb callback, void* userData)
+ EwkUrlSchemeHandler(Ewk_Url_Scheme_Request_Cb callback, void* userData)
: callback(callback)
, userData(userData)
{ }
@@ -59,7 +59,7 @@
RequestManagerClientEfl* requestManager = toRequestManagerClientEfl(clientInfo);
RefPtr<EwkUrlSchemeRequest> schemeRequest = EwkUrlSchemeRequest::create(soupRequestManagerRef, urlRef, requestID);
- Ewk_Url_Scheme_Handler handler = requestManager->m_urlSchemeHandlers.get(schemeRequest->scheme());
+ EwkUrlSchemeHandler handler = requestManager->m_urlSchemeHandlers.get(schemeRequest->scheme());
if (!handler.callback)
return;
@@ -89,7 +89,7 @@
{
ASSERT(callback);
- m_urlSchemeHandlers.set(scheme, Ewk_Url_Scheme_Handler(callback, userData));
+ m_urlSchemeHandlers.set(scheme, EwkUrlSchemeHandler(callback, userData));
toImpl(m_soupRequestManager.get())->registerURIScheme(scheme);
}
Modified: trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.h (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.h 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/RequestManagerClientEfl.h 2012-11-22 02:06:38 UTC (rev 135461)
@@ -51,7 +51,7 @@
static void didReceiveURIRequest(WKSoupRequestManagerRef, WKURLRef, WKPageRef, uint64_t requestID, const void* clientInfo);
WKRetainPtr<WKSoupRequestManagerRef> m_soupRequestManager;
- HashMap<String, class Ewk_Url_Scheme_Handler> m_urlSchemeHandlers;
+ HashMap<String, class EwkUrlSchemeHandler> m_urlSchemeHandlers;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/efl/ResourceLoadClientEfl.cpp (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/ResourceLoadClientEfl.cpp 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/ResourceLoadClientEfl.cpp 2012-11-22 02:06:38 UTC (rev 135461)
@@ -52,12 +52,12 @@
bool isMainResource = (WKFrameIsMainFrame(wkFrame) && pageIsProvisionallyLoading);
WKRetainPtr<WKURLRef> wkUrl(AdoptWK, WKURLRequestCopyURL(wkRequest));
- RefPtr<Ewk_Resource> resource = EwkResource::create(wkUrl.get(), isMainResource);
+ RefPtr<EwkResource> resource = EwkResource::create(wkUrl.get(), isMainResource);
// Keep the resource internally to reuse it later.
resourceLoadClient->m_loadingResourcesMap.add(resourceIdentifier, resource);
- RefPtr<Ewk_Url_Request> request = EwkUrlRequest::create(wkRequest);
+ RefPtr<EwkUrlRequest> request = EwkUrlRequest::create(wkRequest);
Ewk_Resource_Request resourceRequest = {resource.get(), request.get(), 0};
resourceLoadClient->m_viewImpl->smartCallback<ResourceLoadStarted>().call(&resourceRequest);
}
@@ -66,13 +66,13 @@
{
ResourceLoadClientEfl* resourceLoadClient = toResourceLoadClientEfl(clientInfo);
- RefPtr<Ewk_Resource> resource = resourceLoadClient->m_loadingResourcesMap.get(resourceIdentifier);
+ RefPtr<EwkResource> resource = resourceLoadClient->m_loadingResourcesMap.get(resourceIdentifier);
// Only process if we know about this resource.
if (!resource)
return;
- RefPtr<Ewk_Url_Request> request = EwkUrlRequest::create(wkRequest);
- RefPtr<Ewk_Url_Response> redirectResponse = EwkUrlResponse::create(wkRedirectResponse);
+ RefPtr<EwkUrlRequest> request = EwkUrlRequest::create(wkRequest);
+ RefPtr<EwkUrlResponse> redirectResponse = EwkUrlResponse::create(wkRedirectResponse);
Ewk_Resource_Request resourceRequest = {resource.get(), request.get(), redirectResponse.get()};
resourceLoadClient->m_viewImpl->smartCallback<ResourceRequestSent>().call(&resourceRequest);
}
@@ -81,12 +81,12 @@
{
ResourceLoadClientEfl* resourceLoadClient = toResourceLoadClientEfl(clientInfo);
- RefPtr<Ewk_Resource> resource = resourceLoadClient->m_loadingResourcesMap.get(resourceIdentifier);
+ RefPtr<EwkResource> resource = resourceLoadClient->m_loadingResourcesMap.get(resourceIdentifier);
// Only process if we know about this resource.
if (!resource)
return;
- RefPtr<Ewk_Url_Response> response = EwkUrlResponse::create(wkResponse);
+ RefPtr<EwkUrlResponse> response = EwkUrlResponse::create(wkResponse);
Ewk_Resource_Load_Response resourceLoadResponse = {resource.get(), response.get()};
resourceLoadClient->m_viewImpl->smartCallback<ResourceLoadResponse>().call(&resourceLoadResponse);
}
@@ -95,7 +95,7 @@
{
ResourceLoadClientEfl* resourceLoadClient = toResourceLoadClientEfl(clientInfo);
- RefPtr<Ewk_Resource> resource = resourceLoadClient->m_loadingResourcesMap.get(resourceIdentifier);
+ RefPtr<EwkResource> resource = resourceLoadClient->m_loadingResourcesMap.get(resourceIdentifier);
// Only process if we know about this resource.
if (!resource)
return;
@@ -107,12 +107,12 @@
{
ResourceLoadClientEfl* resourceLoadClient = toResourceLoadClientEfl(clientInfo);
- RefPtr<Ewk_Resource> resource = resourceLoadClient->m_loadingResourcesMap.take(resourceIdentifier);
+ RefPtr<EwkResource> resource = resourceLoadClient->m_loadingResourcesMap.take(resourceIdentifier);
// Only process if we know about this resource.
if (!resource)
return;
- OwnPtr<Ewk_Error> ewkError = Ewk_Error::create(wkError);
+ OwnPtr<EwkError> ewkError = EwkError::create(wkError);
Ewk_Resource_Load_Error resourceLoadError = {resource.get(), ewkError.get()};
resourceLoadClient->m_viewImpl->smartCallback<ResourceLoadFailed>().call(&resourceLoadError);
resourceLoadClient->m_viewImpl->smartCallback<ResourceLoadFinished>().call(resource.get());
Modified: trunk/Source/WebKit2/UIProcess/efl/ResourceLoadClientEfl.h (135460 => 135461)
--- trunk/Source/WebKit2/UIProcess/efl/ResourceLoadClientEfl.h 2012-11-22 01:21:31 UTC (rev 135460)
+++ trunk/Source/WebKit2/UIProcess/efl/ResourceLoadClientEfl.h 2012-11-22 02:06:38 UTC (rev 135461)
@@ -56,7 +56,7 @@
static void onViewProvisionalLoadStarted(void* userData, Evas_Object* view, void* clientInfo);
EwkViewImpl* m_viewImpl;
- HashMap< uint64_t, RefPtr<Ewk_Resource> > m_loadingResourcesMap;
+ HashMap< uint64_t, RefPtr<EwkResource> > m_loadingResourcesMap;
};
} // namespace WebKit
