Attachment #152469 for bug #90927

View Details Raw Unified Return to Bug 90927

| Differences between



2012-07-15  Hyerim Bae  <hyerim.bae@samsung.com>
        Reviewed by NOBODY (OOPS!).

        [EFL][WK2] Add ewk_view_find_client.h / cpp for wrapping WKPageSetPageFindClient.
        https://bugs.webkit.org/show_bug.cgi?id=90927

        Add ewk_view_find_client.h / cpp for wrapping WKPageSetPageFindClient.

        * PlatformEfl.cmake:
        * UIProcess/API/efl/ewk_view.cpp:
        (ewk_view_base_add):
        (ewk_view_string_found):
        * UIProcess/API/efl/ewk_view.h:
        * UIProcess/API/efl/ewk_view_find_client.cpp: Added.
        (didFindString):
        (ewk_view_find_client_attach):
        * UIProcess/API/efl/ewk_view_find_client_private.h: Added.
        * UIProcess/API/efl/ewk_view_private.h:

2012-07-14  Eric Carlson  <eric.carlson@apple.com>

        Enable AVCF hardware video decoding

Lines 43-48 LIST(APPEND WebKit2_SOURCES a/Source/WebKit2/PlatformEfl.cmake_sec1
- a/Source/WebKit2/PlatformEfl.cmake +1 lines
43	UIProcess/API/efl/ewk_url_request.cpp	43	UIProcess/API/efl/ewk_url_request.cpp
44	UIProcess/API/efl/ewk_url_response.cpp	44	UIProcess/API/efl/ewk_url_response.cpp
45	UIProcess/API/efl/ewk_view.cpp	45	UIProcess/API/efl/ewk_view.cpp
		46	UIProcess/API/efl/ewk_view_find_client.cpp
46	UIProcess/API/efl/ewk_view_loader_client.cpp	47	UIProcess/API/efl/ewk_view_loader_client.cpp
47	UIProcess/API/efl/ewk_view_policy_client.cpp	48	UIProcess/API/efl/ewk_view_policy_client.cpp
48	UIProcess/API/efl/ewk_view_resource_load_client.cpp	49	UIProcess/API/efl/ewk_view_resource_load_client.cpp



#include "ewk_context.h"
#include "ewk_context_private.h"
#include "ewk_intent_private.h"
#include "ewk_view_find_client_private.h"
#include "ewk_view_loader_client_private.h"
#include "ewk_view_policy_client_private.h"
#include "ewk_view_private.h"

    }

    priv->pageClient = PageClientImpl::create(toImpl(contextRef), toImpl(pageGroupRef), ewkView);
    ewk_view_find_client_attach(toAPI(priv->pageClient->page()), ewkView);
    ewk_view_loader_client_attach(toAPI(priv->pageClient->page()), ewkView);
    ewk_view_policy_client_attach(toAPI(priv->pageClient->page()), ewkView);
    ewk_view_resource_load_client_attach(toAPI(priv->pageClient->page()), ewkView);


/**
 * @internal
 * The string was found.
 *
 * Emits signal: "string,found" with count.
 */
void ewk_view_string_found(Evas_Object* ewkView, unsigned matchCount)
{
    evas_object_smart_callback_call(ewkView, "string,found", &matchCount);
}

/**
 * @internal
 * The view title was changed by the frame loader.
 *
 * Emits signal: "title,changed" with pointer to new title string.

Lines 41-46 a/Source/WebKit2/UIProcess/API/efl/ewk_view.h_sec1
- a/Source/WebKit2/UIProcess/API/efl/ewk_view.h +1 lines
41	* - "resource,request,new", const Ewk_Web_Resource_Request*: a resource request was initiated.	41	* - "resource,request,new", const Ewk_Web_Resource_Request*: a resource request was initiated.
42	* - "resource,request,response", Ewk_Web_Resource_Load_Response*: a response to a resource request was received.	42	* - "resource,request,response", Ewk_Web_Resource_Load_Response*: a response to a resource request was received.
43	* - "resource,request,sent", const Ewk_Web_Resource_Request*: a resource request was sent.	43	* - "resource,request,sent", const Ewk_Web_Resource_Request*: a resource request was sent.
		44	* - "string,found", unsigned*: string was found.
44	* - "title,changed", const char*: title of the main frame was changed.	45	* - "title,changed", const char*: title of the main frame was changed.
45	*/	46	*/
46		47



