diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/API')
33 files changed, 189 insertions, 50 deletions
diff --git a/Source/WebKit2/UIProcess/API/C/WKAPICast.h b/Source/WebKit2/UIProcess/API/C/WKAPICast.h index fe55dd8ac..ba627708e 100644 --- a/Source/WebKit2/UIProcess/API/C/WKAPICast.h +++ b/Source/WebKit2/UIProcess/API/C/WKAPICast.h @@ -61,6 +61,7 @@ class WebBackForwardListItem; class WebBatteryManagerProxy; class WebBatteryStatus; class WebResourceCacheManagerProxy; +class WebColorPickerResultListenerProxy; class WebContext; class WebCookieManagerProxy; class WebCredential; @@ -104,6 +105,7 @@ WK_ADD_API_MAPPING(WKBackForwardListRef, WebBackForwardList) WK_ADD_API_MAPPING(WKBatteryManagerRef, WebBatteryManagerProxy) WK_ADD_API_MAPPING(WKBatteryStatusRef, WebBatteryStatus) WK_ADD_API_MAPPING(WKResourceCacheManagerRef, WebResourceCacheManagerProxy) +WK_ADD_API_MAPPING(WKColorPickerResultListenerRef, WebColorPickerResultListenerProxy) WK_ADD_API_MAPPING(WKContextRef, WebContext) WK_ADD_API_MAPPING(WKCookieManagerRef, WebCookieManagerProxy) WK_ADD_API_MAPPING(WKCredentialRef, WebCredential) diff --git a/Source/WebKit2/UIProcess/API/C/WKColorPickerResultListener.cpp b/Source/WebKit2/UIProcess/API/C/WKColorPickerResultListener.cpp new file mode 100644 index 000000000..de5539de1 --- /dev/null +++ b/Source/WebKit2/UIProcess/API/C/WKColorPickerResultListener.cpp @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2012 Samsung Electronics. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "WKColorPickerResultListener.h" + +#include "WKAPICast.h" +#include "WebColorPickerResultListenerProxy.h" + +using namespace WebKit; + +WKTypeID WKColorPickerResultListenerGetTypeID() +{ +#if ENABLE(INPUT_TYPE_COLOR) + return toAPI(WebColorPickerResultListenerProxy::APIType); +#else + return 0; +#endif +} + +void WKColorPickerResultListenerSetColor(WKColorPickerResultListenerRef listenerRef, const WKStringRef color) +{ +#if ENABLE(INPUT_TYPE_COLOR) + toImpl(listenerRef)->setColor(toWTFString(color)); +#endif +} diff --git a/Source/WebKit2/UIProcess/API/C/WKColorPickerResultListener.h b/Source/WebKit2/UIProcess/API/C/WKColorPickerResultListener.h new file mode 100644 index 000000000..bfd4732c9 --- /dev/null +++ b/Source/WebKit2/UIProcess/API/C/WKColorPickerResultListener.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2012 Samsung Electronics. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef WKColorPickerResultListener_h +#define WKColorPickerResultListener_h + +#include <WebKit2/WKBase.h> + +#ifdef __cplusplus +extern "C" { +#endif + +WK_EXPORT WKTypeID WKColorPickerResultListenerGetTypeID(); + +WK_EXPORT void WKColorPickerResultListenerSetColor(WKColorPickerResultListenerRef listenerRef, const WKStringRef color); + +#ifdef __cplusplus +} +#endif + +#endif /* WKColorPickerResultListener_h */ diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.h b/Source/WebKit2/UIProcess/API/C/WKPage.h index 5566826d3..73cf68139 100644 --- a/Source/WebKit2/UIProcess/API/C/WKPage.h +++ b/Source/WebKit2/UIProcess/API/C/WKPage.h @@ -225,6 +225,8 @@ typedef void (*WKPageSaveDataToFileInDownloadsFolderCallback)(WKPageRef page, WK typedef bool (*WKPageShouldInterruptJavaScriptCallback)(WKPageRef page, const void *clientInfo); typedef void (*WKPageDecidePolicyForNotificationPermissionRequestCallback)(WKPageRef page, WKSecurityOriginRef origin, WKNotificationPermissionRequestRef permissionRequest, const void *clientInfo); typedef void (*WKPageUnavailablePluginButtonClickedCallback)(WKPageRef page, WKPluginUnavailabilityReason pluginUnavailabilityReason, WKStringRef mimeType, WKStringRef url, WKStringRef pluginsPageURL, const void* clientInfo); +typedef void (*WKPageShowColorPickerCallback)(WKPageRef page, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo); +typedef void (*WKPageHideColorPickerCallback)(WKPageRef page, const void* clientInfo); // Deprecated typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV0)(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo); @@ -281,10 +283,14 @@ struct WKPageUIClient { WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement; WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest; WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked; + + // Version 2 + WKPageShowColorPickerCallback showColorPicker; + WKPageHideColorPickerCallback hideColorPicker; }; typedef struct WKPageUIClient WKPageUIClient; -enum { kWKPageUIClientCurrentVersion = 1 }; +enum { kWKPageUIClientCurrentVersion = 2 }; // Find client. typedef void (*WKPageDidFindStringCallback)(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo); diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp index 24bda6305..9e75e0828 100644 --- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp +++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp @@ -139,25 +139,24 @@ void PageClientImpl::didChangeViewportProperties(const WebCore::ViewportAttribut notImplemented(); } -void PageClientImpl::registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo) +void PageClientImpl::registerEditCommand(PassRefPtr<WebEditCommandProxy> command, WebPageProxy::UndoOrRedo undoOrRedo) { - notImplemented(); + m_undoController.registerEditCommand(command, undoOrRedo); } void PageClientImpl::clearAllEditCommands() { - notImplemented(); + m_undoController.clearAllEditCommands(); } -bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo) +bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo) { - notImplemented(); - return false; + return m_undoController.canUndoRedo(undoOrRedo); } -void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo) +void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo) { - notImplemented(); + m_undoController.executeUndoRedo(undoOrRedo); } FloatRect PageClientImpl::convertToDeviceSpace(const FloatRect& viewRect) diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h index 36ee76d7d..8f03b09f4 100644 --- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h +++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h @@ -26,6 +26,7 @@ #ifndef PageClientImpl_h #define PageClientImpl_h +#include "DefaultUndoController.h" #include "PageClient.h" #include <Evas.h> @@ -115,6 +116,7 @@ private: private: Evas_Object* m_viewWidget; + DefaultUndoController m_undoController; }; } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list.cpp index f6bd0a760..be866fa0a 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list.cpp @@ -95,8 +95,7 @@ static inline Eina_List* createEinaList(const Ewk_Back_Forward_List* list, WKArr for (size_t i = 0; i < count; ++i) { WKBackForwardListItemRef wkItem = static_cast<WKBackForwardListItemRef>(WKArrayGetItemAtIndex(wkList, i)); Ewk_Back_Forward_List_Item* item = addItemToWrapperCache(list, wkItem); - ewk_back_forward_list_item_ref(item); - result = eina_list_append(result, item); + result = eina_list_append(result, ewk_back_forward_list_item_ref(item)); } return result; diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.cpp index 871187d2a..5679773a0 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.cpp @@ -65,10 +65,12 @@ struct _Ewk_Back_Forward_List_Item { } \ WKBackForwardListItemRef wkItem_ = (item)->wkItem.get() -void ewk_back_forward_list_item_ref(Ewk_Back_Forward_List_Item* item) +Ewk_Back_Forward_List_Item* ewk_back_forward_list_item_ref(Ewk_Back_Forward_List_Item* item) { - EINA_SAFETY_ON_NULL_RETURN(item); + EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0); ++item->__ref; + + return item; } void ewk_back_forward_list_item_unref(Ewk_Back_Forward_List_Item* item) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.h b/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.h index 811f0e104..a1227dfc0 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.h @@ -44,8 +44,10 @@ typedef struct _Ewk_Back_Forward_List_Item Ewk_Back_Forward_List_Item; * Increases the reference count of the given object. * * @param item the back-forward list item instance to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_back_forward_list_item_ref(Ewk_Back_Forward_List_Item *item); +EAPI Ewk_Back_Forward_List_Item *ewk_back_forward_list_item_ref(Ewk_Back_Forward_List_Item *item); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp index 60c79e16e..e23f6b005 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp @@ -151,8 +151,7 @@ void ewk_context_download_job_add(Ewk_Context* ewkContext, Ewk_Download_Job* ewk if (ewkContext->downloadJobs.contains(downloadId)) return; - ewk_download_job_ref(ewkDownload); - ewkContext->downloadJobs.add(downloadId, ewkDownload); + ewkContext->downloadJobs.add(downloadId, ewk_download_job_ref(ewkDownload)); } /** diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp index a27abc40d..61297920b 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp @@ -76,11 +76,13 @@ struct _Ewk_Download_Job { } }; -void ewk_download_job_ref(Ewk_Download_Job* download) +Ewk_Download_Job* ewk_download_job_ref(Ewk_Download_Job* download) { - EINA_SAFETY_ON_NULL_RETURN(download); + EINA_SAFETY_ON_NULL_RETURN_VAL(download, 0); ++download->__ref; + + return download; } void ewk_download_job_unref(Ewk_Download_Job* download) @@ -221,8 +223,7 @@ void ewk_download_job_response_set(Ewk_Download_Job* download, Ewk_Url_Response* EINA_SAFETY_ON_NULL_RETURN(download); EINA_SAFETY_ON_NULL_RETURN(response); - ewk_url_response_ref(response); - download->response = response; + download->response = ewk_url_response_ref(response); } /** diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_download_job.h b/Source/WebKit2/UIProcess/API/efl/ewk_download_job.h index 68f03fc7e..fdcc10e98 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_download_job.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_download_job.h @@ -70,8 +70,10 @@ typedef enum _Ewk_Download_Job_State Ewk_Download_Job_State; * Increases the reference count of the given object. * * @param download the download object to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_download_job_ref(Ewk_Download_Job *download); +EAPI Ewk_Download_Job *ewk_download_job_ref(Ewk_Download_Job *download); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.cpp index 70721735b..80a5fd9fb 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.cpp @@ -65,10 +65,12 @@ struct _Ewk_Form_Submission_Request { } }; -void ewk_form_submission_request_ref(Ewk_Form_Submission_Request* request) +Ewk_Form_Submission_Request* ewk_form_submission_request_ref(Ewk_Form_Submission_Request* request) { - EINA_SAFETY_ON_NULL_RETURN(request); + EINA_SAFETY_ON_NULL_RETURN_VAL(request, 0); ++request->__ref; + + return request; } void ewk_form_submission_request_unref(Ewk_Form_Submission_Request* request) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.h b/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.h index fa67e9360..9521e741c 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.h @@ -47,8 +47,10 @@ typedef struct _Ewk_Form_Submission_Request Ewk_Form_Submission_Request; * Increases the reference count of the given object. * * @param request the request object to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_form_submission_request_ref(Ewk_Form_Submission_Request *request); +EAPI Ewk_Form_Submission_Request *ewk_form_submission_request_ref(Ewk_Form_Submission_Request *request); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_intent.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_intent.cpp index ed5950311..ee6b93b4b 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_intent.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_intent.cpp @@ -79,12 +79,14 @@ struct _Ewk_Intent { } \ WKIntentDataRef wkIntent_ = (intent)->wkIntent.get() -void ewk_intent_ref(Ewk_Intent* intent) +Ewk_Intent* ewk_intent_ref(Ewk_Intent* intent) { #if ENABLE(WEB_INTENTS) - EINA_SAFETY_ON_NULL_RETURN(intent); + EINA_SAFETY_ON_NULL_RETURN_VAL(intent, 0); ++intent->__ref; #endif + + return intent; } void ewk_intent_unref(Ewk_Intent* intent) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_intent.h b/Source/WebKit2/UIProcess/API/efl/ewk_intent.h index abcffa59f..5b869023f 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_intent.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_intent.h @@ -44,8 +44,10 @@ typedef struct _Ewk_Intent Ewk_Intent; * Increases the reference count of the given object. * * @param intent the intent object to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_intent_ref(Ewk_Intent *intent); +EAPI Ewk_Intent *ewk_intent_ref(Ewk_Intent *intent); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.cpp index 19215724b..279e90904 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.cpp @@ -67,12 +67,14 @@ struct _Ewk_Intent_Service { } }; -void ewk_intent_service_ref(Ewk_Intent_Service* service) +Ewk_Intent_Service* ewk_intent_service_ref(Ewk_Intent_Service* service) { #if ENABLE(WEB_INTENTS_TAG) - EINA_SAFETY_ON_NULL_RETURN(service); + EINA_SAFETY_ON_NULL_RETURN_VAL(service, 0); ++service->__ref; #endif + + return service; } void ewk_intent_service_unref(Ewk_Intent_Service* service) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.h b/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.h index 958e05448..db946d247 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_intent_service.h @@ -44,8 +44,10 @@ typedef struct _Ewk_Intent_Service Ewk_Intent_Service; * Increases the reference count of the given object. * * @param service the intent service object to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_intent_service_ref(Ewk_Intent_Service *service); +EAPI Ewk_Intent_Service *ewk_intent_service_ref(Ewk_Intent_Service *service); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.cpp index 190810962..d46805faa 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.cpp @@ -73,11 +73,13 @@ struct _Ewk_Navigation_Policy_Decision { } }; -void ewk_navigation_policy_decision_ref(Ewk_Navigation_Policy_Decision* decision) +Ewk_Navigation_Policy_Decision* ewk_navigation_policy_decision_ref(Ewk_Navigation_Policy_Decision* decision) { - EINA_SAFETY_ON_NULL_RETURN(decision); + EINA_SAFETY_ON_NULL_RETURN_VAL(decision, 0); ++decision->__ref; + + return decision; } void ewk_navigation_policy_decision_unref(Ewk_Navigation_Policy_Decision* decision) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.h b/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.h index dec9c09f9..9f3c045ae 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.h @@ -70,8 +70,10 @@ typedef enum { * Increases the reference count of the given object. * * @param decision the policy decision object to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_navigation_policy_decision_ref(Ewk_Navigation_Policy_Decision *decision); +EAPI Ewk_Navigation_Policy_Decision *ewk_navigation_policy_decision_ref(Ewk_Navigation_Policy_Decision *decision); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_url_request.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_url_request.cpp index 5816b2feb..9e7c80c40 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_url_request.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_url_request.cpp @@ -60,10 +60,12 @@ struct _Ewk_Url_Request { } }; -void ewk_url_request_ref(Ewk_Url_Request* request) +Ewk_Url_Request* ewk_url_request_ref(Ewk_Url_Request* request) { - EINA_SAFETY_ON_NULL_RETURN(request); + EINA_SAFETY_ON_NULL_RETURN_VAL(request, 0); ++request->__ref; + + return request; } void ewk_url_request_unref(Ewk_Url_Request* request) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_url_request.h b/Source/WebKit2/UIProcess/API/efl/ewk_url_request.h index ec44f5c1e..f61b88af9 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_url_request.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_url_request.h @@ -44,8 +44,10 @@ typedef struct _Ewk_Url_Request Ewk_Url_Request; * Increases the reference count of the given object. * * @param request the URL request object to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_url_request_ref(Ewk_Url_Request *request); +EAPI Ewk_Url_Request *ewk_url_request_ref(Ewk_Url_Request *request); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_url_response.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_url_response.cpp index 8d0a8ee30..8c1b1b57f 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_url_response.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_url_response.cpp @@ -58,10 +58,12 @@ struct _Ewk_Url_Response { } }; -void ewk_url_response_ref(Ewk_Url_Response* response) +Ewk_Url_Response* ewk_url_response_ref(Ewk_Url_Response* response) { - EINA_SAFETY_ON_NULL_RETURN(response); + EINA_SAFETY_ON_NULL_RETURN_VAL(response, 0); ++response->__ref; + + return response; } void ewk_url_response_unref(Ewk_Url_Response* response) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_url_response.h b/Source/WebKit2/UIProcess/API/efl/ewk_url_response.h index 35631ebef..25814d21d 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_url_response.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_url_response.h @@ -44,8 +44,10 @@ typedef struct _Ewk_Url_Response Ewk_Url_Response; * Increases the reference count of the given object. * * @param response the URL response object to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_url_response_ref(Ewk_Url_Response *response); +EAPI Ewk_Url_Response *ewk_url_response_ref(Ewk_Url_Response *response); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.cpp index 32c3281f9..c60c5d2b1 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.cpp @@ -67,10 +67,12 @@ struct _Ewk_Url_Scheme_Request { } }; -void ewk_url_scheme_request_ref(Ewk_Url_Scheme_Request* request) +Ewk_Url_Scheme_Request* ewk_url_scheme_request_ref(Ewk_Url_Scheme_Request* request) { - EINA_SAFETY_ON_NULL_RETURN(request); + EINA_SAFETY_ON_NULL_RETURN_VAL(request, 0); ++request->__ref; + + return request; } void ewk_url_scheme_request_unref(Ewk_Url_Scheme_Request* request) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.h b/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.h index deaaf1892..9727590a0 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.h @@ -44,8 +44,10 @@ typedef struct _Ewk_Url_Scheme_Request Ewk_Url_Scheme_Request; * Increases the reference count of the given object. * * @param request the URL scheme request object to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_url_scheme_request_ref(Ewk_Url_Scheme_Request *request); +EAPI Ewk_Url_Scheme_Request *ewk_url_scheme_request_ref(Ewk_Url_Scheme_Request *request); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp index 3196d0b27..dc77fb2cc 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp @@ -889,8 +889,7 @@ void ewk_view_resource_load_initiated(Evas_Object* ewkView, uint64_t resourceIde Ewk_Web_Resource_Request resourceRequest = {resource, request, 0}; // Keep the resource internally to reuse it later. - ewk_web_resource_ref(resource); - priv->loadingResourcesMap.add(resourceIdentifier, resource); + priv->loadingResourcesMap.add(resourceIdentifier, ewk_web_resource_ref(resource)); evas_object_smart_callback_call(ewkView, "resource,request,new", &resourceRequest); } diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.cpp index 355592df4..89879eead 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.cpp +++ b/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.cpp @@ -47,11 +47,13 @@ struct _Ewk_Web_Resource { } }; -void ewk_web_resource_ref(Ewk_Web_Resource* resource) +Ewk_Web_Resource* ewk_web_resource_ref(Ewk_Web_Resource* resource) { - EINA_SAFETY_ON_NULL_RETURN(resource); + EINA_SAFETY_ON_NULL_RETURN_VAL(resource, 0); ++resource->__ref; + + return resource; } void ewk_web_resource_unref(Ewk_Web_Resource* resource) diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.h b/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.h index 47fd7adf4..dc2cf087d 100644 --- a/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.h +++ b/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.h @@ -44,8 +44,10 @@ typedef struct _Ewk_Web_Resource Ewk_Web_Resource; * Increases the reference count of the given object. * * @param resource the resource object to increase the reference count + * + * @return a pointer to the object on success, @c NULL otherwise. */ -EAPI void ewk_web_resource_ref(Ewk_Web_Resource *resource); +EAPI Ewk_Web_Resource *ewk_web_resource_ref(Ewk_Web_Resource *resource); /** * Decreases the reference count of the given object, possibly freeing it. diff --git a/Source/WebKit2/UIProcess/API/efl/tests/resources/big_button_theme.edj b/Source/WebKit2/UIProcess/API/efl/tests/resources/big_button_theme.edj Binary files differindex 60bb40ff9..2f30076db 100644 --- a/Source/WebKit2/UIProcess/API/efl/tests/resources/big_button_theme.edj +++ b/Source/WebKit2/UIProcess/API/efl/tests/resources/big_button_theme.edj diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp index 39f402227..89e746d47 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp @@ -140,7 +140,7 @@ void WebKitTextChecker::setSpellCheckingEnabled(bool enabled) const char* const* WebKitTextChecker::getSpellCheckingLanguages() { - Vector<String> spellCheckingLanguages = m_textChecker->getSpellCheckingLanguages(); + Vector<String> spellCheckingLanguages = m_textChecker->loadedSpellCheckingLanguages(); if (spellCheckingLanguages.isEmpty()) return 0; diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp index 1d985d342..59d0b0d14 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp @@ -204,6 +204,8 @@ void attachUIClientToView(WebKitWebView* webView) mouseDidMoveOverElement, 0, // decidePolicyForNotificationPermissionRequest 0, // unavailablePluginButtonClicked + 0, // showColorPicker + 0, // hideColorPicker }; WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))); WKPageSetPageUIClient(wkPage, &wkUIClient); diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h index 6cc5e8d39..a154da8f5 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h @@ -21,11 +21,12 @@ #ifndef qquickwebview_p_p_h #define qquickwebview_p_p_h +#include "DefaultUndoController.h" #include "PageViewportController.h" #include "PageViewportControllerClient.h" #include "QtPageClient.h" #include "QtWebPageUIClient.h" -#include "QtWebUndoController.h" + #include "qquickwebview_p.h" #include "qquickwebpage_p.h" #include <QtCore/QElapsedTimer> @@ -160,7 +161,7 @@ protected: RefPtr<WebKit::WebPageProxy> webPageProxy; WebKit::QtPageClient pageClient; - WebKit::QtWebUndoController undoController; + WebKit::DefaultUndoController undoController; OwnPtr<QWebNavigationHistory> navigationHistory; OwnPtr<QWebPreferences> preferences; |