/*
 * 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 "WKPage.h"
#include "ewk_view_find_client_private.h"
#include "ewk_view_private.h"

static void didFindString(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo)
{
    Evas_Object* ewkView = static_cast<Evas_Object*>(const_cast<void*>(clientInfo));
    ewk_view_string_found(ewkView, matchCount);
}

void ewk_view_find_client_attach(WKPageRef pageRef, Evas_Object* ewkView)
{
    WKPageFindClient findClient;
    memset(&findClient, 0, sizeof(WKPageFindClient));
    findClient.version = kWKPageFindClientCurrentVersion;
    findClient.clientInfo = ewkView;
    findClient.didFindString = didFindString;
    WKPageSetPageFindClient(pageRef, &findClient);
}



/*
 * 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 ewk_view_find_client_private_h
#define ewk_view_find_client_private_h

#include <Evas.h>
#include <WebKit2/WKBase.h>

void ewk_view_find_client_attach(WKPageRef pageRef, Evas_Object* ewkView);

#endif // ewk_view_find_client_private_h

Lines 52-57 void ewk_view_load_provisional_redirect(Evas_Object* ewkView); a/Source/WebKit2/UIProcess/API/efl/ewk_view_private.h_sec1
- a/Source/WebKit2/UIProcess/API/efl/ewk_view_private.h +1 lines
52	void ewk_view_load_provisional_started(Evas_Object* ewkView);	52	void ewk_view_load_provisional_started(Evas_Object* ewkView);
53	void ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Navigation_Policy_Decision* decision);	53	void ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Navigation_Policy_Decision* decision);
54	void ewk_view_new_window_policy_decision(Evas_Object* ewkView, Ewk_Navigation_Policy_Decision* decision);	54	void ewk_view_new_window_policy_decision(Evas_Object* ewkView, Ewk_Navigation_Policy_Decision* decision);
		55	void ewk_view_string_found(Evas_Object* ewkView, unsigned matchCount);
55	void ewk_view_title_changed(Evas_Object* ewkView, const char* title);	56	void ewk_view_title_changed(Evas_Object* ewkView, const char* title);
56	void ewk_view_resource_load_failed(Evas_Object* ewkView, uint64_t resourceIdentifier, Ewk_Web_Error* error);	57	void ewk_view_resource_load_failed(Evas_Object* ewkView, uint64_t resourceIdentifier, Ewk_Web_Error* error);
57	void ewk_view_resource_load_finished(Evas_Object* ewkView, uint64_t resourceIdentifier);	58	void ewk_view_resource_load_finished(Evas_Object* ewkView, uint64_t resourceIdentifier);

Return to Bug 90927

Lines 31-36 a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp_sec1
- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp +13 lines
31	#include "ewk_context.h"	31	#include "ewk_context.h"
32	#include "ewk_context_private.h"	32	#include "ewk_context_private.h"
33	#include "ewk_intent_private.h"	33	#include "ewk_intent_private.h"
		34	#include "ewk_view_find_client_private.h"
34	#include "ewk_view_loader_client_private.h"	35	#include "ewk_view_loader_client_private.h"
35	#include "ewk_view_policy_client_private.h"	36	#include "ewk_view_policy_client_private.h"
36	#include "ewk_view_private.h"	37	#include "ewk_view_private.h"
Lines 503-508 Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef contextRef, WKPageGrou a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp_sec2
503	}	504	}
504		505
505	priv->pageClient = PageClientImpl::create(toImpl(contextRef), toImpl(pageGroupRef), ewkView);	506	priv->pageClient = PageClientImpl::create(toImpl(contextRef), toImpl(pageGroupRef), ewkView);
		507	ewk_view_find_client_attach(toAPI(priv->pageClient->page()), ewkView);
506	ewk_view_loader_client_attach(toAPI(priv->pageClient->page()), ewkView);	508	ewk_view_loader_client_attach(toAPI(priv->pageClient->page()), ewkView);
507	ewk_view_policy_client_attach(toAPI(priv->pageClient->page()), ewkView);	509	ewk_view_policy_client_attach(toAPI(priv->pageClient->page()), ewkView);
508	ewk_view_resource_load_client_attach(toAPI(priv->pageClient->page()), ewkView);	510	ewk_view_resource_load_client_attach(toAPI(priv->pageClient->page()), ewkView);
Lines 680-685 const char* ewk_view_title_get(const Evas_Object* ewkView) a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp_sec3
680		682
681	/**	683	/**
682	* @internal	684	* @internal
		685	* The string was found.
		686	*
		687	* Emits signal: "string,found" with count.
		688	*/
		689	void ewk_view_string_found(Evas_Object* ewkView, unsigned matchCount)
		690	{
		691	evas_object_smart_callback_call(ewkView, "string,found", &matchCount);
		692	}
		693
		694	/**
		695	* @internal
683	* The view title was changed by the frame loader.	696	* The view title was changed by the frame loader.
684	*	697	*
685	* Emits signal: "title,changed" with pointer to new title string.	698	* Emits signal: "title,changed" with pointer to new title string.

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +19 lines
		1	2012-07-15 Hyerim Bae <hyerim.bae@samsung.com>
		2	Reviewed by NOBODY (OOPS!).
		3
		4	[EFL][WK2] Add ewk_view_find_client.h / cpp for wrapping WKPageSetPageFindClient.
		5	https://bugs.webkit.org/show_bug.cgi?id=90927
		6
		7	Add ewk_view_find_client.h / cpp for wrapping WKPageSetPageFindClient.
		8
		9	* PlatformEfl.cmake:
		10	* UIProcess/API/efl/ewk_view.cpp:
		11	(ewk_view_base_add):
		12	(ewk_view_string_found):
		13	* UIProcess/API/efl/ewk_view.h:
		14	* UIProcess/API/efl/ewk_view_find_client.cpp: Added.
		15	(didFindString):
		16	(ewk_view_find_client_attach):
		17	* UIProcess/API/efl/ewk_view_find_client_private.h: Added.
		18	* UIProcess/API/efl/ewk_view_private.h:
		19
1	2012-07-14 Eric Carlson <eric.carlson@apple.com>	20	2012-07-14 Eric Carlson <eric.carlson@apple.com>
2		21
3	Enable AVCF hardware video decoding	22	Enable AVCF hardware video decoding

Line 0 a/Source/WebKit2/UIProcess/API/efl/ewk_view_find_client.cpp_sec1
- a/Source/WebKit2/UIProcess/API/efl/ewk_view_find_client.cpp +46 lines
	1	/*
	2	* Copyright (C) 2012 Samsung Electronics. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	* 1. Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* 2. Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	*
	13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
	14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
	15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
	17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	23	* THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	#include "config.h"
	27
	28	#include "WKPage.h"
	29	#include "ewk_view_find_client_private.h"
	30	#include "ewk_view_private.h"
	31
	32	static void didFindString(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo)
	33	{
	34	Evas_Object* ewkView = static_cast<Evas_Object>(const_cast<void>(clientInfo));
	35	ewk_view_string_found(ewkView, matchCount);
	36	}
	37
	38	void ewk_view_find_client_attach(WKPageRef pageRef, Evas_Object* ewkView)
	39	{
	40	WKPageFindClient findClient;
	41	memset(&findClient, 0, sizeof(WKPageFindClient));
	42	findClient.version = kWKPageFindClientCurrentVersion;
	43	findClient.clientInfo = ewkView;
	44	findClient.didFindString = didFindString;
	45	WKPageSetPageFindClient(pageRef, &findClient);
	46	}