Changeset 95659 in webkit


Ignore:
Timestamp:
Sep 21, 2011 12:17:57 PM (13 years ago)
Author:
demarchi@webkit.org
Message:

[EFL] Revert pointer operator coding style in ewk
https://bugs.webkit.org/show_bug.cgi?id=68231

Reviewed by Antonio Gomes.

The WebKit coding style mandates that "(...) in C++ code - Both pointer
types and reference types should be written with no space between the
type name and the * or &.". Until now EFL port was using the
coding-style of the library for platform code instead of WebKit's.

We are now trying to be more compliant with WebKit coding-style so it's
easier for other reviewers to review EFL code. The first step in this
direction is to move the '*' and '&' of pointers and references to the
right place.

This patch was generated with 'uncrustify' with the configure file
attached to the respective but report. There was one fix that had to be
manually made in order to keep the 'check-webkit-style' happy: a
function definition with a meaningless name. Other functions like this
exist but they will be fixed by a later patch.

Some nice side-effects of using uncrustify:

  • Whitespace cleanup on comments
  • Function parameters are aligned to the open parenthesis
  • Remove tab characters
Location:
trunk/Source/WebKit/efl
Files:
28 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/efl/ChangeLog

    r95656 r95659  
     12011-09-21  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
     2
     3        [EFL] Revert pointer operator coding style in ewk
     4        https://bugs.webkit.org/show_bug.cgi?id=68231
     5
     6        Reviewed by Antonio Gomes.
     7
     8        The WebKit coding style mandates that "(...) in C++ code - Both pointer
     9        types and reference types should be written with no space between the
     10        type name and the * or &.". Until now EFL port was using the
     11        coding-style of the library for platform  code instead of WebKit's.
     12
     13        We are now trying to be more compliant with WebKit coding-style so it's
     14        easier for other reviewers to review EFL code. The first step in this
     15        direction is to move the '*' and '&' of pointers and references to the
     16        right place.
     17
     18        This patch was generated with 'uncrustify' with the configure file
     19        attached to the respective but report. There was one fix that had to be
     20        manually made in order to keep the 'check-webkit-style' happy: a
     21        function definition with a meaningless name. Other functions like this
     22        exist but they will be fixed by a later patch.
     23
     24        Some nice side-effects of using uncrustify:
     25
     26        - Whitespace cleanup on comments
     27        - Function parameters are aligned to the open parenthesis
     28        - Remove tab characters
     29
    1302011-09-21  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
    231
  • trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

    r95271 r95659  
    403403    DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(databaseName, origin);
    404404    quota = ewk_view_exceeded_database_quota(m_view,
    405             kit(frame), databaseName.utf8().data(),
    406             details.currentUsage(), details.expectedUsage());
     405                                             kit(frame), databaseName.utf8().data(),
     406                                             details.currentUsage(), details.expectedUsage());
    407407
    408408    /* if client did not set quota, and database is being created now, the
     
    439439
    440440    EINA_LIST_FREE(selectedFilenames, filename) {
    441         filenames.append((char *)filename);
     441        filenames.append((char*)filename);
    442442        free(filename);
    443443    }
  • trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp

    r92039 r95659  
    386386        case VK_LEFT:
    387387            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    388                     DirectionLeft,
    389                     keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
    390                     UserTriggered);
     388                                       DirectionLeft,
     389                                       keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
     390                                       UserTriggered);
    391391            return true;
    392392        case VK_RIGHT:
    393393            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    394                     DirectionRight,
    395                     keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
    396                     UserTriggered);
     394                                       DirectionRight,
     395                                       keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
     396                                       UserTriggered);
    397397            return true;
    398398        case VK_UP:
    399399            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    400                     DirectionBackward,
    401                     keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
    402                     UserTriggered);
     400                                       DirectionBackward,
     401                                       keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
     402                                       UserTriggered);
    403403            return true;
    404404        case VK_DOWN:
    405405            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    406                     DirectionForward,
    407                     keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
    408                     UserTriggered);
     406                                       DirectionForward,
     407                                       keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
     408                                       UserTriggered);
    409409            return true;
    410410        }
  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

    r95387 r95659  
    6969namespace WebCore {
    7070
    71 FrameLoaderClientEfl::FrameLoaderClientEfl(Evas_Object *view)
     71FrameLoaderClientEfl::FrameLoaderClientEfl(Evas_Object* view)
    7272    : m_view(view)
    7373    , m_frame(0)
     
    108108}
    109109
    110 void FrameLoaderClientEfl::setCustomUserAgent(const String &agent)
     110void FrameLoaderClientEfl::setCustomUserAgent(const String& agent)
    111111{
    112112    m_customUserAgent = agent;
     
    378378
    379379PassRefPtr<Widget> FrameLoaderClientEfl::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL,
    380                                                   const Vector<String>& paramNames, const Vector<String>& paramValues)
     380                                                                const Vector<String>& paramNames, const Vector<String>& paramValues)
    381381{
    382382    notImplemented();
     
    679679}
    680680
    681 void FrameLoaderClientEfl::didChangeTitle(DocumentLoader *l)
     681void FrameLoaderClientEfl::didChangeTitle(DocumentLoader*)
    682682{
    683683    // no need for, dispatchDidReceiveTitle is the right callback
  • trunk/Source/WebKit/efl/WebCoreSupport/IconDatabaseClientEfl.cpp

    r93697 r95659  
    1 /* 
     1/*
    22 *  Copyright (C) 2011 Samsung Electronics
    33 *
  • trunk/Source/WebKit/efl/WebCoreSupport/NotificationPresenterClientEfl.cpp

    r91910 r95659  
    1 /* 
     1/*
    22 *  Copyright (C) 2011 Samsung Electronics
    33 *
  • trunk/Source/WebKit/efl/ewk/ewk_auth.cpp

    r92473 r95659  
    3232}
    3333
    34 void ewk_auth_credentials_set(char *username, char *password, void *data)
     34void ewk_auth_credentials_set(char* username, char* password, void* data)
    3535{
    3636#if USE(SOUP)
  • trunk/Source/WebKit/efl/ewk/ewk_auth_soup.cpp

    r91972 r95659  
    4141
    4242typedef struct _Ewk_Auth_Data {
    43     SoupMessage *msg;
    44     SoupAuth *auth;
    45     SoupSession *session;
     43    SoupMessage* msg;
     44    SoupAuth* auth;
     45    SoupSession* session;
    4646} Ewk_Auth_Data;
    4747
     
    5656                        G_IMPLEMENT_INTERFACE(SOUP_TYPE_SESSION_FEATURE, ewk_auth_soup_dialog_session_feature_init))
    5757
    58 static void ewk_auth_soup_dialog_class_init(Ewk_Soup_Auth_DialogClass *klass)
     58static void ewk_auth_soup_dialog_class_init(Ewk_Soup_Auth_DialogClass* klass)
    5959{
    6060}
    6161
    62 static void ewk_auth_soup_dialog_init(Ewk_Soup_Auth_Dialog *instance)
     62static void ewk_auth_soup_dialog_init(Ewk_Soup_Auth_Dialog* instance)
    6363{
    6464}
    6565
    66 static void ewk_auth_soup_dialog_session_feature_init(SoupSessionFeatureInterface *feature_interface, gpointer interface_data)
     66static void ewk_auth_soup_dialog_session_feature_init(SoupSessionFeatureInterface* feature_interface, gpointer interface_data)
    6767{
    6868    feature_interface->attach = attach;
     
    7575}
    7676
    77 void ewk_auth_soup_credentials_set(const char *username, const char *password, void *data)
     77void ewk_auth_soup_credentials_set(const char* username, const char* password, void* data)
    7878{
    7979    if (!data)
    8080        return;
    8181
    82     Ewk_Auth_Data *auth_data = (Ewk_Auth_Data *)data;
     82    Ewk_Auth_Data* auth_data = (Ewk_Auth_Data*)data;
    8383    soup_auth_authenticate(auth_data->auth, username, password);
    8484    soup_session_unpause_message(auth_data->session, auth_data->msg);
     
    8686}
    8787
    88 static void session_authenticate(SoupSession *session, SoupMessage *msg, SoupAuth *auth, gboolean retrying, gpointer /* user_data */)
     88static void session_authenticate(SoupSession* session, SoupMessage* msg, SoupAuth* auth, gboolean retrying, gpointer /* user_data */)
    8989{
    90     SoupURI *uri;
    91     Ewk_Auth_Data *auth_data;
    92     const char *realm;
     90    SoupURI* uri;
     91    Ewk_Auth_Data* auth_data;
     92    const char* realm;
    9393
    9494    if (!ewk_auth_show_dialog_callback)
    9595        return;
    9696
    97     auth_data = (Ewk_Auth_Data *)calloc(1, sizeof(Ewk_Auth_Data));
     97    auth_data = (Ewk_Auth_Data*)calloc(1, sizeof(Ewk_Auth_Data));
    9898
    9999    if (!auth_data) {
     
    119119}
    120120
    121 static void free_auth_data(Ewk_Auth_Data *auth_data)
     121static void free_auth_data(Ewk_Auth_Data* auth_data)
    122122{
    123123    g_object_unref(auth_data->msg);
     
    127127}
    128128
    129 static void attach(SoupSessionFeature *manager, SoupSession *session)
     129static void attach(SoupSessionFeature* manager, SoupSession* session)
    130130{
    131131    g_signal_connect(session, "authenticate", G_CALLBACK(session_authenticate), manager);
    132132}
    133133
    134 static void detach(SoupSessionFeature *manager, SoupSession *session)
     134static void detach(SoupSessionFeature* manager, SoupSession* session)
    135135{
    136     g_signal_handlers_disconnect_by_func(session, (void *)session_authenticate, manager);
     136    g_signal_handlers_disconnect_by_func(session, (void*)session_authenticate, manager);
    137137}
    138138
  • trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp

    r94063 r95659  
    3939    unsigned int __ref; /**< the reference count of the object */
    4040#if ENABLE(CONTEXT_MENUS)
    41     WebCore::ContextMenuController *controller; /**< the WebCore's object which is responsible for the context menu */
     41    WebCore::ContextMenuController* controller; /**< the WebCore's object which is responsible for the context menu */
    4242#endif
    43     Evas_Object *view; /**< the view object */
    44 
    45     Eina_List *items; /**< the list of items */
     43    Evas_Object* view; /**< the view object */
     44
     45    Eina_List* items; /**< the list of items */
    4646};
    4747
     
    5454    Ewk_Context_Menu_Action action; /**< contains the action of the item */
    5555
    56     const char *title; /**< contains the title of the item */
    57     Ewk_Context_Menu *submenu; /**< contains the pointer to the submenu of the item */
    58 
    59     Eina_Bool checked:1;
    60     Eina_Bool enabled:1;
     56    const char* title; /**< contains the title of the item */
     57    Ewk_Context_Menu* submenu; /**< contains the pointer to the submenu of the item */
     58
     59    Eina_Bool checked : 1;
     60    Eina_Bool enabled : 1;
    6161};
    6262
    63 void ewk_context_menu_ref(Ewk_Context_Menu *menu)
     63void ewk_context_menu_ref(Ewk_Context_Menu* menu)
    6464{
    6565    EINA_SAFETY_ON_NULL_RETURN(menu);
     
    6767}
    6868
    69 void ewk_context_menu_unref(Ewk_Context_Menu *menu)
     69void ewk_context_menu_unref(Ewk_Context_Menu* menu)
    7070{
    7171    EINA_SAFETY_ON_NULL_RETURN(menu);
    72     void *item;
     72    void* item;
    7373
    7474    if (--menu->__ref)
     
    8181}
    8282
    83 Eina_Bool ewk_context_menu_destroy(Ewk_Context_Menu *menu)
     83Eina_Bool ewk_context_menu_destroy(Ewk_Context_Menu* menu)
    8484{
    8585#if ENABLE(CONTEXT_MENUS)
     
    8888    menu->controller->clearContextMenu();
    8989    return EINA_TRUE;
    90 #else 
     90#else
    9191    return EINA_FALSE;
    9292#endif
    9393}
    9494
    95 const Eina_List *ewk_context_menu_item_list_get(const Ewk_Context_Menu *o)
     95const Eina_List* ewk_context_menu_item_list_get(const Ewk_Context_Menu* o)
    9696{
    9797    EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0);
     
    100100}
    101101
    102 Ewk_Context_Menu_Item *ewk_context_menu_item_new(Ewk_Context_Menu_Item_Type type,
    103         Ewk_Context_Menu_Action action, Ewk_Context_Menu *submenu,
    104         const char *title, Eina_Bool checked, Eina_Bool enabled)
    105 {
    106     Ewk_Context_Menu_Item *item = (Ewk_Context_Menu_Item *) malloc(sizeof(*item));
     102Ewk_Context_Menu_Item* ewk_context_menu_item_new(Ewk_Context_Menu_Item_Type type,
     103                                                 Ewk_Context_Menu_Action action, Ewk_Context_Menu* submenu,
     104                                                 const char* title, Eina_Bool checked, Eina_Bool enabled)
     105{
     106    Ewk_Context_Menu_Item* item = (Ewk_Context_Menu_Item*) malloc(sizeof(*item));
    107107    if (!item)
    108108        return 0;
     
    118118}
    119119
    120 Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu *menu, Ewk_Context_Menu_Item *item)
     120Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu* menu, Ewk_Context_Menu_Item* item)
    121121{
    122122#if ENABLE(CONTEXT_MENUS)
     
    135135}
    136136
    137 void ewk_context_menu_item_free(Ewk_Context_Menu_Item *item)
     137void ewk_context_menu_item_free(Ewk_Context_Menu_Item* item)
    138138{
    139139    EINA_SAFETY_ON_NULL_RETURN(item);
     
    143143}
    144144
    145 Ewk_Context_Menu_Item_Type ewk_context_menu_item_type_get(const Ewk_Context_Menu_Item *o)
     145Ewk_Context_Menu_Item_Type ewk_context_menu_item_type_get(const Ewk_Context_Menu_Item* o)
    146146{
    147147    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EWK_ACTION_TYPE);
     
    149149}
    150150
    151 Eina_Bool ewk_context_menu_item_type_set(Ewk_Context_Menu_Item *o, Ewk_Context_Menu_Item_Type type)
     151Eina_Bool ewk_context_menu_item_type_set(Ewk_Context_Menu_Item* o, Ewk_Context_Menu_Item_Type type)
    152152{
    153153    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
     
    156156}
    157157
    158 Ewk_Context_Menu_Action ewk_context_menu_item_action_get(const Ewk_Context_Menu_Item *o)
     158Ewk_Context_Menu_Action ewk_context_menu_item_action_get(const Ewk_Context_Menu_Item* o)
    159159{
    160160    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EWK_CONTEXT_MENU_ITEM_TAG_NO_ACTION);
     
    162162}
    163163
    164 Eina_Bool ewk_context_menu_item_action_set(Ewk_Context_Menu_Item *o, Ewk_Context_Menu_Action action)
     164Eina_Bool ewk_context_menu_item_action_set(Ewk_Context_Menu_Item* o, Ewk_Context_Menu_Action action)
    165165{
    166166    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
     
    169169}
    170170
    171 const char *ewk_context_menu_item_title_get(const Ewk_Context_Menu_Item *o)
     171const char* ewk_context_menu_item_title_get(const Ewk_Context_Menu_Item* o)
    172172{
    173173    EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0);
     
    175175}
    176176
    177 const char *ewk_context_menu_item_title_set(Ewk_Context_Menu_Item *o, const char *title)
     177const char* ewk_context_menu_item_title_set(Ewk_Context_Menu_Item* o, const char* title)
    178178{
    179179    EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0);
     
    182182}
    183183
    184 Eina_Bool ewk_context_menu_item_checked_get(const Ewk_Context_Menu_Item *o)
     184Eina_Bool ewk_context_menu_item_checked_get(const Ewk_Context_Menu_Item* o)
    185185{
    186186    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
     
    188188}
    189189
    190 Eina_Bool ewk_context_menu_item_checked_set(Ewk_Context_Menu_Item *o, Eina_Bool checked)
     190Eina_Bool ewk_context_menu_item_checked_set(Ewk_Context_Menu_Item* o, Eina_Bool checked)
    191191{
    192192    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
     
    195195}
    196196
    197 Eina_Bool ewk_context_menu_item_enabled_get(const Ewk_Context_Menu_Item *o)
     197Eina_Bool ewk_context_menu_item_enabled_get(const Ewk_Context_Menu_Item* o)
    198198{
    199199    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
     
    201201}
    202202
    203 Eina_Bool ewk_context_menu_item_enabled_set(Ewk_Context_Menu_Item *o, Eina_Bool enabled)
     203Eina_Bool ewk_context_menu_item_enabled_set(Ewk_Context_Menu_Item* o, Eina_Bool enabled)
    204204{
    205205    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
     
    223223 * @note emits a signal "contextmenu,new"
    224224 */
    225 Ewk_Context_Menu *ewk_context_menu_new(Evas_Object *view, WebCore::ContextMenuController *controller)
     225Ewk_Context_Menu* ewk_context_menu_new(Evas_Object* view, WebCore::ContextMenuController* controller)
    226226{
    227227    Ewk_Context_Menu* menu;
     
    257257 * @see ewk_context_menu_destroy
    258258 */
    259 Eina_Bool ewk_context_menu_free(Ewk_Context_Menu *o)
     259Eina_Bool ewk_context_menu_free(Ewk_Context_Menu* o)
    260260{
    261261    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
     
    276276 * @see ewk_context_menu_item_new
    277277 */
    278 void ewk_context_menu_item_append(Ewk_Context_Menu *o, WebCore::ContextMenuItem &core)
     278void ewk_context_menu_item_append(Ewk_Context_Menu* o, WebCore::ContextMenuItem& core)
    279279{
    280280    Ewk_Context_Menu_Item_Type type = static_cast<Ewk_Context_Menu_Item_Type>(core.type());
    281281    Ewk_Context_Menu_Action action = static_cast<Ewk_Context_Menu_Action>(core.action());
    282282
    283     Ewk_Context_Menu_Item *menu_item = ewk_context_menu_item_new
    284         (type, action, 0, core.title().utf8().data(), core.checked(),
    285          core.enabled());
     283    Ewk_Context_Menu_Item* menu_item = ewk_context_menu_item_new
     284                                           (type, action, 0, core.title().utf8().data(), core.checked(),
     285                                           core.enabled());
    286286    EINA_SAFETY_ON_NULL_RETURN(menu_item);
    287287
     
    302302 * @see ewk_context_menu_item_list_get
    303303 */
    304 Ewk_Context_Menu *ewk_context_menu_custom_get(const Ewk_Context_Menu *o)
     304Ewk_Context_Menu* ewk_context_menu_custom_get(const Ewk_Context_Menu* o)
    305305{
    306306    EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0);
     
    317317 * @param o the context menu object
    318318 */
    319 void ewk_context_menu_show(const Ewk_Context_Menu *o)
     319void ewk_context_menu_show(const Ewk_Context_Menu* o)
    320320{
    321321    EINA_SAFETY_ON_NULL_RETURN(o);
  • trunk/Source/WebKit/efl/ewk/ewk_cookies.cpp

    r94034 r95659  
    3737
    3838
    39 Eina_Bool ewk_cookies_file_set(const char *filename)
     39Eina_Bool ewk_cookies_file_set(const char* filename)
    4040{
    4141#if USE(SOUP)
    42     SoupCookieJar *cookieJar = 0;
     42    SoupCookieJar* cookieJar = 0;
    4343    if (filename)
    4444        cookieJar = soup_cookie_jar_text_new(filename, FALSE);
     
    5151    soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
    5252
    53     SoupSession *session = WebCore::ResourceHandle::defaultSession();
    54     SoupSessionFeature *oldjar = soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR);
     53    SoupSession* session = WebCore::ResourceHandle::defaultSession();
     54    SoupSessionFeature* oldjar = soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR);
    5555    if (oldjar)
    5656        soup_session_remove_feature(session, oldjar);
     
    6868{
    6969#if USE(SOUP)
    70     GSList *l;
    71     GSList *p;
    72     SoupCookieJar *cookieJar = WebCore::defaultCookieJar();
     70    GSList* l;
     71    GSList* p;
     72    SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
    7373
    7474    l = soup_cookie_jar_all_cookies(cookieJar);
    7575    for (p = l; p; p = p->next)
    76         soup_cookie_jar_delete_cookie(cookieJar, (SoupCookie *)p->data);
     76        soup_cookie_jar_delete_cookie(cookieJar, (SoupCookie*)p->data);
    7777
    7878    soup_cookies_free(l);
     
    8080}
    8181
    82 Eina_List *ewk_cookies_get_all(void)
     82Eina_List* ewk_cookies_get_all(void)
    8383{
    84     Eina_List *el = 0;
     84    Eina_List* el = 0;
    8585#if USE(SOUP)
    86     GSList *l;
    87     GSList *p;
    88     SoupCookieJar *cookieJar = WebCore::defaultCookieJar();
     86    GSList* l;
     87    GSList* p;
     88    SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
    8989
    9090    l = soup_cookie_jar_all_cookies(cookieJar);
    9191    for (p = l; p; p = p->next) {
    92         SoupCookie *cookie = static_cast<SoupCookie*>(p->data);
    93         Ewk_Cookie *c = static_cast<Ewk_Cookie*>(malloc(sizeof(*c)));
     92        SoupCookie* cookie = static_cast<SoupCookie*>(p->data);
     93        Ewk_Cookie* c = static_cast<Ewk_Cookie*>(malloc(sizeof(*c)));
    9494        c->name = strdup(cookie->name);
    9595        c->value = strdup(cookie->value);
     
    107107}
    108108
    109 void ewk_cookies_cookie_del(Ewk_Cookie *cookie)
     109void ewk_cookies_cookie_del(Ewk_Cookie* cookie)
    110110{
    111111#if USE(SOUP)
     
    113113    GSList* l;
    114114    GSList* p;
    115     SoupCookieJar *cookieJar = WebCore::defaultCookieJar();
    116     SoupCookie *c1 = soup_cookie_new(
     115    SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
     116    SoupCookie* c1 = soup_cookie_new(
    117117        cookie->name, cookie->value, cookie->domain, cookie->path, -1);
    118118
    119119    l = soup_cookie_jar_all_cookies(cookieJar);
    120120    for (p = l; p; p = p->next) {
    121         SoupCookie *c2 = static_cast<SoupCookie*>(p->data);
     121        SoupCookie* c2 = static_cast<SoupCookie*>(p->data);
    122122        if (soup_cookie_equal(c1, c2)) {
    123123            soup_cookie_jar_delete_cookie(cookieJar, c2);
     
    131131}
    132132
    133 void ewk_cookies_cookie_free(Ewk_Cookie *cookie)
     133void ewk_cookies_cookie_free(Ewk_Cookie* cookie)
    134134{
    135135#if USE(SOUP)
     
    146146{
    147147#if USE(SOUP)
    148     SoupCookieJar *cookieJar = WebCore::defaultCookieJar();
     148    SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
    149149    SoupCookieJarAcceptPolicy policy;
    150150
     
    170170    Ewk_Cookie_Policy ewk_policy = EWK_COOKIE_JAR_ACCEPT_ALWAYS;
    171171#if USE(SOUP)
    172     SoupCookieJar *cookieJar = WebCore::defaultCookieJar();
     172    SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
    173173    SoupCookieJarAcceptPolicy policy;
    174174
  • trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

    r95656 r95659  
    6464struct Ewk_Frame_Smart_Data {
    6565    Evas_Object_Smart_Clipped_Data base;
    66     Evas_Object *self;
    67     Evas_Object *view;
     66    Evas_Object* self;
     67    Evas_Object* view;
    6868#ifdef EWK_FRAME_DEBUG
    69     Evas_Object *region;
     69    Evas_Object* region;
    7070#endif
    71     WebCore::Frame *frame;
    72     const char *title;
    73     const char *uri;
    74     const char *name;
     71    WebCore::Frame* frame;
     72    const char* title;
     73    const char* uri;
     74    const char* name;
    7575    struct {
    7676        Evas_Coord w, h;
    7777    } contents_size;
    78     Eina_Bool textZoom:1;
    79     Eina_Bool editable:1;
     78    Eina_Bool textZoom : 1;
     79    Eina_Bool editable : 1;
    8080};
    8181
    8282struct Eina_Iterator_Ewk_Frame {
    8383    Eina_Iterator base;
    84     Evas_Object *obj;
     84    Evas_Object* obj;
    8585    unsigned currentIndex;
    8686};
     
    9191#define EWK_FRAME_TYPE_CHECK(o, ...)                                    \
    9292    do {                                                                \
    93         const char *_tmp_otype = evas_object_type_get(o);               \
     93        const char* _tmp_otype = evas_object_type_get(o);               \
    9494        if (EINA_UNLIKELY(_tmp_otype != EWK_FRAME_TYPE_STR)) {          \
    9595            EINA_LOG_CRIT                                               \
    9696                ("%p (%s) is not of an ewk_frame!", o,                  \
    97                  _tmp_otype ? _tmp_otype : "(null)");                   \
     97                _tmp_otype ? _tmp_otype : "(null)");                    \
    9898            return __VA_ARGS__;                                         \
    9999        }                                                               \
     
    102102
    103103#define EWK_FRAME_SD_GET(o, ptr)                                \
    104     Ewk_Frame_Smart_Data *ptr = (Ewk_Frame_Smart_Data *)evas_object_smart_data_get(o)
     104    Ewk_Frame_Smart_Data *ptr = (Ewk_Frame_Smart_Data*)evas_object_smart_data_get(o)
    105105
    106106#define EWK_FRAME_SD_GET_OR_RETURN(o, ptr, ...)         \
     
    116116
    117117#ifdef EWK_FRAME_DEBUG
    118 static inline void _ewk_frame_debug(Evas_Object *o)
    119 {
    120     Evas_Object *clip, *parent;
     118static inline void _ewk_frame_debug(Evas_Object* o)
     119{
     120    Evas_Object* clip, * parent;
    121121    Evas_Coord x, y, w, h, cx, cy, cw, ch;
    122122    int r, g, b, a, cr, cg, cb, ca;
     
    141141#endif
    142142
    143 static WebCore::FrameLoaderClientEfl *_ewk_frame_loader_efl_get(WebCore::Frame *frame)
     143static WebCore::FrameLoaderClientEfl* _ewk_frame_loader_efl_get(WebCore::Frame* frame)
    144144{
    145145    return static_cast<WebCore::FrameLoaderClientEfl*>(frame->loader()->client());
    146146}
    147147
    148 static inline Evas_Object *kit(WebCore::Frame *frame)
     148static inline Evas_Object* kit(WebCore::Frame* frame)
    149149{
    150150    if (!frame)
    151151        return 0;
    152     WebCore::FrameLoaderClientEfl *fl = _ewk_frame_loader_efl_get(frame);
     152    WebCore::FrameLoaderClientEfl* fl = _ewk_frame_loader_efl_get(frame);
    153153    if (!fl)
    154154        return 0;
     
    156156}
    157157
    158 static Eina_Bool _ewk_frame_children_iterator_next(Eina_Iterator_Ewk_Frame *it, Evas_Object **data)
     158static Eina_Bool _ewk_frame_children_iterator_next(Eina_Iterator_Ewk_Frame* it, Evas_Object** data)
    159159{
    160160    EWK_FRAME_SD_GET_OR_RETURN(it->obj, sd, EINA_FALSE);
     
    172172}
    173173
    174 static Evas_Object *_ewk_frame_children_iterator_get_container(Eina_Iterator_Ewk_Frame *it)
     174static Evas_Object* _ewk_frame_children_iterator_get_container(Eina_Iterator_Ewk_Frame* it)
    175175{
    176176    return it->obj;
    177177}
    178178
    179 static void _ewk_frame_smart_add(Evas_Object *o)
     179static void _ewk_frame_smart_add(Evas_Object* o)
    180180{
    181181    EWK_FRAME_SD_GET(o, sd);
     
    256256}
    257257
    258 static void _ewk_frame_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)
     258static void _ewk_frame_smart_resize(Evas_Object* o, Evas_Coord w, Evas_Coord h)
    259259{
    260260    EWK_FRAME_SD_GET(o, sd);
     
    271271}
    272272
    273 static void _ewk_frame_smart_set(Evas_Smart_Class *api)
     273static void _ewk_frame_smart_set(Evas_Smart_Class* api)
    274274{
    275275    evas_object_smart_clipped_smart_set(api);
     
    279279}
    280280
    281 static inline Evas_Smart *_ewk_frame_smart_class_new(void)
     281static inline Evas_Smart* _ewk_frame_smart_class_new(void)
    282282{
    283283    static Evas_Smart_Class sc = EVAS_SMART_CLASS_INIT_NAME_VERSION(EWK_FRAME_TYPE_STR);
    284     static Evas_Smart *smart = 0;
     284    static Evas_Smart* smart = 0;
    285285
    286286    if (EINA_UNLIKELY(!smart)) {
     
    293293}
    294294
    295 Evas_Object *ewk_frame_view_get(const Evas_Object *o)
     295Evas_Object* ewk_frame_view_get(const Evas_Object* o)
    296296{
    297297    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    299299}
    300300
    301 Eina_Iterator *ewk_frame_children_iterator_new(Evas_Object *o)
     301Eina_Iterator* ewk_frame_children_iterator_new(Evas_Object* o)
    302302{
    303303    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
    304     Eina_Iterator_Ewk_Frame *it = (Eina_Iterator_Ewk_Frame *)
    305         calloc(1, sizeof(Eina_Iterator_Ewk_Frame));
     304    Eina_Iterator_Ewk_Frame* it = (Eina_Iterator_Ewk_Frame*)
     305                                  calloc(1, sizeof(Eina_Iterator_Ewk_Frame));
    306306    if (!it)
    307307        return 0;
     
    316316}
    317317
    318 Evas_Object *ewk_frame_child_find(Evas_Object *o, const char *name)
     318Evas_Object* ewk_frame_child_find(Evas_Object* o, const char* name)
    319319{
    320320    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    325325}
    326326
    327 Eina_Bool ewk_frame_uri_set(Evas_Object *o, const char *uri)
     327Eina_Bool ewk_frame_uri_set(Evas_Object* o, const char* uri)
    328328{
    329329    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
    330330    WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(uri));
    331331    WebCore::ResourceRequest req(kurl);
    332     WebCore::FrameLoader *loader = sd->frame->loader();
     332    WebCore::FrameLoader* loader = sd->frame->loader();
    333333    loader->load(req, false);
    334334    return EINA_TRUE;
    335335}
    336336
    337 const char *ewk_frame_uri_get(const Evas_Object *o)
     337const char* ewk_frame_uri_get(const Evas_Object* o)
    338338{
    339339    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    341341}
    342342
    343 const char *ewk_frame_title_get(const Evas_Object *o)
     343const char* ewk_frame_title_get(const Evas_Object* o)
    344344{
    345345    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    347347}
    348348
    349 const char *ewk_frame_name_get(const Evas_Object *o)
     349const char* ewk_frame_name_get(const Evas_Object* o)
    350350{
    351351    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    366366}
    367367
    368 Eina_Bool ewk_frame_contents_size_get(const Evas_Object *o, Evas_Coord *w, Evas_Coord *h)
     368Eina_Bool ewk_frame_contents_size_get(const Evas_Object* o, Evas_Coord* w, Evas_Coord* h)
    369369{
    370370    if (w)
     
    380380}
    381381
    382 static Eina_Bool _ewk_frame_contents_set_internal(Ewk_Frame_Smart_Data *sd, const char *contents, size_t contents_size, const char *mime_type, const char *encoding, const char *base_uri, const char *unreachable_uri)
     382static Eina_Bool _ewk_frame_contents_set_internal(Ewk_Frame_Smart_Data* sd, const char* contents, size_t contents_size, const char* mime_type, const char* encoding, const char* base_uri, const char* unreachable_uri)
    383383{
    384384    size_t len = strlen(contents);
     
    402402    WebCore::SubstituteData substituteData
    403403        (buffer.release(),
    404          WTF::String::fromUTF8(mime_type),
    405          WTF::String::fromUTF8(encoding),
    406          baseKURL, unreachableKURL);
     404        WTF::String::fromUTF8(mime_type),
     405        WTF::String::fromUTF8(encoding),
     406        baseKURL, unreachableKURL);
    407407    WebCore::ResourceRequest request(baseKURL);
    408408
     
    411411}
    412412
    413 Eina_Bool ewk_frame_contents_set(Evas_Object *o, const char *contents, size_t contents_size, const char *mime_type, const char *encoding, const char *base_uri)
     413Eina_Bool ewk_frame_contents_set(Evas_Object* o, const char* contents, size_t contents_size, const char* mime_type, const char* encoding, const char* base_uri)
    414414{
    415415    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    417417    EINA_SAFETY_ON_NULL_RETURN_VAL(contents, EINA_FALSE);
    418418    return _ewk_frame_contents_set_internal
    419         (sd, contents, contents_size, mime_type, encoding, base_uri, 0);
    420 }
    421 
    422 Eina_Bool ewk_frame_contents_alternate_set(Evas_Object *o, const char *contents, size_t contents_size, const char *mime_type, const char *encoding, const char *base_uri, const char *unreachable_uri)
     419               (sd, contents, contents_size, mime_type, encoding, base_uri, 0);
     420}
     421
     422Eina_Bool ewk_frame_contents_alternate_set(Evas_Object* o, const char* contents, size_t contents_size, const char* mime_type, const char* encoding, const char* base_uri, const char* unreachable_uri)
    423423{
    424424    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    427427    EINA_SAFETY_ON_NULL_RETURN_VAL(unreachable_uri, EINA_FALSE);
    428428    return _ewk_frame_contents_set_internal
    429         (sd, contents, contents_size, mime_type, encoding, base_uri,
    430          unreachable_uri);
    431 }
    432 
    433 Eina_Bool ewk_frame_script_execute(Evas_Object *o, const char *script)
     429               (sd, contents, contents_size, mime_type, encoding, base_uri,
     430               unreachable_uri);
     431}
     432
     433Eina_Bool ewk_frame_script_execute(Evas_Object* o, const char* script)
    434434{
    435435    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    440440}
    441441
    442 Eina_Bool ewk_frame_editable_get(const Evas_Object *o)
     442Eina_Bool ewk_frame_editable_get(const Evas_Object* o)
    443443{
    444444    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    447447}
    448448
    449 Eina_Bool ewk_frame_editable_set(Evas_Object *o, Eina_Bool editable)
     449Eina_Bool ewk_frame_editable_set(Evas_Object* o, Eina_Bool editable)
    450450{
    451451    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    459459}
    460460
    461 char *ewk_frame_selection_get(const Evas_Object *o)
     461char* ewk_frame_selection_get(const Evas_Object* o)
    462462{
    463463    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    469469}
    470470
    471 Eina_Bool ewk_frame_text_search(const Evas_Object *o, const char *string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap)
     471Eina_Bool ewk_frame_text_search(const Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap)
    472472{
    473473    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    478478}
    479479
    480 unsigned int ewk_frame_text_matches_mark(Evas_Object *o, const char *string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit)
     480unsigned int ewk_frame_text_matches_mark(Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit)
    481481{
    482482    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    488488}
    489489
    490 Eina_Bool ewk_frame_text_matches_unmark_all(Evas_Object *o)
     490Eina_Bool ewk_frame_text_matches_unmark_all(Evas_Object* o)
    491491{
    492492    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    497497}
    498498
    499 Eina_Bool ewk_frame_text_matches_highlight_set(Evas_Object *o, Eina_Bool highlight)
     499Eina_Bool ewk_frame_text_matches_highlight_set(Evas_Object* o, Eina_Bool highlight)
    500500{
    501501    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    505505}
    506506
    507 Eina_Bool ewk_frame_text_matches_highlight_get(const Evas_Object *o)
     507Eina_Bool ewk_frame_text_matches_highlight_get(const Evas_Object* o)
    508508{
    509509    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    515515 * Comparison function used by ewk_frame_text_matches_nth_pos_get
    516516 */
    517 static bool _ewk_frame_rect_cmp_less_than(const WebCore::IntRect &i, const WebCore::IntRect &j)
     517static bool _ewk_frame_rect_cmp_less_than(const WebCore::IntRect& i, const WebCore::IntRect& j)
    518518{
    519519    return (i.y() < j.y() || (i.y() == j.y() && i.x() < j.x()));
     
    523523 * Predicate used by ewk_frame_text_matches_nth_pos_get
    524524 */
    525 static bool _ewk_frame_rect_is_negative_value(const WebCore::IntRect &i)
     525static bool _ewk_frame_rect_is_negative_value(const WebCore::IntRect& i)
    526526{
    527527    return (i.x() < 0 || i.y() < 0);
    528528}
    529529
    530 Eina_Bool ewk_frame_text_matches_nth_pos_get(const Evas_Object *o, size_t n, int *x, int *y)
     530Eina_Bool ewk_frame_text_matches_nth_pos_get(const Evas_Object* o, size_t n, int* x, int* y)
    531531{
    532532    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    539539
    540540    if (intRects.isEmpty() || n > intRects.size())
    541       return EINA_FALSE;
     541        return EINA_FALSE;
    542542
    543543    std::sort(intRects.begin(), intRects.end(), _ewk_frame_rect_cmp_less_than);
    544544
    545545    if (x)
    546       *x = intRects[n - 1].x();
     546        *x = intRects[n - 1].x();
    547547    if (y)
    548       *y = intRects[n - 1].y();
    549     return EINA_TRUE;
    550 }
    551 
    552 Eina_Bool ewk_frame_stop(Evas_Object *o)
     548        *y = intRects[n - 1].y();
     549    return EINA_TRUE;
     550}
     551
     552Eina_Bool ewk_frame_stop(Evas_Object* o)
    553553{
    554554    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    558558}
    559559
    560 Eina_Bool ewk_frame_reload(Evas_Object *o)
     560Eina_Bool ewk_frame_reload(Evas_Object* o)
    561561{
    562562    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    566566}
    567567
    568 Eina_Bool ewk_frame_reload_full(Evas_Object *o)
     568Eina_Bool ewk_frame_reload_full(Evas_Object* o)
    569569{
    570570    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    574574}
    575575
    576 Eina_Bool ewk_frame_back(Evas_Object *o)
     576Eina_Bool ewk_frame_back(Evas_Object* o)
    577577{
    578578    return ewk_frame_navigate(o, -1);
    579579}
    580580
    581 Eina_Bool ewk_frame_forward(Evas_Object *o)
     581Eina_Bool ewk_frame_forward(Evas_Object* o)
    582582{
    583583    return ewk_frame_navigate(o, 1);
    584584}
    585585
    586 Eina_Bool ewk_frame_navigate(Evas_Object *o, int steps)
    587 {
    588     EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
    589     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
    590     WebCore::Page *page = sd->frame->page();
     586Eina_Bool ewk_frame_navigate(Evas_Object* o, int steps)
     587{
     588    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     589    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     590    WebCore::Page* page = sd->frame->page();
    591591    if (!page->canGoBackOrForward(steps))
    592592        return EINA_FALSE;
     
    595595}
    596596
    597 Eina_Bool ewk_frame_back_possible(Evas_Object *o)
     597Eina_Bool ewk_frame_back_possible(Evas_Object* o)
    598598{
    599599    return ewk_frame_navigate_possible(o, -1);
    600600}
    601601
    602 Eina_Bool ewk_frame_forward_possible(Evas_Object *o)
     602Eina_Bool ewk_frame_forward_possible(Evas_Object* o)
    603603{
    604604    return ewk_frame_navigate_possible(o, 1);
    605605}
    606606
    607 Eina_Bool ewk_frame_navigate_possible(Evas_Object *o, int steps)
     607Eina_Bool ewk_frame_navigate_possible(Evas_Object* o, int steps)
    608608{
    609609    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    613613}
    614614
    615 float ewk_frame_zoom_get(const Evas_Object *o)
     615float ewk_frame_zoom_get(const Evas_Object* o)
    616616{
    617617    EWK_FRAME_SD_GET_OR_RETURN(o, sd, -1.0);
     
    623623}
    624624
    625 Eina_Bool ewk_frame_zoom_set(Evas_Object *o, float zoom)
     625Eina_Bool ewk_frame_zoom_set(Evas_Object* o, float zoom)
    626626{
    627627    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    634634}
    635635
    636 Eina_Bool ewk_frame_zoom_text_only_get(const Evas_Object *o)
     636Eina_Bool ewk_frame_zoom_text_only_get(const Evas_Object* o)
    637637{
    638638    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    640640}
    641641
    642 Eina_Bool ewk_frame_zoom_text_only_set(Evas_Object *o, Eina_Bool setting)
     642Eina_Bool ewk_frame_zoom_text_only_set(Evas_Object* o, Eina_Bool setting)
    643643{
    644644    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    656656}
    657657
    658 void ewk_frame_hit_test_free(Ewk_Hit_Test *hit_test)
     658void ewk_frame_hit_test_free(Ewk_Hit_Test* hit_test)
    659659{
    660660    EINA_SAFETY_ON_NULL_RETURN(hit_test);
     
    669669}
    670670
    671 Ewk_Hit_Test *ewk_frame_hit_test_new(const Evas_Object *o, int x, int y)
     671Ewk_Hit_Test* ewk_frame_hit_test_new(const Evas_Object* o, int x, int y)
    672672{
    673673    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    679679
    680680    WebCore::HitTestResult result = sd->frame->eventHandler()->hitTestResultAtPoint
    681         (view->windowToContents(WebCore::IntPoint(x, y)),
    682          /*allowShadowContent*/ false, /*ignoreClipping*/ true);
     681                                        (view->windowToContents(WebCore::IntPoint(x, y)),
     682                                        /*allowShadowContent*/ false, /*ignoreClipping*/ true);
    683683
    684684    if (result.scrollbar())
     
    687687        return 0;
    688688
    689     Ewk_Hit_Test *hit_test = (Ewk_Hit_Test *)calloc(1, sizeof(Ewk_Hit_Test));
     689    Ewk_Hit_Test* hit_test = (Ewk_Hit_Test*)calloc(1, sizeof(Ewk_Hit_Test));
    690690    if (!hit_test) {
    691691        CRITICAL("Could not allocate memory for hit test.");
     
    742742
    743743Eina_Bool
    744 ewk_frame_scroll_add(Evas_Object *o, int dx, int dy)
     744ewk_frame_scroll_add(Evas_Object* o, int dx, int dy)
    745745{
    746746    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    752752
    753753Eina_Bool
    754 ewk_frame_scroll_set(Evas_Object *o, int x, int y)
     754ewk_frame_scroll_set(Evas_Object* o, int x, int y)
    755755{
    756756    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    762762
    763763Eina_Bool
    764 ewk_frame_scroll_size_get(const Evas_Object *o, int *w, int *h)
     764ewk_frame_scroll_size_get(const Evas_Object* o, int* w, int* h)
    765765{
    766766    if (w)
     
    780780
    781781Eina_Bool
    782 ewk_frame_scroll_pos_get(const Evas_Object *o, int *x, int *y)
     782ewk_frame_scroll_pos_get(const Evas_Object* o, int* x, int* y)
    783783{
    784784    if (x)
     
    797797}
    798798
    799 Eina_Bool ewk_frame_visible_content_geometry_get(const Evas_Object *o, Eina_Bool include_scrollbars, int *x, int *y, int *w, int *h)
     799Eina_Bool ewk_frame_visible_content_geometry_get(const Evas_Object* o, Eina_Bool include_scrollbars, int* x, int* y, int* w, int* h)
    800800{
    801801    if (x)
     
    822822}
    823823
    824 Eina_Bool ewk_frame_paint_full_get(const Evas_Object *o)
     824Eina_Bool ewk_frame_paint_full_get(const Evas_Object* o)
    825825{
    826826    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    830830}
    831831
    832 void ewk_frame_paint_full_set(Evas_Object *o, Eina_Bool flag)
     832void ewk_frame_paint_full_set(Evas_Object* o, Eina_Bool flag)
    833833{
    834834    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
     
    838838}
    839839
    840 Eina_Bool ewk_frame_feed_focus_in(Evas_Object *o)
     840Eina_Bool ewk_frame_feed_focus_in(Evas_Object* o)
    841841{
    842842    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    847847}
    848848
    849 Eina_Bool ewk_frame_feed_focus_out(Evas_Object *o)
     849Eina_Bool ewk_frame_feed_focus_out(Evas_Object* o)
    850850{
    851851    // TODO: what to do on focus out?
     
    854854}
    855855
    856 Eina_Bool ewk_frame_feed_mouse_wheel(Evas_Object *o, const Evas_Event_Mouse_Wheel *ev)
     856Eina_Bool ewk_frame_feed_mouse_wheel(Evas_Object* o, const Evas_Event_Mouse_Wheel* ev)
    857857{
    858858    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    869869}
    870870
    871 Eina_Bool ewk_frame_feed_mouse_down(Evas_Object *o, const Evas_Event_Mouse_Down *ev)
     871Eina_Bool ewk_frame_feed_mouse_down(Evas_Object* o, const Evas_Event_Mouse_Down* ev)
    872872{
    873873    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    887887}
    888888
    889 Eina_Bool ewk_frame_feed_mouse_up(Evas_Object *o, const Evas_Event_Mouse_Up *ev)
     889Eina_Bool ewk_frame_feed_mouse_up(Evas_Object* o, const Evas_Event_Mouse_Up* ev)
    890890{
    891891    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    893893    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, EINA_FALSE);
    894894
    895     WebCore::FrameView *view = sd->frame->view();
     895    WebCore::FrameView* view = sd->frame->view();
    896896    DBG("o=%p, view=%p, button=%d, pos=%d,%d",
    897897        o, view, ev->button, ev->canvas.x, ev->canvas.y);
     
    905905}
    906906
    907 Eina_Bool ewk_frame_feed_mouse_move(Evas_Object *o, const Evas_Event_Mouse_Move *ev)
     907Eina_Bool ewk_frame_feed_mouse_move(Evas_Object* o, const Evas_Event_Mouse_Move* ev)
    908908{
    909909    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    924924}
    925925
    926 Eina_Bool ewk_frame_feed_touch_event(Evas_Object *o, Ewk_Touch_Event_Type action, Eina_List *points, int metaState)
     926Eina_Bool ewk_frame_feed_touch_event(Evas_Object* o, Ewk_Touch_Event_Type action, Eina_List* points, int metaState)
    927927{
    928928    Eina_Bool ret = EINA_FALSE;
     
    962962}
    963963
    964 static inline Eina_Bool _ewk_frame_handle_key_scrolling(WebCore::Frame *frame, const WebCore::PlatformKeyboardEvent &event)
     964static inline Eina_Bool _ewk_frame_handle_key_scrolling(WebCore::Frame* frame, const WebCore::PlatformKeyboardEvent& event)
    965965{
    966966    WebCore::ScrollDirection direction;
     
    10101010    case VK_DOWN:
    10111011        direction = WebCore::ScrollDown;
    1012          if (event.ctrlKey())
     1012        if (event.ctrlKey())
    10131013            granularity = WebCore::ScrollByDocument;
    10141014        else
     
    10261026}
    10271027
    1028 Eina_Bool ewk_frame_feed_key_down(Evas_Object *o, const Evas_Event_Key_Down *ev)
     1028Eina_Bool ewk_frame_feed_key_down(Evas_Object* o, const Evas_Event_Key_Down* ev)
    10291029{
    10301030    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    10421042}
    10431043
    1044 Eina_Bool ewk_frame_feed_key_up(Evas_Object *o, const Evas_Event_Key_Up *ev)
     1044Eina_Bool ewk_frame_feed_key_up(Evas_Object* o, const Evas_Event_Key_Up* ev)
    10451045{
    10461046    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    10551055}
    10561056
    1057 Ewk_Text_Selection_Type ewk_frame_text_selection_type_get(const Evas_Object *o)
     1057Ewk_Text_Selection_Type ewk_frame_text_selection_type_get(const Evas_Object* o)
    10581058{
    10591059    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EWK_TEXT_SELECTION_NONE);
    10601060    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EWK_TEXT_SELECTION_NONE);
    10611061
    1062     WebCore::FrameSelection *controller = sd->frame->selection();
     1062    WebCore::FrameSelection* controller = sd->frame->selection();
    10631063    if (!controller)
    10641064        return EWK_TEXT_SELECTION_NONE;
     
    10891089 * @return a new frame object or @c 0 on failure
    10901090 */
    1091 Evas_Object *ewk_frame_add(Evas *e)
     1091Evas_Object* ewk_frame_add(Evas* e)
    10921092{
    10931093    return evas_object_smart_add(e, _ewk_frame_smart_class_new());
     
    11011101 * This is internal and should never be called by external users.
    11021102 */
    1103 Eina_Bool ewk_frame_init(Evas_Object *o, Evas_Object *view, WebCore::Frame *frame)
     1103Eina_Bool ewk_frame_init(Evas_Object* o, Evas_Object* view, WebCore::Frame* frame)
    11041104{
    11051105    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    11231123 * Adds child to the frame.
    11241124 */
    1125 Eina_Bool ewk_frame_child_add(Evas_Object *o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String &name, const WebCore::KURL &url, const WTF::String &referrer)
     1125Eina_Bool ewk_frame_child_add(Evas_Object* o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String& name, const WebCore::KURL& url, const WTF::String& referrer)
    11261126{
    11271127    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
    11281128    char buf[256];
    1129     Evas_Object *frame;
     1129    Evas_Object* frame;
    11301130    WebCore::Frame* cf;
    11311131
     
    11921192 * Frame was destroyed by loader, remove internal reference.
    11931193 */
    1194 void ewk_frame_core_gone(Evas_Object *o)
     1194void ewk_frame_core_gone(Evas_Object* o)
    11951195{
    11961196    DBG("o=%p", o);
     
    12061206 * actions instead.
    12071207 */
    1208 WebCore::Frame* ewk_frame_core_get(const Evas_Object *o)
     1208WebCore::Frame* ewk_frame_core_get(const Evas_Object* o)
    12091209{
    12101210    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    12251225 * Emits signal: "resource,request,willsend"
    12261226 */
    1227 void ewk_frame_request_will_send(Evas_Object *o, Ewk_Frame_Resource_Request *request)
     1227void ewk_frame_request_will_send(Evas_Object* o, Ewk_Frame_Resource_Request* request)
    12281228{
    12291229    evas_object_smart_callback_call(o, "resource,request,willsend", request);
     
    12391239 * Emits signal: "resource,request,new"
    12401240 */
    1241 void ewk_frame_request_assign_identifier(Evas_Object *o, const Ewk_Frame_Resource_Request *request)
    1242 {
    1243     evas_object_smart_callback_call(o, "resource,request,new", (void *)request);
     1241void ewk_frame_request_assign_identifier(Evas_Object* o, const Ewk_Frame_Resource_Request* request)
     1242{
     1243    evas_object_smart_callback_call(o, "resource,request,new", (void*)request);
    12441244}
    12451245
     
    12521252 * Emits signal: "navigation,first"
    12531253 */
    1254 void ewk_frame_did_perform_first_navigation(Evas_Object *o)
     1254void ewk_frame_did_perform_first_navigation(Evas_Object* o)
    12551255{
    12561256    evas_object_smart_callback_call(o, "navigation,first", 0);
     
    12661266 * Emits signal: "state,save"
    12671267 */
    1268 void ewk_frame_view_state_save(Evas_Object *o, WebCore::HistoryItem *item)
     1268void ewk_frame_view_state_save(Evas_Object* o, WebCore::HistoryItem* item)
    12691269{
    12701270    evas_object_smart_callback_call(o, "state,save", 0);
     
    12771277 * Emits signal: "load,started" with no parameters.
    12781278 */
    1279 void ewk_frame_load_started(Evas_Object *o)
    1280 {
    1281     Evas_Object *main_frame;
     1279void ewk_frame_load_started(Evas_Object* o)
     1280{
     1281    Evas_Object* main_frame;
    12821282    DBG("o=%p", o);
    12831283    evas_object_smart_callback_call(o, "load,started", 0);
     
    12981298 * Emits signal: "load,provisional" with no parameters.
    12991299 */
    1300 void ewk_frame_load_provisional(Evas_Object *o)
     1300void ewk_frame_load_provisional(Evas_Object* o)
    13011301{
    13021302    evas_object_smart_callback_call(o, "load,provisional", 0);
     
    13111311 * Emits signal: "load,firstlayout,finished" with no parameters.
    13121312 */
    1313 void ewk_frame_load_firstlayout_finished(Evas_Object *o)
     1313void ewk_frame_load_firstlayout_finished(Evas_Object* o)
    13141314{
    13151315    evas_object_smart_callback_call(o, "load,firstlayout,finished", 0);
     
    13241324 * Emits signal: "load,nonemptylayout,finished" with no parameters.
    13251325 */
    1326 void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object *o)
     1326void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* o)
    13271327{
    13281328    evas_object_smart_callback_call(o, "load,nonemptylayout,finished", 0);
     
    13371337 * Emits signal: "load,document,finished" with no parameters.
    13381338 */
    1339 void ewk_frame_load_document_finished(Evas_Object *o)
     1339void ewk_frame_load_document_finished(Evas_Object* o)
    13401340{
    13411341    evas_object_smart_callback_call(o, "load,document,finished", 0);
     
    13521352 *       compatible with previous WebKit.
    13531353 */
    1354 void ewk_frame_load_finished(Evas_Object *o, const char *error_domain, int error_code, Eina_Bool is_cancellation, const char *error_description, const char *failing_url)
    1355 {
    1356     Ewk_Frame_Load_Error buf, *error;
     1354void ewk_frame_load_finished(Evas_Object* o, const char* error_domain, int error_code, Eina_Bool is_cancellation, const char* error_description, const char* failing_url)
     1355{
     1356    Ewk_Frame_Load_Error buf, * error;
    13571357    if (!error_domain) {
    13581358        DBG("o=%p, success.", o);
     
    13821382 * Emits signal: "load,error" with pointer to Ewk_Frame_Load_Error.
    13831383 */
    1384 void ewk_frame_load_error(Evas_Object *o, const char *error_domain, int error_code, Eina_Bool is_cancellation, const char *error_description, const char *failing_url)
     1384void ewk_frame_load_error(Evas_Object* o, const char* error_domain, int error_code, Eina_Bool is_cancellation, const char* error_description, const char* failing_url)
    13851385{
    13861386    Ewk_Frame_Load_Error error;
     
    14091409 * Emits signal: "load,progress" with pointer to a double from 0.0 to 1.0.
    14101410 */
    1411 void ewk_frame_load_progress_changed(Evas_Object *o)
     1411void ewk_frame_load_progress_changed(Evas_Object* o)
    14121412{
    14131413    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
     
    14291429 * Reports contents size changed.
    14301430 */
    1431 void ewk_frame_contents_size_changed(Evas_Object *o, Evas_Coord w, Evas_Coord h)
     1431void ewk_frame_contents_size_changed(Evas_Object* o, Evas_Coord w, Evas_Coord h)
    14321432{
    14331433    DBG("o=%p: %dx%d", o, w, h);
     
    14481448 * Reports title changed.
    14491449 */
    1450 void ewk_frame_title_set(Evas_Object *o, const char *title)
     1450void ewk_frame_title_set(Evas_Object* o, const char* title)
    14511451{
    14521452    DBG("o=%p, title=%s", o, title ? title : "(null)");
     
    14541454    if (!eina_stringshare_replace(&sd->title, title))
    14551455        return;
    1456     evas_object_smart_callback_call(o, "title,changed", (void *)sd->title);
     1456    evas_object_smart_callback_call(o, "title,changed", (void*)sd->title);
    14571457}
    14581458
     
    14621462 * Creates a view.
    14631463 */
    1464 void ewk_frame_view_create_for_view(Evas_Object *o, Evas_Object *view)
     1464void ewk_frame_view_create_for_view(Evas_Object* o, Evas_Object* view)
    14651465{
    14661466    DBG("o=%p, view=%p", o, view);
     
    14871487        return;
    14881488
    1489     const char *theme = ewk_view_theme_get(view);
     1489    const char* theme = ewk_view_theme_get(view);
    14901490    sd->frame->view()->setEdjeTheme(theme);
    14911491    sd->frame->view()->setEvasObject(o);
    14921492}
    14931493
    1494 ssize_t ewk_frame_source_get(const Evas_Object *o, char **frame_source)
     1494ssize_t ewk_frame_source_get(const Evas_Object* o, char** frame_source)
    14951495{
    14961496    EWK_FRAME_SD_GET_OR_RETURN(o, sd, -1);
     
    15091509
    15101510    // Look for <html> tag. If it exists, the node contatins all document's source.
    1511     WebCore::Node *documentNode = sd->frame->document()->documentElement();
     1511    WebCore::Node* documentNode = sd->frame->document()->documentElement();
    15121512    if (documentNode)
    1513         for (WebCore::Node *node = documentNode->firstChild(); node; node = node->parentElement()) {
     1513        for (WebCore::Node* node = documentNode->firstChild(); node; node = node->parentElement()) {
    15141514            if (node->hasTagName(WebCore::HTMLNames::htmlTag)) {
    1515                 WebCore::HTMLElement *element = static_cast<WebCore::HTMLElement*>(node);
     1515                WebCore::HTMLElement* element = static_cast<WebCore::HTMLElement*>(node);
    15161516                if (element)
    15171517                    source = element->outerHTML();
     
    15421542}
    15431543
    1544 Eina_List *ewk_frame_resources_location_get(const Evas_Object *o)
     1544Eina_List* ewk_frame_resources_location_get(const Evas_Object* o)
    15451545{
    15461546    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
     
    15481548    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->document(), 0);
    15491549
    1550     Eina_List *listOfImagesLocation = 0;
     1550    Eina_List* listOfImagesLocation = 0;
    15511551
    15521552    // Get src attibute of images and saves them to the Eina_List.
    15531553    RefPtr<WebCore::HTMLCollection> images = sd->frame->document()->images();
    15541554    for (size_t index = 0; index < images->length(); ++index) {
    1555         WebCore::HTMLImageElement *imageElement = static_cast<WebCore::HTMLImageElement*>(images->item(index));
     1555        WebCore::HTMLImageElement* imageElement = static_cast<WebCore::HTMLImageElement*>(images->item(index));
    15561556        if (!imageElement || imageElement->src().isNull() || imageElement->src().isEmpty())
    15571557            continue;
     
    15591559        WTF::String imageLocation = imageElement->src().string();
    15601560        // Look for duplicated location.
    1561         Eina_List *listIterator = 0;
    1562         void *data = 0;
     1561        Eina_List* listIterator = 0;
     1562        void* data = 0;
    15631563        Eina_Bool found = EINA_FALSE;
    15641564        EINA_LIST_FOREACH(listOfImagesLocation, listIterator, data)
     
    15681568            continue;
    15691569
    1570         char *imageLocationCopy = strdup(imageLocation.utf8().data());
     1570        char* imageLocationCopy = strdup(imageLocation.utf8().data());
    15711571        if (!imageLocationCopy)
    15721572            goto out_of_memory_handler;
     
    15801580out_of_memory_handler:
    15811581    CRITICAL("Could not allocate memory.");
    1582     void *data;
     1582    void* data;
    15831583    EINA_LIST_FREE(listOfImagesLocation, data)
    15841584        free(data);
     
    15921592 * Emits signal: "uri,changed" with new uri as parameter.
    15931593 */
    1594 Eina_Bool ewk_frame_uri_changed(Evas_Object *o)
     1594Eina_Bool ewk_frame_uri_changed(Evas_Object* o)
    15951595{
    15961596    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    16141614 * Forces layout for frame.
    16151615 */
    1616 void ewk_frame_force_layout(Evas_Object *o)
     1616void ewk_frame_force_layout(Evas_Object* o)
    16171617{
    16181618    DBG("o=%p", o);
     
    16291629 * Creates plugin.
    16301630 */
    1631 WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object *o, const WebCore::IntSize &pluginSize, WebCore::HTMLPlugInElement *element, const WebCore::KURL &url, const WTF::Vector<WTF::String> &paramNames, const WTF::Vector<WTF::String> &paramValues, const WTF::String &mimeType, bool loadManually)
     1631WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually)
    16321632{
    16331633    return 0;
     
    16421642 * Emits signal: "editorclientselection,changed" with no parameters.
    16431643 */
    1644 void ewk_frame_editor_client_selection_changed(Evas_Object *o)
     1644void ewk_frame_editor_client_selection_changed(Evas_Object* o)
    16451645{
    16461646    evas_object_smart_callback_call(o, "editorclient,selection,changed", 0);
     
    16571657 * Emits signal: "editorclient,contents,changed" with no parameters.
    16581658 */
    1659 void ewk_frame_editor_client_contents_changed(Evas_Object *o)
     1659void ewk_frame_editor_client_contents_changed(Evas_Object* o)
    16601660{
    16611661    evas_object_smart_callback_call(o, "editorclient,contents,changed", 0);
  • trunk/Source/WebKit/efl/ewk/ewk_history.cpp

    r93606 r95659  
    3535
    3636struct _Ewk_History {
    37     WebCore::BackForwardListImpl *core;
     37    WebCore::BackForwardListImpl* core;
    3838};
    3939
     
    5151        return __VA_ARGS__;                                      \
    5252    }                                                            \
    53     WebCore::BackForwardListImpl *core_ = (history)->core
     53    WebCore::BackForwardListImpl* core_ = (history)->core
    5454
    5555
    5656struct _Ewk_History_Item {
    57     WebCore::HistoryItem *core;
    58 
    59     const char *title;
    60     const char *alternate_title;
    61     const char *uri;
    62     const char *original_uri;
     57    WebCore::HistoryItem* core;
     58
     59    const char* title;
     60    const char* alternate_title;
     61    const char* uri;
     62    const char* original_uri;
    6363};
    6464
     
    7272        return __VA_ARGS__;                                   \
    7373    }                                                         \
    74     WebCore::HistoryItem *core_ = (item)->core
    75 
    76 
    77 static inline Ewk_History_Item *_ewk_history_item_new(WebCore::HistoryItem *core)
     74    WebCore::HistoryItem* core_ = (item)->core
     75
     76
     77static inline Ewk_History_Item* _ewk_history_item_new(WebCore::HistoryItem* core)
    7878{
    7979    Ewk_History_Item* item;
     
    8484    }
    8585
    86     item = (Ewk_History_Item *)calloc(1, sizeof(Ewk_History_Item));
     86    item = (Ewk_History_Item*)calloc(1, sizeof(Ewk_History_Item));
    8787    if (!item) {
    8888        CRITICAL("Could not allocate item memory.");
     
    9696}
    9797
    98 static inline Eina_List *_ewk_history_item_list_get(const WebCore::HistoryItemVector &core_items)
     98static inline Eina_List* _ewk_history_item_list_get(const WebCore::HistoryItemVector& core_items)
    9999{
    100100    Eina_List* ret = 0;
     
    154154{
    155155    EWK_HISTORY_CORE_GET_OR_RETURN(history, core, 0);
    156     WebCore::HistoryItem *currentItem = core->currentItem();
     156    WebCore::HistoryItem* currentItem = core->currentItem();
    157157    if (currentItem)
    158158        return _ewk_history_item_new(currentItem);
     
    323323{
    324324    EWK_HISTORY_ITEM_CORE_GET_OR_RETURN(item, core, 0);
    325    
     325
    326326    WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(core->url(), WebCore::IntSize(16, 16));
    327327    if (!icon) {
  • trunk/Source/WebKit/efl/ewk/ewk_js.cpp

    r93637 r95659  
    3131#define EINA_MAGIC_CHECK_OR_RETURN(o, ...) \
    3232    if (!EINA_MAGIC_CHECK(obj, EWK_JS_OBJECT_MAGIC)) { \
    33        EINA_MAGIC_FAIL(obj, EWK_JS_OBJECT_MAGIC); \
    34        return __VA_ARGS__; \
     33        EINA_MAGIC_FAIL(obj, EWK_JS_OBJECT_MAGIC); \
     34        return __VA_ARGS__; \
    3535    }
    3636
  • trunk/Source/WebKit/efl/ewk/ewk_main.cpp

    r94380 r95659  
    192192#if USE(SOUP)
    193193    if (1) {
    194         SoupSession *session = WebCore::ResourceHandle::defaultSession();
     194        SoupSession* session = WebCore::ResourceHandle::defaultSession();
    195195        soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_SNIFFER);
    196196        soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
  • trunk/Source/WebKit/efl/ewk/ewk_network.cpp

    r92473 r95659  
    3131#endif
    3232
    33 void ewk_network_proxy_uri_set(const char *proxy)
     33void ewk_network_proxy_uri_set(const char* proxy)
    3434{
    3535#if USE(SOUP)
    36     SoupSession *session = WebCore::ResourceHandle::defaultSession();
     36    SoupSession* session = WebCore::ResourceHandle::defaultSession();
    3737
    3838    if (!proxy) {
     
    4242    }
    4343
    44     SoupURI *uri = soup_uri_new(proxy);
     44    SoupURI* uri = soup_uri_new(proxy);
    4545    EINA_SAFETY_ON_NULL_RETURN(uri);
    4646
     
    5252}
    5353
    54 const char *ewk_network_proxy_uri_get(void)
     54const char* ewk_network_proxy_uri_get(void)
    5555{
    5656#if USE(SOUP)
    57     SoupURI *uri;
    58     SoupSession *session = WebCore::ResourceHandle::defaultSession();
     57    SoupURI* uri;
     58    SoupSession* session = WebCore::ResourceHandle::defaultSession();
    5959    g_object_get(session, SOUP_SESSION_PROXY_URI, &uri, NULL);
    6060
  • trunk/Source/WebKit/efl/ewk/ewk_private.h

    r94965 r95659  
    5656struct _Ewk_JS_Object {
    5757    JavaScriptObject base;
    58     const char *name;
    59     const Ewk_JS_Class *cls;
    60     Eina_Hash *properties;
    61     Evas_Object *view; // ewk_view: check if this object has already been added to another ewk_view
     58    const char* name;
     59    const Ewk_JS_Class* cls;
     60    Eina_Hash* properties;
     61    Evas_Object* view; // ewk_view: check if this object has already been added to another ewk_view
    6262    Ewk_JS_Object_Type type;
    6363    EINA_MAGIC;
     
    7878};
    7979
    80 void ewk_view_ready(Evas_Object *o);
    81 void ewk_view_input_method_state_set(Evas_Object *o, Eina_Bool active);
    82 void ewk_view_title_set(Evas_Object *o, const char *title);
    83 void ewk_view_uri_changed(Evas_Object *o);
    84 void ewk_view_load_started(Evas_Object *o);
    85 void ewk_view_load_provisional(Evas_Object *o);
    86 void ewk_view_frame_main_load_started(Evas_Object *o);
    87 void ewk_view_frame_main_cleared(Evas_Object *o);
    88 void ewk_view_frame_main_icon_received(Evas_Object *o);
    89 void ewk_view_load_finished(Evas_Object *o, const Ewk_Frame_Load_Error *error);
    90 void ewk_view_load_error(Evas_Object *o, const Ewk_Frame_Load_Error *error);
    91 void ewk_view_load_progress_changed(Evas_Object *o);
    92 void ewk_view_load_show(Evas_Object *o);
    93 void ewk_view_restore_state(Evas_Object *o, Evas_Object *frame);
    94 Evas_Object *ewk_view_window_create(Evas_Object *o, Eina_Bool javascript, const WebCore::WindowFeatures *coreFeatures);
    95 void ewk_view_window_close(Evas_Object *o);
    96 
    97 void ewk_view_mouse_link_hover_in(Evas_Object *o, void *data);
    98 void ewk_view_mouse_link_hover_out(Evas_Object *o);
    99 
    100 void ewk_view_toolbars_visible_set(Evas_Object *o, Eina_Bool visible);
    101 void ewk_view_toolbars_visible_get(Evas_Object *o, Eina_Bool *visible);
    102 
    103 void ewk_view_statusbar_visible_set(Evas_Object *o, Eina_Bool visible);
    104 void ewk_view_statusbar_visible_get(Evas_Object *o, Eina_Bool *visible);
    105 void ewk_view_statusbar_text_set(Evas_Object *o, const char *text);
    106 
    107 void ewk_view_scrollbars_visible_set(Evas_Object *o, Eina_Bool visible);
    108 void ewk_view_scrollbars_visible_get(Evas_Object *o, Eina_Bool *visible);
    109 
    110 void ewk_view_menubar_visible_set(Evas_Object *o, Eina_Bool visible);
    111 void ewk_view_menubar_visible_get(Evas_Object *o, Eina_Bool *visible);
    112 
    113 void ewk_view_tooltip_text_set(Evas_Object *o, const char *text);
    114 
    115 void ewk_view_add_console_message(Evas_Object *o, const char *message, unsigned int lineNumber, const char *sourceID);
    116 
    117 void ewk_view_run_javascript_alert(Evas_Object *o, Evas_Object *frame, const char *message);
    118 Eina_Bool ewk_view_run_javascript_confirm(Evas_Object *o, Evas_Object *frame, const char *message);
    119 Eina_Bool ewk_view_run_javascript_prompt(Evas_Object *o, Evas_Object *frame, const char *message, const char *defaultValue, char **value);
    120 Eina_Bool ewk_view_should_interrupt_javascript(Evas_Object *o);
    121 uint64_t ewk_view_exceeded_database_quota(Evas_Object *o, Evas_Object *frame, const char *databaseName, uint64_t current_size, uint64_t expected_size);
    122 
    123 Eina_Bool ewk_view_run_open_panel(Evas_Object *o, Evas_Object *frame, Eina_Bool allows_multiple_files, const char *accept_types, Eina_List **selected_filenames);
    124 
    125 void ewk_view_repaint(Evas_Object *o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
    126 void ewk_view_scroll(Evas_Object *o, Evas_Coord dx, Evas_Coord dy, Evas_Coord sx, Evas_Coord sy, Evas_Coord sw, Evas_Coord sh, Evas_Coord cx, Evas_Coord cy, Evas_Coord cw, Evas_Coord ch, Eina_Bool main_frame);
    127 WebCore::Page *ewk_view_core_page_get(const Evas_Object *o);
    128 
    129 WTF::PassRefPtr<WebCore::Frame> ewk_view_frame_create(Evas_Object *o, Evas_Object *frame, const WTF::String& name, WebCore::HTMLFrameOwnerElement *ownerElement, const WebCore::KURL &url, const WTF::String &referrer);
    130 
    131 WTF::PassRefPtr<WebCore::Widget> ewk_view_plugin_create(Evas_Object *o, Evas_Object *frame, const WebCore::IntSize &pluginSize, WebCore::HTMLPlugInElement *element, const WebCore::KURL &url, const WTF::Vector<WTF::String> &paramNames, const WTF::Vector<WTF::String> &paramValues, const WTF::String &mimeType, bool loadManually);
    132 
    133 void ewk_view_popup_new(Evas_Object *o, WebCore::PopupMenuClient *client, int selected, const WebCore::IntRect &rect);
    134 void ewk_view_viewport_attributes_set(Evas_Object *o, const WebCore::ViewportArguments &arguments);
    135 
    136 void ewk_view_download_request(Evas_Object *o, Ewk_Download *download);
    137 void *ewk_view_protocol_handler_resource_get(Evas_Object *o, size_t *bytesRead, char **mime, const char *file);
    138 
    139 void ewk_view_editor_client_contents_changed(Evas_Object *o);
    140 void ewk_view_editor_client_selection_changed(Evas_Object *o);
     80void ewk_view_ready(Evas_Object* o);
     81void ewk_view_input_method_state_set(Evas_Object* o, Eina_Bool active);
     82void ewk_view_title_set(Evas_Object* o, const char* title);
     83void ewk_view_uri_changed(Evas_Object* o);
     84void ewk_view_load_started(Evas_Object* o);
     85void ewk_view_load_provisional(Evas_Object* o);
     86void ewk_view_frame_main_load_started(Evas_Object* o);
     87void ewk_view_frame_main_cleared(Evas_Object* o);
     88void ewk_view_frame_main_icon_received(Evas_Object* o);
     89void ewk_view_load_finished(Evas_Object* o, const Ewk_Frame_Load_Error* error);
     90void ewk_view_load_error(Evas_Object* o, const Ewk_Frame_Load_Error* error);
     91void ewk_view_load_progress_changed(Evas_Object* o);
     92void ewk_view_load_show(Evas_Object* o);
     93void ewk_view_restore_state(Evas_Object* o, Evas_Object* frame);
     94Evas_Object* ewk_view_window_create(Evas_Object* o, Eina_Bool javascript, const WebCore::WindowFeatures* coreFeatures);
     95void ewk_view_window_close(Evas_Object* o);
     96
     97void ewk_view_mouse_link_hover_in(Evas_Object* o, void* data);
     98void ewk_view_mouse_link_hover_out(Evas_Object* o);
     99
     100void ewk_view_toolbars_visible_set(Evas_Object* o, Eina_Bool visible);
     101void ewk_view_toolbars_visible_get(Evas_Object* o, Eina_Bool* visible);
     102
     103void ewk_view_statusbar_visible_set(Evas_Object* o, Eina_Bool visible);
     104void ewk_view_statusbar_visible_get(Evas_Object* o, Eina_Bool* visible);
     105void ewk_view_statusbar_text_set(Evas_Object* o, const char* text);
     106
     107void ewk_view_scrollbars_visible_set(Evas_Object* o, Eina_Bool visible);
     108void ewk_view_scrollbars_visible_get(Evas_Object* o, Eina_Bool* visible);
     109
     110void ewk_view_menubar_visible_set(Evas_Object* o, Eina_Bool visible);
     111void ewk_view_menubar_visible_get(Evas_Object* o, Eina_Bool* visible);
     112
     113void ewk_view_tooltip_text_set(Evas_Object* o, const char* text);
     114
     115void ewk_view_add_console_message(Evas_Object* o, const char* message, unsigned int lineNumber, const char* sourceID);
     116
     117void ewk_view_run_javascript_alert(Evas_Object* o, Evas_Object* frame, const char* message);
     118Eina_Bool ewk_view_run_javascript_confirm(Evas_Object* o, Evas_Object* frame, const char* message);
     119Eina_Bool ewk_view_run_javascript_prompt(Evas_Object* o, Evas_Object* frame, const char* message, const char* defaultValue, char** value);
     120Eina_Bool ewk_view_should_interrupt_javascript(Evas_Object* o);
     121uint64_t ewk_view_exceeded_database_quota(Evas_Object* o, Evas_Object* frame, const char* databaseName, uint64_t current_size, uint64_t expected_size);
     122
     123Eina_Bool ewk_view_run_open_panel(Evas_Object* o, Evas_Object* frame, Eina_Bool allows_multiple_files, const char* accept_types, Eina_List** selected_filenames);
     124
     125void ewk_view_repaint(Evas_Object* o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
     126void ewk_view_scroll(Evas_Object* o, Evas_Coord dx, Evas_Coord dy, Evas_Coord sx, Evas_Coord sy, Evas_Coord sw, Evas_Coord sh, Evas_Coord cx, Evas_Coord cy, Evas_Coord cw, Evas_Coord ch, Eina_Bool main_frame);
     127WebCore::Page* ewk_view_core_page_get(const Evas_Object* o);
     128
     129WTF::PassRefPtr<WebCore::Frame> ewk_view_frame_create(Evas_Object* o, Evas_Object* frame, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, const WebCore::KURL& url, const WTF::String& referrer);
     130
     131WTF::PassRefPtr<WebCore::Widget> ewk_view_plugin_create(Evas_Object* o, Evas_Object* frame, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually);
     132
     133void ewk_view_popup_new(Evas_Object* o, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect);
     134void ewk_view_viewport_attributes_set(Evas_Object* o, const WebCore::ViewportArguments& arguments);
     135
     136void ewk_view_download_request(Evas_Object* o, Ewk_Download* download);
     137void* ewk_view_protocol_handler_resource_get(Evas_Object* o, size_t* bytesRead, char** mime, const char* file);
     138
     139void ewk_view_editor_client_contents_changed(Evas_Object* o);
     140void ewk_view_editor_client_selection_changed(Evas_Object* o);
    141141
    142142#if ENABLE(NETSCAPE_PLUGIN_API)
    143 void ewk_view_js_window_object_clear(Evas_Object *o, Evas_Object *frame);
     143void ewk_view_js_window_object_clear(Evas_Object* o, Evas_Object* frame);
    144144#endif
    145145
     
    155155#endif
    156156
    157 Ewk_History *ewk_history_new(WebCore::BackForwardListImpl *history);
    158 void ewk_history_free(Ewk_History *history);
    159 char *ewk_history_item_target_get(const Ewk_History_Item *item);
    160 Eina_Bool ewk_history_item_target_is(const Ewk_History_Item *item);
    161 Eina_List *ewk_history_item_children_get(const Ewk_History_Item *item);
     157Ewk_History* ewk_history_new(WebCore::BackForwardListImpl* history);
     158void ewk_history_free(Ewk_History* history);
     159char* ewk_history_item_target_get(const Ewk_History_Item* item);
     160Eina_Bool ewk_history_item_target_is(const Ewk_History_Item* item);
     161Eina_List* ewk_history_item_children_get(const Ewk_History_Item* item);
    162162
    163163#if ENABLE(CONTEXT_MENUS)
    164 Ewk_Context_Menu *ewk_context_menu_new(Evas_Object *view, WebCore::ContextMenuController *controller);
    165 Eina_Bool ewk_context_menu_free(Ewk_Context_Menu *o);
    166 void ewk_context_menu_item_append(Ewk_Context_Menu *o, WebCore::ContextMenuItem &core);
    167 Ewk_Context_Menu *ewk_context_menu_custom_get(const Ewk_Context_Menu *o);
    168 void ewk_context_menu_show(const Ewk_Context_Menu *o);
    169 #endif
    170 
    171 const Eina_Rectangle *ewk_view_repaints_get(const Ewk_View_Private_Data *priv, size_t *count);
    172 const Ewk_Scroll_Request *ewk_view_scroll_requests_get(const Ewk_View_Private_Data *priv, size_t *count);
    173 
    174 void ewk_view_repaint_add(Ewk_View_Private_Data *priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
    175 
    176 void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data *priv);
    177 
    178 Ewk_Window_Features *ewk_window_features_new_from_core(const WebCore::WindowFeatures *core);
    179 
    180 Evas_Object *ewk_frame_add(Evas *e);
    181 Eina_Bool ewk_frame_init(Evas_Object *o, Evas_Object *view, WebCore::Frame *frame);
    182 Eina_Bool ewk_frame_child_add(Evas_Object *o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String &name, const WebCore::KURL &url, const WTF::String &referrer);
    183 void ewk_frame_view_set(Evas_Object *o, Evas_Object *newParent);
    184 
    185 WebCore::Frame *ewk_frame_core_get(const Evas_Object *o);
    186 void ewk_frame_core_gone(Evas_Object *o);
    187 
    188 void ewk_frame_load_started(Evas_Object *o);
    189 void ewk_frame_load_provisional(Evas_Object *o);
    190 void ewk_frame_load_firstlayout_finished(Evas_Object *o);
    191 void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object *o);
    192 void ewk_frame_load_document_finished(Evas_Object *o);
    193 void ewk_frame_load_finished(Evas_Object *o, const char *error_domain, int error_code, Eina_Bool is_cancellation, const char *error_description, const char *failing_url);
    194 void ewk_frame_load_error(Evas_Object *o, const char *error_domain, int error_code, Eina_Bool is_cancellation, const char *error_description, const char *failing_url);
    195 void ewk_frame_load_progress_changed(Evas_Object *o);
    196 
    197 void ewk_frame_request_will_send(Evas_Object *o, Ewk_Frame_Resource_Request *request);
    198 void ewk_frame_request_assign_identifier(Evas_Object *o, const Ewk_Frame_Resource_Request *request);
    199 void ewk_frame_view_state_save(Evas_Object *o, WebCore::HistoryItem* item);
    200 
    201 void ewk_frame_did_perform_first_navigation(Evas_Object *o);
    202 
    203 void ewk_frame_contents_size_changed(Evas_Object *o, Evas_Coord w, Evas_Coord h);
    204 void ewk_frame_title_set(Evas_Object *o, const char *title);
    205 
    206 void ewk_frame_view_create_for_view(Evas_Object *o, Evas_Object *view);
    207 Eina_Bool ewk_frame_uri_changed(Evas_Object *o);
    208 void ewk_frame_force_layout(Evas_Object *o);
    209 
    210 WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object *o, const WebCore::IntSize &pluginSize, WebCore::HTMLPlugInElement *element, const WebCore::KURL &url, const WTF::Vector<WTF::String> &paramNames, const WTF::Vector<WTF::String> &paramValues, const WTF::String &mimeType, bool loadManually);
    211 
    212 Eina_Bool ewk_view_navigation_policy_decision(Evas_Object *o, Ewk_Frame_Resource_Request *request);
    213 
    214 void ewk_view_contents_size_changed(Evas_Object *o, Evas_Coord w, Evas_Coord h);
    215 
    216 WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object *o);
     164Ewk_Context_Menu* ewk_context_menu_new(Evas_Object* view, WebCore::ContextMenuController* controller);
     165Eina_Bool ewk_context_menu_free(Ewk_Context_Menu* o);
     166void ewk_context_menu_item_append(Ewk_Context_Menu* o, WebCore::ContextMenuItem& core);
     167Ewk_Context_Menu* ewk_context_menu_custom_get(const Ewk_Context_Menu* o);
     168void ewk_context_menu_show(const Ewk_Context_Menu* o);
     169#endif
     170
     171const Eina_Rectangle* ewk_view_repaints_get(const Ewk_View_Private_Data* priv, size_t* count);
     172const Ewk_Scroll_Request* ewk_view_scroll_requests_get(const Ewk_View_Private_Data* priv, size_t* count);
     173
     174void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
     175
     176void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data* priv);
     177
     178Ewk_Window_Features* ewk_window_features_new_from_core(const WebCore::WindowFeatures* core);
     179
     180Evas_Object* ewk_frame_add(Evas* e);
     181Eina_Bool ewk_frame_init(Evas_Object* o, Evas_Object* view, WebCore::Frame* frame);
     182Eina_Bool ewk_frame_child_add(Evas_Object* o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String& name, const WebCore::KURL& url, const WTF::String& referrer);
     183void ewk_frame_view_set(Evas_Object* o, Evas_Object* newParent);
     184
     185WebCore::Frame* ewk_frame_core_get(const Evas_Object* o);
     186void ewk_frame_core_gone(Evas_Object* o);
     187
     188void ewk_frame_load_started(Evas_Object* o);
     189void ewk_frame_load_provisional(Evas_Object* o);
     190void ewk_frame_load_firstlayout_finished(Evas_Object* o);
     191void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* o);
     192void ewk_frame_load_document_finished(Evas_Object* o);
     193void ewk_frame_load_finished(Evas_Object* o, const char* error_domain, int error_code, Eina_Bool is_cancellation, const char* error_description, const char* failing_url);
     194void ewk_frame_load_error(Evas_Object* o, const char* error_domain, int error_code, Eina_Bool is_cancellation, const char* error_description, const char* failing_url);
     195void ewk_frame_load_progress_changed(Evas_Object* o);
     196
     197void ewk_frame_request_will_send(Evas_Object* o, Ewk_Frame_Resource_Request* request);
     198void ewk_frame_request_assign_identifier(Evas_Object* o, const Ewk_Frame_Resource_Request* request);
     199void ewk_frame_view_state_save(Evas_Object* o, WebCore::HistoryItem* item);
     200
     201void ewk_frame_did_perform_first_navigation(Evas_Object* o);
     202
     203void ewk_frame_contents_size_changed(Evas_Object* o, Evas_Coord w, Evas_Coord h);
     204void ewk_frame_title_set(Evas_Object* o, const char* title);
     205
     206void ewk_frame_view_create_for_view(Evas_Object* o, Evas_Object* view);
     207Eina_Bool ewk_frame_uri_changed(Evas_Object* o);
     208void ewk_frame_force_layout(Evas_Object* o);
     209
     210WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually);
     211
     212Eina_Bool ewk_view_navigation_policy_decision(Evas_Object* o, Ewk_Frame_Resource_Request* request);
     213
     214void ewk_view_contents_size_changed(Evas_Object* o, Evas_Coord w, Evas_Coord h);
     215
     216WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* o);
    217217
    218218const char* ewk_settings_default_user_agent_get(void);
    219219
    220 void ewk_frame_editor_client_contents_changed(Evas_Object *o);
    221 void ewk_frame_editor_client_selection_changed(Evas_Object *o);
     220void ewk_frame_editor_client_contents_changed(Evas_Object* o);
     221void ewk_frame_editor_client_selection_changed(Evas_Object* o);
    222222
    223223#ifdef __cplusplus
  • trunk/Source/WebKit/efl/ewk/ewk_protocol_handler_soup.h

    r94965 r95659  
    4343typedef struct {
    4444    SoupRequest parent;
    45     EwkProtocolHandlerPrivate *priv;
     45    EwkProtocolHandlerPrivate* priv;
    4646} EwkCustomProtocolHandler;
    4747
  • trunk/Source/WebKit/efl/ewk/ewk_settings.cpp

    r95271 r95659  
    9090}
    9191
    92 void ewk_settings_web_database_path_set(const char *path)
     92void ewk_settings_web_database_path_set(const char* path)
    9393{
    9494#if ENABLE(SQL_DATABASE)
     
    103103}
    104104
    105 const char *ewk_settings_web_database_path_get(void)
     105const char* ewk_settings_web_database_path_get(void)
    106106{
    107107#if ENABLE(SQL_DATABASE)
     
    112112}
    113113
    114 Eina_Bool ewk_settings_icon_database_path_set(const char *directory)
     114Eina_Bool ewk_settings_icon_database_path_set(const char* directory)
    115115{
    116116    WebCore::IconDatabase::delayDatabaseCleanup();
     
    157157}
    158158
    159 const char *ewk_settings_icon_database_path_get(void)
     159const char* ewk_settings_icon_database_path_get(void)
    160160{
    161161    if (!WebCore::iconDatabase().isEnabled())
     
    178178}
    179179
    180 cairo_surface_t *ewk_settings_icon_database_icon_surface_get(const char *url)
     180cairo_surface_t* ewk_settings_icon_database_icon_surface_get(const char* url)
    181181{
    182182    EINA_SAFETY_ON_NULL_RETURN_VAL(url, 0);
    183183
    184184    WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(url));
    185     WebCore::Image *icon = WebCore::iconDatabase().synchronousIconForPageURL(kurl.string(), WebCore::IntSize(16, 16));
     185    WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(kurl.string(), WebCore::IntSize(16, 16));
    186186
    187187    if (!icon) {
     
    193193}
    194194
    195 Evas_Object *ewk_settings_icon_database_icon_object_add(const char *url, Evas *canvas)
     195Evas_Object* ewk_settings_icon_database_icon_object_add(const char* url, Evas* canvas)
    196196{
    197197    EINA_SAFETY_ON_NULL_RETURN_VAL(url, 0);
     
    199199
    200200    WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(url));
    201     WebCore::Image *icon = WebCore::iconDatabase().synchronousIconForPageURL(kurl.string(), WebCore::IntSize(16, 16));
    202     cairo_surface_t *surface;
     201    WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(kurl.string(), WebCore::IntSize(16, 16));
     202    cairo_surface_t* surface;
    203203
    204204    if (!icon) {
     
    246246 * @return a pointer to an eina_stringshare containing the user agent string
    247247 */
    248 const char *ewk_settings_default_user_agent_get(void)
     248const char* ewk_settings_default_user_agent_get(void)
    249249{
    250250    WTF::String ua_version = makeString(String::number(WEBKIT_USER_AGENT_MAJOR_VERSION), '.', String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+');
     
    254254}
    255255
    256 Eina_Bool ewk_settings_cache_directory_path_set(const char *path)
     256Eina_Bool ewk_settings_cache_directory_path_set(const char* path)
    257257{
    258258#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     
    271271}
    272272
    273 const char *ewk_settings_cache_directory_path_get()
     273const char* ewk_settings_cache_directory_path_get()
    274274{
    275275#if ENABLE(OFFLINE_WEB_APPLICATIONS)
  • trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.h

    r94378 r95659  
    6363                              * repainted at all since it was not visible.
    6464                              */
    65     Eina_Bool full_update:1; /**< tile requires full size update */
     65    Eina_Bool full_update : 1; /**< tile requires full size update */
    6666};
    6767
    6868struct _Ewk_Tile {
    69     Eina_Tiler *updates;    /**< updated/dirty areas */
     69    Eina_Tiler* updates;    /**< updated/dirty areas */
    7070    Ewk_Tile_Stats stats;       /**< tile usage statistics */
    7171    unsigned long col, row; /**< tile tile position */
     
    7373
    7474    /* TODO: does it worth to keep those or create on demand? */
    75     cairo_surface_t *surface;
    76     cairo_t *cairo;
     75    cairo_surface_t* surface;
     76    cairo_t* cairo;
    7777
    7878    /** Never ever change those after tile is created (respect const!) */
     
    8585                                   */
    8686    int visible;                  /**< visibility counter of this tile */
    87     Evas_Object *image;           /**< Evas Image, the tile to be rendered */
    88     uint8_t *pixels;
     87    Evas_Object* image;           /**< Evas Image, the tile to be rendered */
     88    uint8_t* pixels;
    8989};
    9090
     
    9393
    9494/* view */
    95 Evas_Object *ewk_tiled_backing_store_add(Evas *e);
     95Evas_Object* ewk_tiled_backing_store_add(Evas* e);
    9696
    97 void ewk_tiled_backing_store_render_cb_set(Evas_Object *o, Eina_Bool (*cb)(void *data, Ewk_Tile *t, const Eina_Rectangle *area), const void *data);
     97void ewk_tiled_backing_store_render_cb_set(Evas_Object *o, Eina_Bool (* cb)(void* data, Ewk_Tile* t, const Eina_Rectangle* area), const void* data);
    9898
    99 Eina_Bool ewk_tiled_backing_store_scroll_full_offset_set(Evas_Object *o, Evas_Coord x, Evas_Coord y);
    100 Eina_Bool ewk_tiled_backing_store_scroll_full_offset_add(Evas_Object *o, Evas_Coord dx, Evas_Coord dy);
    101 Eina_Bool ewk_tiled_backing_store_scroll_inner_offset_add(Evas_Object *o, Evas_Coord dx, Evas_Coord dy, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
     99Eina_Bool ewk_tiled_backing_store_scroll_full_offset_set(Evas_Object* o, Evas_Coord x, Evas_Coord y);
     100Eina_Bool ewk_tiled_backing_store_scroll_full_offset_add(Evas_Object* o, Evas_Coord dx, Evas_Coord dy);
     101Eina_Bool ewk_tiled_backing_store_scroll_inner_offset_add(Evas_Object* o, Evas_Coord dx, Evas_Coord dy, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
    102102
    103 Eina_Bool ewk_tiled_backing_store_zoom_set(Evas_Object *o, float *zoom, Evas_Coord cx, Evas_Coord cy, Evas_Coord *offx, Evas_Coord *offy);
    104 Eina_Bool ewk_tiled_backing_store_zoom_weak_set(Evas_Object *o, float zoom, Evas_Coord cx, Evas_Coord cy);
    105 void ewk_tiled_backing_store_fix_offsets(Evas_Object *o, Evas_Coord w, Evas_Coord h);
    106 void ewk_tiled_backing_store_zoom_weak_smooth_scale_set(Evas_Object *o, Eina_Bool smooth_scale);
    107 Eina_Bool ewk_tiled_backing_store_update(Evas_Object *o, const Eina_Rectangle *update);
    108 void ewk_tiled_backing_store_updates_process_pre_set(Evas_Object *o, void *(*cb)(void *data, Evas_Object *o), const void *data);
    109 void ewk_tiled_backing_store_updates_process_post_set(Evas_Object *o, void *(*cb)(void *data, void *pre_data, Evas_Object *o), const void *data);
    110 void ewk_tiled_backing_store_updates_process(Evas_Object *o);
    111 void ewk_tiled_backing_store_updates_clear(Evas_Object *o);
    112 void ewk_tiled_backing_store_contents_resize(Evas_Object *o, Evas_Coord width, Evas_Coord height);
    113 void ewk_tiled_backing_store_disabled_update_set(Evas_Object *o, Eina_Bool value);
    114 void ewk_tiled_backing_store_flush(Evas_Object *o);
    115 void ewk_tiled_backing_store_enable_scale_set(Evas_Object *o, Eina_Bool value);
     103Eina_Bool ewk_tiled_backing_store_zoom_set(Evas_Object* o, float* zoom, Evas_Coord cx, Evas_Coord cy, Evas_Coord* offx, Evas_Coord* offy);
     104Eina_Bool ewk_tiled_backing_store_zoom_weak_set(Evas_Object* o, float zoom, Evas_Coord cx, Evas_Coord cy);
     105void ewk_tiled_backing_store_fix_offsets(Evas_Object* o, Evas_Coord w, Evas_Coord h);
     106void ewk_tiled_backing_store_zoom_weak_smooth_scale_set(Evas_Object* o, Eina_Bool smooth_scale);
     107Eina_Bool ewk_tiled_backing_store_update(Evas_Object* o, const Eina_Rectangle* update);
     108void ewk_tiled_backing_store_updates_process_pre_set(Evas_Object* o, void*(*cb)(void* data, Evas_Object *o), const void* data);
     109void ewk_tiled_backing_store_updates_process_post_set(Evas_Object* o, void*(*cb)(void* data, void* pre_data, Evas_Object *o), const void* data);
     110void ewk_tiled_backing_store_updates_process(Evas_Object* o);
     111void ewk_tiled_backing_store_updates_clear(Evas_Object* o);
     112void ewk_tiled_backing_store_contents_resize(Evas_Object* o, Evas_Coord width, Evas_Coord height);
     113void ewk_tiled_backing_store_disabled_update_set(Evas_Object* o, Eina_Bool value);
     114void ewk_tiled_backing_store_flush(Evas_Object* o);
     115void ewk_tiled_backing_store_enable_scale_set(Evas_Object* o, Eina_Bool value);
    116116
    117 Ewk_Tile_Unused_Cache *ewk_tiled_backing_store_tile_unused_cache_get(const Evas_Object *o);
    118 void ewk_tiled_backing_store_tile_unused_cache_set(Evas_Object *o, Ewk_Tile_Unused_Cache *tuc);
     117Ewk_Tile_Unused_Cache* ewk_tiled_backing_store_tile_unused_cache_get(const Evas_Object* o);
     118void ewk_tiled_backing_store_tile_unused_cache_set(Evas_Object* o, Ewk_Tile_Unused_Cache* tuc);
    119119
    120 Eina_Bool ewk_tiled_backing_store_pre_render_region(Evas_Object *o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom);
    121 Eina_Bool ewk_tiled_backing_store_pre_render_relative_radius(Evas_Object *o, unsigned int n, float zoom);
    122 void ewk_tiled_backing_store_pre_render_cancel(Evas_Object *o);
     120Eina_Bool ewk_tiled_backing_store_pre_render_region(Evas_Object* o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom);
     121Eina_Bool ewk_tiled_backing_store_pre_render_relative_radius(Evas_Object* o, unsigned int n, float zoom);
     122void ewk_tiled_backing_store_pre_render_cancel(Evas_Object* o);
    123123
    124 Eina_Bool ewk_tiled_backing_store_disable_render(Evas_Object *o);
    125 Eina_Bool ewk_tiled_backing_store_enable_render(Evas_Object *o);
     124Eina_Bool ewk_tiled_backing_store_disable_render(Evas_Object* o);
     125Eina_Bool ewk_tiled_backing_store_enable_render(Evas_Object* o);
    126126#ifdef __cplusplus
    127127}
  • trunk/Source/WebKit/efl/ewk/ewk_tiled_matrix.h

    r93693 r95659  
    2727
    2828/* matrix of tiles */
    29 Ewk_Tile_Matrix *ewk_tile_matrix_new(Ewk_Tile_Unused_Cache *tuc, unsigned long cols, unsigned long rows, Evas_Colorspace cspace, void (*render_cb)(void *data, Ewk_Tile *t, const Eina_Rectangle *update), const void *render_data);
    30 void ewk_tile_matrix_free(Ewk_Tile_Matrix *tm);
     29Ewk_Tile_Matrix* ewk_tile_matrix_new(Ewk_Tile_Unused_Cache* tuc, unsigned long cols, unsigned long rows, Evas_Colorspace cspace, void (* render_cb)(void* data, Ewk_Tile* t, const Eina_Rectangle* update), const void* render_data);
     30void ewk_tile_matrix_free(Ewk_Tile_Matrix* tm);
    3131
    32 void ewk_tile_matrix_resize(Ewk_Tile_Matrix *tm, unsigned long cols, unsigned long rows);
     32void ewk_tile_matrix_resize(Ewk_Tile_Matrix* tm, unsigned long cols, unsigned long rows);
    3333
    34 Ewk_Tile_Unused_Cache *ewk_tile_matrix_unused_cache_get(const Ewk_Tile_Matrix *tm);
     34Ewk_Tile_Unused_Cache* ewk_tile_matrix_unused_cache_get(const Ewk_Tile_Matrix* tm);
    3535
    36 Ewk_Tile *ewk_tile_matrix_tile_exact_get(Ewk_Tile_Matrix *tm, unsigned long col, unsigned long row, float zoom);
    37 Eina_Bool ewk_tile_matrix_tile_exact_exists(Ewk_Tile_Matrix *tm, unsigned long col, unsigned long row, float zoom);
    38 Ewk_Tile *ewk_tile_matrix_tile_nearest_get(Ewk_Tile_Matrix *tm, unsigned long col, unsigned long row, float zoom);
    39 Ewk_Tile *ewk_tile_matrix_tile_new(Ewk_Tile_Matrix *tm, Evas *evas, unsigned long col, unsigned long row, float zoom);
    40 Eina_Bool ewk_tile_matrix_tile_put(Ewk_Tile_Matrix *tm, Ewk_Tile *t, double last_used);
     36Ewk_Tile* ewk_tile_matrix_tile_exact_get(Ewk_Tile_Matrix* tm, unsigned long col, unsigned long row, float zoom);
     37Eina_Bool ewk_tile_matrix_tile_exact_exists(Ewk_Tile_Matrix* tm, unsigned long col, unsigned long row, float zoom);
     38Ewk_Tile* ewk_tile_matrix_tile_nearest_get(Ewk_Tile_Matrix* tm, unsigned long col, unsigned long row, float zoom);
     39Ewk_Tile* ewk_tile_matrix_tile_new(Ewk_Tile_Matrix* tm, Evas* evas, unsigned long col, unsigned long row, float zoom);
     40Eina_Bool ewk_tile_matrix_tile_put(Ewk_Tile_Matrix* tm, Ewk_Tile* t, double last_used);
    4141
    42 Eina_Bool ewk_tile_matrix_tile_update(Ewk_Tile_Matrix *tm, unsigned long col, unsigned long row, const Eina_Rectangle *update);
    43 Eina_Bool ewk_tile_matrix_tile_update_full(Ewk_Tile_Matrix *tm, unsigned long col, unsigned long row);
    44 void ewk_tile_matrix_tile_updates_clear(Ewk_Tile_Matrix *tm, Ewk_Tile *t);
     42Eina_Bool ewk_tile_matrix_tile_update(Ewk_Tile_Matrix* tm, unsigned long col, unsigned long row, const Eina_Rectangle* update);
     43Eina_Bool ewk_tile_matrix_tile_update_full(Ewk_Tile_Matrix* tm, unsigned long col, unsigned long row);
     44void ewk_tile_matrix_tile_updates_clear(Ewk_Tile_Matrix* tm, Ewk_Tile* t);
    4545
    46 Eina_Bool ewk_tile_matrix_update(Ewk_Tile_Matrix *tm, const Eina_Rectangle *update, float zoom);
    47 void ewk_tile_matrix_updates_process(Ewk_Tile_Matrix *tm);
    48 void ewk_tile_matrix_updates_clear(Ewk_Tile_Matrix *tm);
    49 void ewk_tile_matrix_freeze(Ewk_Tile_Matrix *tm);
    50 void ewk_tile_matrix_thaw(Ewk_Tile_Matrix *tm);
     46Eina_Bool ewk_tile_matrix_update(Ewk_Tile_Matrix* tm, const Eina_Rectangle* update, float zoom);
     47void ewk_tile_matrix_updates_process(Ewk_Tile_Matrix* tm);
     48void ewk_tile_matrix_updates_clear(Ewk_Tile_Matrix* tm);
     49void ewk_tile_matrix_freeze(Ewk_Tile_Matrix* tm);
     50void ewk_tile_matrix_thaw(Ewk_Tile_Matrix* tm);
    5151
    5252// remove me!
    53     void ewk_tile_matrix_dbg(const Ewk_Tile_Matrix *tm);
    54     void ewk_tile_unused_cache_dbg(const Ewk_Tile_Unused_Cache *tuc);
    55     void ewk_tile_accounting_dbg(void);
     53void ewk_tile_matrix_dbg(const Ewk_Tile_Matrix* tm);
     54void ewk_tile_unused_cache_dbg(const Ewk_Tile_Unused_Cache* tuc);
     55void ewk_tile_accounting_dbg(void);
    5656
    5757
  • trunk/Source/WebKit/efl/ewk/ewk_tiled_model.h

    r91974 r95659  
    2727
    2828/* model */
    29 Ewk_Tile *ewk_tile_new(Evas *evas, Evas_Coord w, Evas_Coord h, float zoom, Evas_Colorspace cspace);
    30 void ewk_tile_free(Ewk_Tile *t);
    31 void ewk_tile_unused_cache_clear(Ewk_Tile_Unused_Cache *tuc);
    32 void ewk_tile_show(Ewk_Tile *t);
    33 void ewk_tile_hide(Ewk_Tile *t);
    34 Eina_Bool ewk_tile_visible_get(Ewk_Tile *t);
    35 void ewk_tile_update_full(Ewk_Tile *t);
    36 void ewk_tile_update_area(Ewk_Tile *t, const Eina_Rectangle *r);
    37 void ewk_tile_updates_process(Ewk_Tile *t, void (*cb)(void *data, Ewk_Tile *t, const Eina_Rectangle *update), const void *data);
    38 void ewk_tile_updates_clear(Ewk_Tile *t);
     29Ewk_Tile* ewk_tile_new(Evas* evas, Evas_Coord w, Evas_Coord h, float zoom, Evas_Colorspace cspace);
     30void ewk_tile_free(Ewk_Tile* t);
     31void ewk_tile_unused_cache_clear(Ewk_Tile_Unused_Cache* tuc);
     32void ewk_tile_show(Ewk_Tile* t);
     33void ewk_tile_hide(Ewk_Tile* t);
     34Eina_Bool ewk_tile_visible_get(Ewk_Tile* t);
     35void ewk_tile_update_full(Ewk_Tile* t);
     36void ewk_tile_update_area(Ewk_Tile* t, const Eina_Rectangle* r);
     37void ewk_tile_updates_process(Ewk_Tile* t, void (* cb)(void* data, Ewk_Tile* t, const Eina_Rectangle* update), const void* data);
     38void ewk_tile_updates_clear(Ewk_Tile* t);
    3939
    4040/* cache of unused tiles */
    41 Ewk_Tile_Unused_Cache *ewk_tile_unused_cache_new(size_t max);
    42 void ewk_tile_unused_cache_lock_area(Ewk_Tile_Unused_Cache *tuc, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom);
    43 void ewk_tile_unused_cache_unlock_area(Ewk_Tile_Unused_Cache *tuc);
    44 Ewk_Tile_Unused_Cache *ewk_tile_unused_cache_ref(Ewk_Tile_Unused_Cache *tuc);
    45 void ewk_tile_unused_cache_unref(Ewk_Tile_Unused_Cache *tuc);
     41Ewk_Tile_Unused_Cache* ewk_tile_unused_cache_new(size_t max);
     42void ewk_tile_unused_cache_lock_area(Ewk_Tile_Unused_Cache* tuc, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom);
     43void ewk_tile_unused_cache_unlock_area(Ewk_Tile_Unused_Cache* tuc);
     44Ewk_Tile_Unused_Cache* ewk_tile_unused_cache_ref(Ewk_Tile_Unused_Cache* tuc);
     45void ewk_tile_unused_cache_unref(Ewk_Tile_Unused_Cache* tuc);
    4646
    47 void ewk_tile_unused_cache_dirty(Ewk_Tile_Unused_Cache *tuc);
     47void ewk_tile_unused_cache_dirty(Ewk_Tile_Unused_Cache* tuc);
    4848
    49 void ewk_tile_unused_cache_freeze(Ewk_Tile_Unused_Cache *tuc);
    50 void ewk_tile_unused_cache_thaw(Ewk_Tile_Unused_Cache *tuc);
     49void ewk_tile_unused_cache_freeze(Ewk_Tile_Unused_Cache* tuc);
     50void ewk_tile_unused_cache_thaw(Ewk_Tile_Unused_Cache* tuc);
    5151
    52 Eina_Bool ewk_tile_unused_cache_tile_get(Ewk_Tile_Unused_Cache *tuc, Ewk_Tile *t);
    53 Eina_Bool ewk_tile_unused_cache_tile_put(Ewk_Tile_Unused_Cache *tuc, Ewk_Tile *t, void (*tile_free_cb)(void *data, Ewk_Tile *t), const void *data);
     52Eina_Bool ewk_tile_unused_cache_tile_get(Ewk_Tile_Unused_Cache* tuc, Ewk_Tile* t);
     53Eina_Bool ewk_tile_unused_cache_tile_put(Ewk_Tile_Unused_Cache* tuc, Ewk_Tile* t, void (* tile_free_cb)(void* data, Ewk_Tile* t), const void* data);
    5454
    5555#endif // ewk_tiled_model_h
  • trunk/Source/WebKit/efl/ewk/ewk_tiled_private.h

    r72579 r95659  
    5151#define REALLOC_OR_OOM_RET(ptr, size, ...)      \
    5252    do {                                        \
    53         void *__tmp_ptr;                        \
     53        void* __tmp_ptr;                        \
    5454        __tmp_ptr = realloc(ptr, size);         \
    5555        if (!__tmp_ptr && (size) > 0) {         \
  • trunk/Source/WebKit/efl/ewk/ewk_util.cpp

    r95627 r95659  
    3838 * @return converted cairo_surface object to the Evas_Object
    3939 */
    40 Evas_Object *ewk_util_image_from_cairo_surface_add(Evas *canvas, cairo_surface_t *surface)
     40Evas_Object* ewk_util_image_from_cairo_surface_add(Evas* canvas, cairo_surface_t* surface)
    4141{
    4242    cairo_status_t status;
     
    4444    cairo_format_t format;
    4545    int w, h, stride;
    46     Evas_Object *image;
    47     const void *src;
    48     void *dst;
     46    Evas_Object* image;
     47    const void* src;
     48    void* dst;
    4949
    5050    EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0);
     
    167167{
    168168#ifdef HAVE_ECORE_X
    169      return ecore_x_dpi_get();
     169    return ecore_x_dpi_get();
    170170#else
    171      return 160;
     171    return 160;
    172172#endif
    173173}
  • trunk/Source/WebKit/efl/ewk/ewk_util.h

    r91972 r95659  
    3030#include <cairo.h>
    3131
    32 Evas_Object *ewk_util_image_from_cairo_surface_add(Evas *canvas, cairo_surface_t *surface);
     32Evas_Object* ewk_util_image_from_cairo_surface_add(Evas* canvas, cairo_surface_t* surface);
    3333
    3434#endif // ewk_util_h
  • trunk/Source/WebKit/efl/ewk/ewk_view.cpp

    r95088 r95659  
    8989 */
    9090struct _Ewk_View_Private_Data {
    91     WebCore::Page *page;
    92     WebCore::Settings *page_settings;
    93     WebCore::Frame *main_frame;
     91    WebCore::Page* page;
     92    WebCore::Settings* page_settings;
     93    WebCore::Frame* main_frame;
    9494    WebCore::ViewportArguments viewport_arguments;
    95     Ewk_History *history;
     95    Ewk_History* history;
    9696    struct {
    9797        void* context;
     
    100100    struct {
    101101        Ewk_Menu menu;
    102         WebCore::PopupMenuClient *menu_client;
     102        WebCore::PopupMenuClient* menu_client;
    103103    } popup;
    104104    struct {
    105         Eina_Rectangle *array;
     105        Eina_Rectangle* array;
    106106        size_t count;
    107107        size_t allocated;
    108108    } repaints;
    109109    struct {
    110         Ewk_Scroll_Request *array;
     110        Ewk_Scroll_Request* array;
    111111        size_t count;
    112112        size_t allocated;
     
    114114    unsigned int imh; /**< input method hints */
    115115    struct {
    116         Eina_Bool view_cleared:1;
    117         Eina_Bool need_touch_events:1;
     116        Eina_Bool view_cleared : 1;
     117        Eina_Bool need_touch_events : 1;
    118118    } flags;
    119119    struct {
    120         const char *user_agent;
    121         const char *user_stylesheet;
    122         const char *encoding_default;
    123         const char *encoding_custom;
    124         const char *theme;
    125         const char *local_storage_database_path;
     120        const char* user_agent;
     121        const char* user_stylesheet;
     122        const char* encoding_default;
     123        const char* encoding_custom;
     124        const char* theme;
     125        const char* local_storage_database_path;
    126126        int font_minimum_size;
    127127        int font_minimum_logical_size;
    128128        int font_default_size;
    129129        int font_monospace_size;
    130         const char *font_standard;
    131         const char *font_cursive;
    132         const char *font_monospace;
    133         const char *font_fantasy;
    134         const char *font_serif;
    135         const char *font_sans_serif;
    136         Eina_Bool auto_load_images:1;
    137         Eina_Bool auto_shrink_images:1;
    138         Eina_Bool enable_auto_resize_window:1;
    139         Eina_Bool enable_developer_extras:1;
    140         Eina_Bool enable_scripts:1;
    141         Eina_Bool enable_plugins:1;
    142         Eina_Bool enable_frame_flattening:1;
    143         Eina_Bool encoding_detector:1;
    144         Eina_Bool scripts_window_open:1;
    145         Eina_Bool scripts_can_close_windows:1;
    146         Eina_Bool resizable_textareas:1;
    147         Eina_Bool private_browsing:1;
    148         Eina_Bool caret_browsing:1;
    149         Eina_Bool spatial_navigation:1;
    150         Eina_Bool local_storage:1;
    151         Eina_Bool offline_app_cache: 1;
    152         Eina_Bool page_cache: 1;
     130        const char* font_standard;
     131        const char* font_cursive;
     132        const char* font_monospace;
     133        const char* font_fantasy;
     134        const char* font_serif;
     135        const char* font_sans_serif;
     136        Eina_Bool auto_load_images : 1;
     137        Eina_Bool auto_shrink_images : 1;
     138        Eina_Bool enable_auto_resize_window : 1;
     139        Eina_Bool enable_developer_extras : 1;
     140        Eina_Bool enable_scripts : 1;
     141        Eina_Bool enable_plugins : 1;
     142        Eina_Bool enable_frame_flattening : 1;
     143        Eina_Bool encoding_detector : 1;
     144        Eina_Bool scripts_window_open : 1;
     145        Eina_Bool scripts_can_close_windows : 1;
     146        Eina_Bool resizable_textareas : 1;
     147        Eina_Bool private_browsing : 1;
     148        Eina_Bool caret_browsing : 1;
     149        Eina_Bool spatial_navigation : 1;
     150        Eina_Bool local_storage : 1;
     151        Eina_Bool offline_app_cache : 1;
     152        Eina_Bool page_cache : 1;
    153153        struct {
    154154            float min_scale;
    155155            float max_scale;
    156             Eina_Bool user_scalable:1;
     156            Eina_Bool user_scalable : 1;
    157157        } zoom_range;
    158158        float device_pixel_ratio;
     
    173173            Evas_Coord x, y;
    174174        } center;
    175         Ecore_Animator *animator;
     175        Ecore_Animator* animator;
    176176    } animated_zoom;
    177177};
     
    182182#define EWK_VIEW_TYPE_CHECK(o, ...)                                     \
    183183    do {                                                                \
    184         const char *_tmp_otype = evas_object_type_get(o);               \
    185         const Evas_Smart *_tmp_s = evas_object_smart_smart_get(o);      \
     184        const char* _tmp_otype = evas_object_type_get(o);               \
     185        const Evas_Smart* _tmp_s = evas_object_smart_smart_get(o);      \
    186186        if (EINA_UNLIKELY(!_tmp_s)) {                                   \
    187187            EINA_LOG_CRIT                                               \
    188188                ("%p (%s) is not a smart object!", o,                   \
    189                  _tmp_otype ? _tmp_otype : "(null)");                   \
     189                _tmp_otype ? _tmp_otype : "(null)");                   \
    190190            return __VA_ARGS__;                                         \
    191191        }                                                               \
    192         const Evas_Smart_Class *_tmp_sc = evas_smart_class_get(_tmp_s); \
     192        const Evas_Smart_Class* _tmp_sc = evas_smart_class_get(_tmp_s); \
    193193        if (EINA_UNLIKELY(!_tmp_sc)) {                                  \
    194194            EINA_LOG_CRIT                                               \
    195195                ("%p (%s) is not a smart object!", o,                   \
    196                  _tmp_otype ? _tmp_otype : "(null)");                   \
     196                _tmp_otype ? _tmp_otype : "(null)");                   \
    197197            return __VA_ARGS__;                                         \
    198198        }                                                               \
     
    200200            EINA_LOG_CRIT                                               \
    201201                ("%p (%s) is not of an ewk_view (need %p, got %p)!",    \
    202                  o, _tmp_otype ? _tmp_otype : "(null)",                 \
    203                  EWK_VIEW_TYPE_STR, _tmp_sc->data);                     \
     202                o, _tmp_otype ? _tmp_otype : "(null)",                 \
     203                EWK_VIEW_TYPE_STR, _tmp_sc->data);                     \
    204204            return __VA_ARGS__;                                         \
    205205        }                                                               \
     
    208208
    209209#define EWK_VIEW_SD_GET(o, ptr)                                 \
    210     Ewk_View_Smart_Data *ptr = (Ewk_View_Smart_Data *)evas_object_smart_data_get(o)
     210    Ewk_View_Smart_Data *ptr = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o)
    211211
    212212#define EWK_VIEW_SD_GET_OR_RETURN(o, ptr, ...)          \
     
    230230    }
    231231
    232 static void _ewk_view_smart_changed(Ewk_View_Smart_Data *sd)
     232static void _ewk_view_smart_changed(Ewk_View_Smart_Data* sd)
    233233{
    234234    if (sd->changed.any)
     
    238238}
    239239
    240 static Eina_Bool _ewk_view_repaints_resize(Ewk_View_Private_Data *priv, size_t size)
    241 {
    242     void *tmp = realloc(priv->repaints.array, size * sizeof(Eina_Rectangle));
     240static Eina_Bool _ewk_view_repaints_resize(Ewk_View_Private_Data* priv, size_t size)
     241{
     242    void* tmp = realloc(priv->repaints.array, size * sizeof(Eina_Rectangle));
    243243    if (!tmp) {
    244244        CRITICAL("could not realloc repaints array to %zu elements.", size);
     
    246246    }
    247247    priv->repaints.allocated = size;
    248     priv->repaints.array = (Eina_Rectangle *)tmp;
    249     return EINA_TRUE;
    250 }
    251 
    252 static void _ewk_view_repaint_add(Ewk_View_Private_Data *priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
    253 {
    254     Eina_Rectangle *r;
     248    priv->repaints.array = (Eina_Rectangle*)tmp;
     249    return EINA_TRUE;
     250}
     251
     252static void _ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
     253{
     254    Eina_Rectangle* r;
    255255
    256256    // fprintf(stderr, ">>> repaint requested: %d,%d+%dx%d\n", x, y, w, h);
     
    276276}
    277277
    278 static void _ewk_view_repaints_flush(Ewk_View_Private_Data *priv)
     278static void _ewk_view_repaints_flush(Ewk_View_Private_Data* priv)
    279279{
    280280    priv->repaints.count = 0;
     
    284284}
    285285
    286 static Eina_Bool _ewk_view_scrolls_resize(Ewk_View_Private_Data *priv, size_t size)
    287 {
    288     void *tmp = realloc(priv->scrolls.array, size * sizeof(Ewk_Scroll_Request));
     286static Eina_Bool _ewk_view_scrolls_resize(Ewk_View_Private_Data* priv, size_t size)
     287{
     288    void* tmp = realloc(priv->scrolls.array, size * sizeof(Ewk_Scroll_Request));
    289289    if (!tmp) {
    290290        CRITICAL("could not realloc scrolls array to %zu elements.", size);
     
    292292    }
    293293    priv->scrolls.allocated = size;
    294     priv->scrolls.array = (Ewk_Scroll_Request *)tmp;
    295     return EINA_TRUE;
    296 }
    297 
    298 static void _ewk_view_scroll_add(Ewk_View_Private_Data *priv, Evas_Coord dx, Evas_Coord dy, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool main_scroll)
    299 {
    300     Ewk_Scroll_Request *r;
    301     Ewk_Scroll_Request *r_end;
     294    priv->scrolls.array = (Ewk_Scroll_Request*)tmp;
     295    return EINA_TRUE;
     296}
     297
     298static void _ewk_view_scroll_add(Ewk_View_Private_Data* priv, Evas_Coord dx, Evas_Coord dy, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool main_scroll)
     299{
     300    Ewk_Scroll_Request* r;
     301    Ewk_Scroll_Request* r_end;
    302302    Evas_Coord x2 = x + w, y2 = y + h;
    303303
     
    346346    DBG("add scroll in region: %d, %d+%dx%d %+03d, %+03d", x, y, w, h, dx, dy);
    347347
    348     Eina_Rectangle *pr;
    349     Eina_Rectangle *pr_end;
     348    Eina_Rectangle* pr;
     349    Eina_Rectangle* pr_end;
    350350    size_t count;
    351351    pr = priv->repaints.array;
     
    358358}
    359359
    360 static void _ewk_view_scrolls_flush(Ewk_View_Private_Data *priv)
     360static void _ewk_view_scrolls_flush(Ewk_View_Private_Data* priv)
    361361{
    362362    priv->scrolls.count = 0;
     
    367367
    368368// Default Event Handling //////////////////////////////////////////////
    369 static Eina_Bool _ewk_view_smart_focus_in(Ewk_View_Smart_Data *sd)
     369static Eina_Bool _ewk_view_smart_focus_in(Ewk_View_Smart_Data* sd)
    370370{
    371371    EWK_VIEW_PRIV_GET(sd, priv);
    372     WebCore::FocusController *fc = priv->page->focusController();
     372    WebCore::FocusController* fc = priv->page->focusController();
    373373    DBG("o=%p, fc=%p", sd->self, fc);
    374374    EINA_SAFETY_ON_NULL_RETURN_VAL(fc, EINA_FALSE);
     
    379379}
    380380
    381 static Eina_Bool _ewk_view_smart_focus_out(Ewk_View_Smart_Data *sd)
     381static Eina_Bool _ewk_view_smart_focus_out(Ewk_View_Smart_Data* sd)
    382382{
    383383    EWK_VIEW_PRIV_GET(sd, priv);
    384     WebCore::FocusController *fc = priv->page->focusController();
     384    WebCore::FocusController* fc = priv->page->focusController();
    385385    DBG("o=%p, fc=%p", sd->self, fc);
    386386    EINA_SAFETY_ON_NULL_RETURN_VAL(fc, EINA_FALSE);
     
    391391}
    392392
    393 static Eina_Bool _ewk_view_smart_mouse_wheel(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Wheel *ev)
     393static Eina_Bool _ewk_view_smart_mouse_wheel(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Wheel* ev)
    394394{
    395395    return ewk_frame_feed_mouse_wheel(sd->main_frame, ev);
    396396}
    397397
    398 static Eina_Bool _ewk_view_smart_mouse_down(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Down *ev)
     398static Eina_Bool _ewk_view_smart_mouse_down(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Down* ev)
    399399{
    400400    return ewk_frame_feed_mouse_down(sd->main_frame, ev);
    401401}
    402402
    403 static Eina_Bool _ewk_view_smart_mouse_up(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Up *ev)
     403static Eina_Bool _ewk_view_smart_mouse_up(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Up* ev)
    404404{
    405405    return ewk_frame_feed_mouse_up(sd->main_frame, ev);
    406406}
    407407
    408 static Eina_Bool _ewk_view_smart_mouse_move(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Move *ev)
     408static Eina_Bool _ewk_view_smart_mouse_move(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Move* ev)
    409409{
    410410    return ewk_frame_feed_mouse_move(sd->main_frame, ev);
    411411}
    412412
    413 static Eina_Bool _ewk_view_smart_key_down(Ewk_View_Smart_Data *sd, const Evas_Event_Key_Down *ev)
    414 {
    415     Evas_Object *frame = ewk_view_frame_focused_get(sd->self);
     413static Eina_Bool _ewk_view_smart_key_down(Ewk_View_Smart_Data* sd, const Evas_Event_Key_Down* ev)
     414{
     415    Evas_Object* frame = ewk_view_frame_focused_get(sd->self);
    416416
    417417    if (!frame)
     
    421421}
    422422
    423 static Eina_Bool _ewk_view_smart_key_up(Ewk_View_Smart_Data *sd, const Evas_Event_Key_Up *ev)
    424 {
    425     Evas_Object *frame = ewk_view_frame_focused_get(sd->self);
     423static Eina_Bool _ewk_view_smart_key_up(Ewk_View_Smart_Data* sd, const Evas_Event_Key_Up* ev)
     424{
     425    Evas_Object* frame = ewk_view_frame_focused_get(sd->self);
    426426
    427427    if (!frame)
     
    431431}
    432432
    433 static void _ewk_view_smart_add_console_message(Ewk_View_Smart_Data *sd, const char *message, unsigned int lineNumber, const char *sourceID)
     433static void _ewk_view_smart_add_console_message(Ewk_View_Smart_Data* sd, const char* message, unsigned int lineNumber, const char* sourceID)
    434434{
    435435    INF("console message: %s @%d: %s\n", sourceID, lineNumber, message);
    436436}
    437437
    438 static void _ewk_view_smart_run_javascript_alert(Ewk_View_Smart_Data *sd, Evas_Object *frame, const char *message)
     438static void _ewk_view_smart_run_javascript_alert(Ewk_View_Smart_Data* sd, Evas_Object* frame, const char* message)
    439439{
    440440    INF("javascript alert: %s\n", message);
    441441}
    442442
    443 static Eina_Bool _ewk_view_smart_run_javascript_confirm(Ewk_View_Smart_Data *sd, Evas_Object *frame, const char *message)
     443static Eina_Bool _ewk_view_smart_run_javascript_confirm(Ewk_View_Smart_Data* sd, Evas_Object* frame, const char* message)
    444444{
    445445    INF("javascript confirm: %s", message);
     
    448448}
    449449
    450 static Eina_Bool _ewk_view_smart_should_interrupt_javascript(Ewk_View_Smart_Data *sd)
     450static Eina_Bool _ewk_view_smart_should_interrupt_javascript(Ewk_View_Smart_Data* sd)
    451451{
    452452    INF("should interrupt javascript?\n"
    453             "\t(HARD CODED) NO");
     453        "\t(HARD CODED) NO");
    454454    return EINA_FALSE;
    455455}
    456456
    457 static Eina_Bool _ewk_view_smart_run_javascript_prompt(Ewk_View_Smart_Data *sd, Evas_Object *frame, const char *message, const char *defaultValue, char **value)
     457static Eina_Bool _ewk_view_smart_run_javascript_prompt(Ewk_View_Smart_Data* sd, Evas_Object* frame, const char* message, const char* defaultValue, char** value)
    458458{
    459459    *value = strdup("test");
    460460    Eina_Bool ret = EINA_TRUE;
    461461    INF("javascript prompt:\n"
    462             "\t      message: %s\n"
    463             "\tdefault value: %s\n"
    464             "\tgiving answer: %s\n"
    465             "\t       button: %s", message, defaultValue, *value, ret?"ok":"cancel");
     462        "\t      message: %s\n"
     463        "\tdefault value: %s\n"
     464        "\tgiving answer: %s\n"
     465        "\t       button: %s", message, defaultValue, *value, ret ? "ok" : "cancel");
    466466
    467467    return ret;
     
    469469
    470470// Event Handling //////////////////////////////////////////////////////
    471 static void _ewk_view_on_focus_in(void *data, Evas *e, Evas_Object *o, void *event_info)
    472 {
    473     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data *)data;
     471static void _ewk_view_on_focus_in(void* data, Evas* e, Evas_Object* o, void* event_info)
     472{
     473    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    474474    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    475475    EINA_SAFETY_ON_NULL_RETURN(sd->api->focus_in);
     
    477477}
    478478
    479 static void _ewk_view_on_focus_out(void *data, Evas *e, Evas_Object *o, void *event_info)
    480 {
    481     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data *)data;
     479static void _ewk_view_on_focus_out(void* data, Evas* e, Evas_Object* o, void* event_info)
     480{
     481    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    482482    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    483483    EINA_SAFETY_ON_NULL_RETURN(sd->api->focus_out);
     
    485485}
    486486
    487 static void _ewk_view_on_mouse_wheel(void *data, Evas *e, Evas_Object *o, void *event_info)
    488 {
    489     Evas_Event_Mouse_Wheel *ev = (Evas_Event_Mouse_Wheel *)event_info;
    490     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data *)data;
     487static void _ewk_view_on_mouse_wheel(void* data, Evas* e, Evas_Object* o, void* event_info)
     488{
     489    Evas_Event_Mouse_Wheel* ev = (Evas_Event_Mouse_Wheel*)event_info;
     490    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    491491    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    492492    EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_wheel);
     
    494494}
    495495
    496 static void _ewk_view_on_mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info)
    497 {
    498     Evas_Event_Mouse_Down *ev = (Evas_Event_Mouse_Down *)event_info;
    499     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data *)data;
     496static void _ewk_view_on_mouse_down(void* data, Evas* e, Evas_Object* o, void* event_info)
     497{
     498    Evas_Event_Mouse_Down* ev = (Evas_Event_Mouse_Down*)event_info;
     499    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    500500    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    501501    EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_down);
     
    503503}
    504504
    505 static void _ewk_view_on_mouse_up(void *data, Evas *e, Evas_Object *o, void *event_info)
    506 {
    507     Evas_Event_Mouse_Up *ev = (Evas_Event_Mouse_Up *)event_info;
    508     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data *)data;
     505static void _ewk_view_on_mouse_up(void* data, Evas* e, Evas_Object* o, void* event_info)
     506{
     507    Evas_Event_Mouse_Up* ev = (Evas_Event_Mouse_Up*)event_info;
     508    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    509509    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    510510    EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_up);
     
    512512}
    513513
    514 static void _ewk_view_on_mouse_move(void *data, Evas *e, Evas_Object *o, void *event_info)
    515 {
    516     Evas_Event_Mouse_Move *ev = (Evas_Event_Mouse_Move *)event_info;
    517     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data *)data;
     514static void _ewk_view_on_mouse_move(void* data, Evas* e, Evas_Object* o, void* event_info)
     515{
     516    Evas_Event_Mouse_Move* ev = (Evas_Event_Mouse_Move*)event_info;
     517    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    518518    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    519519    EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_move);
     
    521521}
    522522
    523 static void _ewk_view_on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
    524 {
    525     Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event_info;
    526     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data *)data;
     523static void _ewk_view_on_key_down(void* data, Evas* e, Evas_Object* o, void* event_info)
     524{
     525    Evas_Event_Key_Down* ev = (Evas_Event_Key_Down*)event_info;
     526    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    527527    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    528528    EINA_SAFETY_ON_NULL_RETURN(sd->api->key_down);
     
    530530}
    531531
    532 static void _ewk_view_on_key_up(void *data, Evas *e, Evas_Object *o, void *event_info)
    533 {
    534     Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *)event_info;
    535     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data *)data;
     532static void _ewk_view_on_key_up(void* data, Evas* e, Evas_Object* o, void* event_info)
     533{
     534    Evas_Event_Key_Up* ev = (Evas_Event_Key_Up*)event_info;
     535    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    536536    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    537537    EINA_SAFETY_ON_NULL_RETURN(sd->api->key_up);
     
    539539}
    540540
    541 static WTF::PassRefPtr<WebCore::Frame> _ewk_view_core_frame_new(Ewk_View_Smart_Data *sd, Ewk_View_Private_Data *priv, WebCore::HTMLFrameOwnerElement *owner)
    542 {
    543     WebCore::FrameLoaderClientEfl *flc = new WebCore::FrameLoaderClientEfl(sd->self);
     541static WTF::PassRefPtr<WebCore::Frame> _ewk_view_core_frame_new(Ewk_View_Smart_Data* sd, Ewk_View_Private_Data* priv, WebCore::HTMLFrameOwnerElement* owner)
     542{
     543    WebCore::FrameLoaderClientEfl* flc = new WebCore::FrameLoaderClientEfl(sd->self);
    544544    if (!flc) {
    545545        CRITICAL("Could not create frame loader client.");
     
    553553static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL;
    554554
    555 static Ewk_View_Private_Data *_ewk_view_priv_new(Ewk_View_Smart_Data *sd)
    556 {
    557     Ewk_View_Private_Data *priv =
    558         (Ewk_View_Private_Data *)calloc(1, sizeof(Ewk_View_Private_Data));
     555static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* sd)
     556{
     557    Ewk_View_Private_Data* priv =
     558        (Ewk_View_Private_Data*)calloc(1, sizeof(Ewk_View_Private_Data));
    559559    AtomicString s;
    560560    WebCore::KURL url;
     
    612612
    613613    priv->settings.encoding_default = eina_stringshare_add
    614         (priv->page_settings->defaultTextEncodingName().utf8().data());
     614                                          (priv->page_settings->defaultTextEncodingName().utf8().data());
    615615    priv->settings.encoding_custom = 0;
    616616
     
    672672    }
    673673
    674     priv->history = ewk_history_new(static_cast<WebCore::BackForwardListImpl *>(priv->page->backForwardList()));
     674    priv->history = ewk_history_new(static_cast<WebCore::BackForwardListImpl*>(priv->page->backForwardList()));
    675675    if (!priv->history) {
    676676        CRITICAL("Could not create history instance for view.");
     
    690690}
    691691
    692 static void _ewk_view_priv_del(Ewk_View_Private_Data *priv)
     692static void _ewk_view_priv_del(Ewk_View_Private_Data* priv)
    693693{
    694694    if (!priv)
     
    721721}
    722722
    723 static void _ewk_view_smart_add(Evas_Object *o)
    724 {
    725     const Evas_Smart *smart = evas_object_smart_smart_get(o);
    726     const Evas_Smart_Class *sc = evas_smart_class_get(smart);
    727     const Ewk_View_Smart_Class *api = (const Ewk_View_Smart_Class *)sc;
     723static void _ewk_view_smart_add(Evas_Object* o)
     724{
     725    const Evas_Smart* smart = evas_object_smart_smart_get(o);
     726    const Evas_Smart_Class* sc = evas_smart_class_get(smart);
     727    const Ewk_View_Smart_Class* api = (const Ewk_View_Smart_Class*)sc;
    728728    EINA_SAFETY_ON_NULL_RETURN(api->backing_store_add);
    729729    EWK_VIEW_SD_GET(o, sd);
    730730
    731731    if (!sd) {
    732         sd = (Ewk_View_Smart_Data *)calloc(1, sizeof(Ewk_View_Smart_Data));
     732        sd = (Ewk_View_Smart_Data*)calloc(1, sizeof(Ewk_View_Smart_Data));
    733733        if (!sd) {
    734734            CRITICAL("could not allocate Ewk_View_Smart_Data");
     
    801801}
    802802
    803 static void _ewk_view_smart_del(Evas_Object *o)
     803static void _ewk_view_smart_del(Evas_Object* o)
    804804{
    805805    EWK_VIEW_SD_GET(o, sd);
    806     Ewk_View_Private_Data *priv = sd ? sd->_priv : 0;
     806    Ewk_View_Private_Data* priv = sd ? sd->_priv : 0;
    807807
    808808    ewk_view_stop(o);
     
    811811}
    812812
    813 static void _ewk_view_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)
     813static void _ewk_view_smart_resize(Evas_Object* o, Evas_Coord w, Evas_Coord h)
    814814{
    815815    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    822822}
    823823
    824 static void _ewk_view_smart_move(Evas_Object *o, Evas_Coord x, Evas_Coord y)
     824static void _ewk_view_smart_move(Evas_Object* o, Evas_Coord x, Evas_Coord y)
    825825{
    826826    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    829829}
    830830
    831 static void _ewk_view_smart_calculate(Evas_Object *o)
     831static void _ewk_view_smart_calculate(Evas_Object* o)
    832832{
    833833    EWK_VIEW_SD_GET(o, sd);
     
    851851
    852852    if (sd->changed.size && ((w != sd->view.w) || (h != sd->view.h))) {
    853         WebCore::FrameView *view = priv->main_frame->view();
     853        WebCore::FrameView* view = priv->main_frame->view();
    854854        if (view) {
    855855            view->resize(w, h);
     
    889889
    890890    if (sd->changed.frame_rect) {
    891         WebCore::FrameView *view = priv->main_frame->view();
     891        WebCore::FrameView* view = priv->main_frame->view();
    892892        view->frameRectsChanged(); /* force tree to get position from root */
    893893        sd->changed.frame_rect = EINA_FALSE;
     
    895895}
    896896
    897 static void _ewk_view_smart_show(Evas_Object *o)
     897static void _ewk_view_smart_show(Evas_Object* o)
    898898{
    899899    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    904904}
    905905
    906 static void _ewk_view_smart_hide(Evas_Object *o)
     906static void _ewk_view_smart_hide(Evas_Object* o)
    907907{
    908908    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    912912}
    913913
    914 static Eina_Bool _ewk_view_smart_contents_resize(Ewk_View_Smart_Data *sd, int w, int h)
    915 {
    916     return EINA_TRUE;
    917 }
    918 
    919 static Eina_Bool _ewk_view_smart_zoom_set(Ewk_View_Smart_Data *sd, float zoom, Evas_Coord cx, Evas_Coord cy)
     914static Eina_Bool _ewk_view_smart_contents_resize(Ewk_View_Smart_Data* sd, int w, int h)
     915{
     916    return EINA_TRUE;
     917}
     918
     919static Eina_Bool _ewk_view_smart_zoom_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy)
    920920{
    921921    double px, py;
     
    945945}
    946946
    947 static void _ewk_view_smart_flush(Ewk_View_Smart_Data *sd)
     947static void _ewk_view_smart_flush(Ewk_View_Smart_Data* sd)
    948948{
    949949    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
     
    952952}
    953953
    954 static Eina_Bool _ewk_view_smart_pre_render_region(Ewk_View_Smart_Data *sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
     954static Eina_Bool _ewk_view_smart_pre_render_region(Ewk_View_Smart_Data* sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
    955955{
    956956    WRN("not supported by engine. sd=%p area=%d,%d+%dx%d, zoom=%f",
     
    959959}
    960960
    961 static Eina_Bool _ewk_view_smart_pre_render_relative_radius(Ewk_View_Smart_Data *sd, unsigned int n, float zoom)
     961static Eina_Bool _ewk_view_smart_pre_render_relative_radius(Ewk_View_Smart_Data* sd, unsigned int n, float zoom)
    962962{
    963963    WRN("not supported by engine. sd=%p, n=%u zoom=%f",
     
    966966}
    967967
    968 static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data *sd)
     968static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data* sd)
    969969{
    970970    WRN("not supported by engine. sd=%p", sd);
    971971}
    972972
    973 static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data *sd)
     973static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data* sd)
    974974{
    975975    sd->animated_zoom.zoom.start = 0.0;
     
    978978}
    979979
    980 static void _ewk_view_zoom_animated_finish(Ewk_View_Smart_Data *sd)
     980static void _ewk_view_zoom_animated_finish(Ewk_View_Smart_Data* sd)
    981981{
    982982    EWK_VIEW_PRIV_GET(sd, priv);
     
    987987}
    988988
    989 static float _ewk_view_zoom_animated_current(Ewk_View_Private_Data *priv)
     989static float _ewk_view_zoom_animated_current(Ewk_View_Private_Data* priv)
    990990{
    991991    double now = ecore_loop_time_get();
     
    10031003}
    10041004
    1005 static Eina_Bool _ewk_view_zoom_animator_cb(void *data)
    1006 {
    1007     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data *)data;
     1005static Eina_Bool _ewk_view_zoom_animator_cb(void* data)
     1006{
     1007    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    10081008    Evas_Coord cx, cy;
    10091009    EWK_VIEW_PRIV_GET(sd, priv);
     
    10321032}
    10331033
    1034 static void _ewk_view_zoom_animation_start(Ewk_View_Smart_Data *sd)
     1034static void _ewk_view_zoom_animation_start(Ewk_View_Smart_Data* sd)
    10351035{
    10361036    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
     
    10381038        return;
    10391039    priv->animated_zoom.animator = ecore_animator_add
    1040         (_ewk_view_zoom_animator_cb, sd);
    1041 }
    1042 
    1043 static WebCore::ViewportAttributes _ewk_view_viewport_attributes_compute(const Evas_Object *o)
     1040                                       (_ewk_view_zoom_animator_cb, sd);
     1041}
     1042
     1043static WebCore::ViewportAttributes _ewk_view_viewport_attributes_compute(const Evas_Object* o)
    10441044{
    10451045    EWK_VIEW_SD_GET(o, sd);
     
    10611061}
    10621062
    1063 static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data *sd)
     1063static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data* sd)
    10641064{
    10651065    WRN("not supported by engine. sd=%p", sd);
     
    10671067}
    10681068
    1069 static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data *sd)
     1069static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data* sd)
    10701070{
    10711071    WRN("not supported by engine. sd=%p", sd);
     
    10731073}
    10741074
    1075 Eina_Bool ewk_view_base_smart_set(Ewk_View_Smart_Class *api)
     1075Eina_Bool ewk_view_base_smart_set(Ewk_View_Smart_Class* api)
    10761076{
    10771077    EINA_SAFETY_ON_NULL_RETURN_VAL(api, EINA_FALSE);
     
    10801080        EINA_LOG_CRIT
    10811081            ("Ewk_View_Smart_Class %p is version %lu while %lu was expected.",
    1082              api, api->version, EWK_VIEW_SMART_CLASS_VERSION);
     1082            api, api->version, EWK_VIEW_SMART_CLASS_VERSION);
    10831083        return EINA_FALSE;
    10841084    }
     
    11241124}
    11251125
    1126 void ewk_view_fixed_layout_size_set(Evas_Object *o, Evas_Coord w, Evas_Coord h)
     1126void ewk_view_fixed_layout_size_set(Evas_Object* o, Evas_Coord w, Evas_Coord h)
    11271127{
    11281128    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
    11291129    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
    11301130
    1131     WebCore::FrameView *view = priv->main_frame->view();
     1131    WebCore::FrameView* view = priv->main_frame->view();
    11321132    if (w <= 0 && h <= 0) {
    11331133        if (!view->useFixedLayout())
     
    11481148}
    11491149
    1150 void ewk_view_fixed_layout_size_get(const Evas_Object *o, Evas_Coord *w, Evas_Coord *h)
     1150void ewk_view_fixed_layout_size_get(const Evas_Object* o, Evas_Coord* w, Evas_Coord* h)
    11511151{
    11521152    if (w)
     
    11661166}
    11671167
    1168 void ewk_view_theme_set(Evas_Object *o, const char *path)
     1168void ewk_view_theme_set(Evas_Object* o, const char* path)
    11691169{
    11701170    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    11731173        return;
    11741174
    1175     WebCore::FrameView *view = priv->main_frame->view();
     1175    WebCore::FrameView* view = priv->main_frame->view();
    11761176    if (view) {
    11771177        view->setEdjeTheme(WTF::String(path));
     
    11811181}
    11821182
    1183 const char* ewk_view_theme_get(const Evas_Object *o)
     1183const char* ewk_view_theme_get(const Evas_Object* o)
    11841184{
    11851185    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    11881188}
    11891189
    1190 Evas_Object* ewk_view_frame_main_get(const Evas_Object *o)
     1190Evas_Object* ewk_view_frame_main_get(const Evas_Object* o)
    11911191{
    11921192    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    11941194}
    11951195
    1196 Evas_Object* ewk_view_frame_focused_get(const Evas_Object *o)
     1196Evas_Object* ewk_view_frame_focused_get(const Evas_Object* o)
    11971197{
    11981198    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
    11991199    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
    12001200
    1201     WebCore::Frame *core = priv->page->focusController()->focusedFrame();
     1201    WebCore::Frame* core = priv->page->focusController()->focusedFrame();
    12021202    if (!core)
    12031203        return 0;
     
    12091209}
    12101210
    1211 Eina_Bool ewk_view_uri_set(Evas_Object *o, const char *uri)
     1211Eina_Bool ewk_view_uri_set(Evas_Object* o, const char* uri)
    12121212{
    12131213    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    12151215}
    12161216
    1217 const char *ewk_view_uri_get(const Evas_Object *o)
     1217const char* ewk_view_uri_get(const Evas_Object* o)
    12181218{
    12191219    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    12211221}
    12221222
    1223 const char *ewk_view_title_get(const Evas_Object *o)
     1223const char* ewk_view_title_get(const Evas_Object* o)
    12241224{
    12251225    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    12271227}
    12281228
    1229 Eina_Bool ewk_view_editable_get(const Evas_Object *o)
     1229Eina_Bool ewk_view_editable_get(const Evas_Object* o)
    12301230{
    12311231    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    12331233}
    12341234
    1235 void ewk_view_bg_color_set(Evas_Object *o, int r, int g, int b, int a)
     1235void ewk_view_bg_color_set(Evas_Object* o, int r, int g, int b, int a)
    12361236{
    12371237    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    12491249#define CHECK_PREMUL_COLOR(c, a)                                        \
    12501250    if (c < 0) {                                                        \
    1251         WRN("Color component "#c" is less than zero (%d).", c);         \
     1251        WRN("Color component " #c " is less than zero (%d).", c);         \
    12521252        c = 0;                                                          \
    12531253    } else if (c > a) {                                                 \
    1254         WRN("Color component "#c" is greater than alpha (%d, alpha=%d).", \
     1254        WRN("Color component " #c " is greater than alpha (%d, alpha=%d).", \
    12551255            c, a);                                                      \
    12561256        c = a;                                                          \
     
    12681268    sd->api->bg_color_set(sd, r, g, b, a);
    12691269
    1270     WebCore::FrameView *view = sd->_priv->main_frame->view();
     1270    WebCore::FrameView* view = sd->_priv->main_frame->view();
    12711271    if (view) {
    12721272        WebCore::Color color;
     
    12831283}
    12841284
    1285 void ewk_view_bg_color_get(const Evas_Object *o, int *r, int *g, int *b, int *a)
     1285void ewk_view_bg_color_get(const Evas_Object* o, int* r, int* g, int* b, int* a)
    12861286{
    12871287    if (r)
     
    13041304}
    13051305
    1306 Eina_Bool ewk_view_text_search(const Evas_Object *o, const char *string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap)
     1306Eina_Bool ewk_view_text_search(const Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap)
    13071307{
    13081308    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    13361336 * @return number of matches.
    13371337 */
    1338 unsigned int ewk_view_text_matches_mark(Evas_Object *o, const char *string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit)
     1338unsigned int ewk_view_text_matches_mark(Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit)
    13391339{
    13401340    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    13511351}
    13521352
    1353 Eina_Bool ewk_view_text_matches_unmark_all(Evas_Object *o)
     1353Eina_Bool ewk_view_text_matches_unmark_all(Evas_Object* o)
    13541354{
    13551355    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    13591359}
    13601360
    1361 Eina_Bool ewk_view_text_matches_highlight_set(Evas_Object *o, Eina_Bool highlight)
     1361Eina_Bool ewk_view_text_matches_highlight_set(Evas_Object* o, Eina_Bool highlight)
    13621362{
    13631363    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    13651365}
    13661366
    1367 Eina_Bool ewk_view_text_matches_highlight_get(const Evas_Object *o)
     1367Eina_Bool ewk_view_text_matches_highlight_get(const Evas_Object* o)
    13681368{
    13691369    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    13711371}
    13721372
    1373 Eina_Bool ewk_view_editable_set(Evas_Object *o, Eina_Bool editable)
     1373Eina_Bool ewk_view_editable_set(Evas_Object* o, Eina_Bool editable)
    13741374{
    13751375    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    13771377}
    13781378
    1379 char *ewk_view_selection_get(const Evas_Object *o)
     1379char* ewk_view_selection_get(const Evas_Object* o)
    13801380{
    13811381    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    13871387}
    13881388
    1389 static Eina_Bool _ewk_view_editor_command(Ewk_View_Private_Data *priv, const char *command, const char *value = 0)
     1389static Eina_Bool _ewk_view_editor_command(Ewk_View_Private_Data* priv, const char* command, const char* value = 0)
    13901390{
    13911391    return priv->page->focusController()->focusedOrMainFrame()->editor()->command(WTF::String::fromUTF8(command)).execute(value);
    13921392}
    13931393
    1394 Eina_Bool ewk_view_execute_editor_command(Evas_Object *o, const Ewk_Editor_Command command, const char *value)
     1394Eina_Bool ewk_view_execute_editor_command(Evas_Object* o, const Ewk_Editor_Command command, const char* value)
    13951395{
    13961396    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    14191419}
    14201420
    1421 Eina_Bool ewk_view_context_menu_forward_event(Evas_Object *o, const Evas_Event_Mouse_Down *ev)
     1421Eina_Bool ewk_view_context_menu_forward_event(Evas_Object* o, const Evas_Event_Mouse_Down* ev)
    14221422{
    14231423#if ENABLE(CONTEXT_MENUS)
     
    14271427
    14281428    priv->page->contextMenuController()->clearContextMenu();
    1429     WebCore::Frame *main_frame = priv->page->mainFrame();
     1429    WebCore::Frame* main_frame = priv->page->mainFrame();
    14301430    Evas_Coord x, y;
    14311431    evas_object_geometry_get(sd->self, &x, &y, 0, 0);
     
    14551455}
    14561456
    1457 double ewk_view_load_progress_get(const Evas_Object *o)
     1457double ewk_view_load_progress_get(const Evas_Object* o)
    14581458{
    14591459    EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
     
    14621462}
    14631463
    1464 Eina_Bool ewk_view_stop(Evas_Object *o)
     1464Eina_Bool ewk_view_stop(Evas_Object* o)
    14651465{
    14661466    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    14681468}
    14691469
    1470 Eina_Bool ewk_view_reload(Evas_Object *o)
     1470Eina_Bool ewk_view_reload(Evas_Object* o)
    14711471{
    14721472    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    14741474}
    14751475
    1476 Eina_Bool ewk_view_reload_full(Evas_Object *o)
     1476Eina_Bool ewk_view_reload_full(Evas_Object* o)
    14771477{
    14781478    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    14801480}
    14811481
    1482 Eina_Bool ewk_view_back(Evas_Object *o)
     1482Eina_Bool ewk_view_back(Evas_Object* o)
    14831483{
    14841484    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    14861486}
    14871487
    1488 Eina_Bool ewk_view_forward(Evas_Object *o)
     1488Eina_Bool ewk_view_forward(Evas_Object* o)
    14891489{
    14901490    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    14921492}
    14931493
    1494 Eina_Bool ewk_view_navigate(Evas_Object *o, int steps)
     1494Eina_Bool ewk_view_navigate(Evas_Object* o, int steps)
    14951495{
    14961496    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    14981498}
    14991499
    1500 Eina_Bool ewk_view_back_possible(Evas_Object *o)
     1500Eina_Bool ewk_view_back_possible(Evas_Object* o)
    15011501{
    15021502    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    15041504}
    15051505
    1506 Eina_Bool ewk_view_forward_possible(Evas_Object *o)
     1506Eina_Bool ewk_view_forward_possible(Evas_Object* o)
    15071507{
    15081508    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    15101510}
    15111511
    1512 Eina_Bool ewk_view_navigate_possible(Evas_Object *o, int steps)
     1512Eina_Bool ewk_view_navigate_possible(Evas_Object* o, int steps)
    15131513{
    15141514    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    15161516}
    15171517
    1518 Eina_Bool ewk_view_history_enable_get(const Evas_Object *o)
     1518Eina_Bool ewk_view_history_enable_get(const Evas_Object* o)
    15191519{
    15201520    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    15231523}
    15241524
    1525 Eina_Bool ewk_view_history_enable_set(Evas_Object *o, Eina_Bool enable)
     1525Eina_Bool ewk_view_history_enable_set(Evas_Object* o, Eina_Bool enable)
    15261526{
    15271527    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    15311531}
    15321532
    1533 Ewk_History* ewk_view_history_get(const Evas_Object *o)
     1533Ewk_History* ewk_view_history_get(const Evas_Object* o)
    15341534{
    15351535    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    15421542}
    15431543
    1544 float ewk_view_zoom_get(const Evas_Object *o)
     1544float ewk_view_zoom_get(const Evas_Object* o)
    15451545{
    15461546    EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
     
    15481548}
    15491549
    1550 Eina_Bool ewk_view_zoom_set(Evas_Object *o, float zoom, Evas_Coord cx, Evas_Coord cy)
     1550Eina_Bool ewk_view_zoom_set(Evas_Object* o, float zoom, Evas_Coord cx, Evas_Coord cy)
    15511551{
    15521552    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    15741574}
    15751575
    1576 Eina_Bool ewk_view_zoom_weak_smooth_scale_get(const Evas_Object *o)
     1576Eina_Bool ewk_view_zoom_weak_smooth_scale_get(const Evas_Object* o)
    15771577{
    15781578    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    15801580}
    15811581
    1582 void ewk_view_zoom_weak_smooth_scale_set(Evas_Object *o, Eina_Bool smooth_scale)
     1582void ewk_view_zoom_weak_smooth_scale_set(Evas_Object* o, Eina_Bool smooth_scale)
    15831583{
    15841584    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    15921592}
    15931593
    1594 Eina_Bool ewk_view_zoom_weak_set(Evas_Object *o, float zoom, Evas_Coord cx, Evas_Coord cy)
     1594Eina_Bool ewk_view_zoom_weak_set(Evas_Object* o, float zoom, Evas_Coord cx, Evas_Coord cy)
    15951595{
    15961596    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    16201620}
    16211621
    1622 Eina_Bool ewk_view_zoom_animated_mark_start(Evas_Object *o, float zoom)
     1622Eina_Bool ewk_view_zoom_animated_mark_start(Evas_Object* o, float zoom)
    16231623{
    16241624    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    16271627}
    16281628
    1629 Eina_Bool ewk_view_zoom_animated_mark_end(Evas_Object *o, float zoom)
     1629Eina_Bool ewk_view_zoom_animated_mark_end(Evas_Object* o, float zoom)
    16301630{
    16311631    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    16341634}
    16351635
    1636 Eina_Bool ewk_view_zoom_animated_mark_current(Evas_Object *o, float zoom)
     1636Eina_Bool ewk_view_zoom_animated_mark_current(Evas_Object* o, float zoom)
    16371637{
    16381638    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    16411641}
    16421642
    1643 Eina_Bool ewk_view_zoom_animated_mark_stop(Evas_Object *o)
     1643Eina_Bool ewk_view_zoom_animated_mark_stop(Evas_Object* o)
    16441644{
    16451645    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    16481648}
    16491649
    1650 Eina_Bool ewk_view_zoom_animated_set(Evas_Object *o, float zoom, float duration, Evas_Coord cx, Evas_Coord cy)
     1650Eina_Bool ewk_view_zoom_animated_set(Evas_Object* o, float zoom, float duration, Evas_Coord cx, Evas_Coord cy)
    16511651{
    16521652    double now;
     
    16971697}
    16981698
    1699 Eina_Bool ewk_view_zoom_text_only_get(const Evas_Object *o)
     1699Eina_Bool ewk_view_zoom_text_only_get(const Evas_Object* o)
    17001700{
    17011701    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    17031703}
    17041704
    1705 Eina_Bool ewk_view_zoom_text_only_set(Evas_Object *o, Eina_Bool setting)
     1705Eina_Bool ewk_view_zoom_text_only_set(Evas_Object* o, Eina_Bool setting)
    17061706{
    17071707    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    17091709}
    17101710
    1711 Eina_Bool ewk_view_pre_render_region(Evas_Object *o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
     1711Eina_Bool ewk_view_pre_render_region(Evas_Object* o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
    17121712{
    17131713    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    17521752}
    17531753
    1754 Eina_Bool ewk_view_pre_render_relative_radius(Evas_Object *o, unsigned int n)
     1754Eina_Bool ewk_view_pre_render_relative_radius(Evas_Object* o, unsigned int n)
    17551755{
    17561756    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    17661766}
    17671767
    1768 unsigned int ewk_view_imh_get(const Evas_Object *o)
     1768unsigned int ewk_view_imh_get(const Evas_Object* o)
    17691769{
    17701770    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    17731773}
    17741774
    1775 void ewk_view_pre_render_cancel(Evas_Object *o)
     1775void ewk_view_pre_render_cancel(Evas_Object* o)
    17761776{
    17771777    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    17801780}
    17811781
    1782 Eina_Bool ewk_view_enable_render(const Evas_Object *o)
     1782Eina_Bool ewk_view_enable_render(const Evas_Object* o)
    17831783{
    17841784    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    17871787}
    17881788
    1789 Eina_Bool ewk_view_disable_render(const Evas_Object *o)
     1789Eina_Bool ewk_view_disable_render(const Evas_Object* o)
    17901790{
    17911791    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    17941794}
    17951795
    1796 const char *ewk_view_setting_user_agent_get(const Evas_Object *o)
     1796const char* ewk_view_setting_user_agent_get(const Evas_Object* o)
    17971797{
    17981798    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    18011801}
    18021802
    1803 Eina_Bool ewk_view_setting_user_agent_set(Evas_Object *o, const char *user_agent)
     1803Eina_Bool ewk_view_setting_user_agent_set(Evas_Object* o, const char* user_agent)
    18041804{
    18051805    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    18121812}
    18131813
    1814 const char *ewk_view_setting_user_stylesheet_get(const Evas_Object *o)
     1814const char* ewk_view_setting_user_stylesheet_get(const Evas_Object* o)
    18151815{
    18161816    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    18191819}
    18201820
    1821 Eina_Bool ewk_view_setting_user_stylesheet_set(Evas_Object *o, const char *uri)
     1821Eina_Bool ewk_view_setting_user_stylesheet_set(Evas_Object* o, const char* uri)
    18221822{
    18231823    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    18301830}
    18311831
    1832 Eina_Bool ewk_view_setting_auto_load_images_get(const Evas_Object *o)
     1832Eina_Bool ewk_view_setting_auto_load_images_get(const Evas_Object* o)
    18331833{
    18341834    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    18371837}
    18381838
    1839 Eina_Bool ewk_view_setting_auto_load_images_set(Evas_Object *o, Eina_Bool automatic)
     1839Eina_Bool ewk_view_setting_auto_load_images_set(Evas_Object* o, Eina_Bool automatic)
    18401840{
    18411841    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    18491849}
    18501850
    1851 Eina_Bool ewk_view_setting_auto_shrink_images_get(const Evas_Object *o)
     1851Eina_Bool ewk_view_setting_auto_shrink_images_get(const Evas_Object* o)
    18521852{
    18531853    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    18561856}
    18571857
    1858 Eina_Bool ewk_view_setting_auto_shrink_images_set(Evas_Object *o, Eina_Bool automatic)
     1858Eina_Bool ewk_view_setting_auto_shrink_images_set(Evas_Object* o, Eina_Bool automatic)
    18591859{
    18601860    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    18681868}
    18691869
    1870 Eina_Bool ewk_view_setting_enable_auto_resize_window_get(const Evas_Object *o)
     1870Eina_Bool ewk_view_setting_enable_auto_resize_window_get(const Evas_Object* o)
    18711871{
    18721872    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    18751875}
    18761876
    1877 Eina_Bool ewk_view_setting_enable_auto_resize_window_set(Evas_Object *o, Eina_Bool resizable)
     1877Eina_Bool ewk_view_setting_enable_auto_resize_window_set(Evas_Object* o, Eina_Bool resizable)
    18781878{
    18791879    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    18831883}
    18841884
    1885 Eina_Bool ewk_view_setting_enable_scripts_get(const Evas_Object *o)
     1885Eina_Bool ewk_view_setting_enable_scripts_get(const Evas_Object* o)
    18861886{
    18871887    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    18901890}
    18911891
    1892 Eina_Bool ewk_view_setting_enable_scripts_set(Evas_Object *o, Eina_Bool enable)
     1892Eina_Bool ewk_view_setting_enable_scripts_set(Evas_Object* o, Eina_Bool enable)
    18931893{
    18941894    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19021902}
    19031903
    1904 Eina_Bool ewk_view_setting_enable_plugins_get(const Evas_Object *o)
     1904Eina_Bool ewk_view_setting_enable_plugins_get(const Evas_Object* o)
    19051905{
    19061906    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19091909}
    19101910
    1911 Eina_Bool ewk_view_setting_enable_plugins_set(Evas_Object *o, Eina_Bool enable)
     1911Eina_Bool ewk_view_setting_enable_plugins_set(Evas_Object* o, Eina_Bool enable)
    19121912{
    19131913    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19211921}
    19221922
    1923 Eina_Bool ewk_view_setting_enable_frame_flattening_get(const Evas_Object *o)
     1923Eina_Bool ewk_view_setting_enable_frame_flattening_get(const Evas_Object* o)
    19241924{
    19251925    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19281928}
    19291929
    1930 Eina_Bool ewk_view_setting_enable_frame_flattening_set(Evas_Object *o, Eina_Bool enable)
     1930Eina_Bool ewk_view_setting_enable_frame_flattening_set(Evas_Object* o, Eina_Bool enable)
    19311931{
    19321932    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19401940}
    19411941
    1942 Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object *o)
     1942Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object* o)
    19431943{
    19441944    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19471947}
    19481948
    1949 Eina_Bool ewk_view_setting_scripts_window_open_set(Evas_Object *o, Eina_Bool allow)
     1949Eina_Bool ewk_view_setting_scripts_window_open_set(Evas_Object* o, Eina_Bool allow)
    19501950{
    19511951    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19591959}
    19601960
    1961 Eina_Bool ewk_view_setting_scripts_can_close_windows_get(const Evas_Object *o)
     1961Eina_Bool ewk_view_setting_scripts_can_close_windows_get(const Evas_Object* o)
    19621962{
    19631963    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19661966}
    19671967
    1968 Eina_Bool ewk_view_setting_scripts_can_close_windows_set(Evas_Object *o, Eina_Bool allow)
     1968Eina_Bool ewk_view_setting_scripts_can_close_windows_set(Evas_Object* o, Eina_Bool allow)
    19691969{
    19701970    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19781978}
    19791979
    1980 Eina_Bool ewk_view_setting_resizable_textareas_get(const Evas_Object *o)
     1980Eina_Bool ewk_view_setting_resizable_textareas_get(const Evas_Object* o)
    19811981{
    19821982    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19851985}
    19861986
    1987 Eina_Bool ewk_view_setting_resizable_textareas_set(Evas_Object *o, Eina_Bool enable)
     1987Eina_Bool ewk_view_setting_resizable_textareas_set(Evas_Object* o, Eina_Bool enable)
    19881988{
    19891989    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    19971997}
    19981998
    1999 Eina_Bool ewk_view_setting_private_browsing_get(const Evas_Object *o)
     1999Eina_Bool ewk_view_setting_private_browsing_get(const Evas_Object* o)
    20002000{
    20012001    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    20042004}
    20052005
    2006 Eina_Bool ewk_view_setting_private_browsing_set(Evas_Object *o, Eina_Bool enable)
     2006Eina_Bool ewk_view_setting_private_browsing_set(Evas_Object* o, Eina_Bool enable)
    20072007{
    20082008    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    20162016}
    20172017
    2018 Eina_Bool ewk_view_setting_offline_app_cache_get(const Evas_Object *o)
     2018Eina_Bool ewk_view_setting_offline_app_cache_get(const Evas_Object* o)
    20192019{
    20202020    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    20232023}
    20242024
    2025 Eina_Bool ewk_view_setting_offline_app_cache_set(Evas_Object *o, Eina_Bool enable)
     2025Eina_Bool ewk_view_setting_offline_app_cache_set(Evas_Object* o, Eina_Bool enable)
    20262026{
    20272027    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    20362036
    20372037
    2038 Eina_Bool ewk_view_setting_caret_browsing_get(const Evas_Object *o)
     2038Eina_Bool ewk_view_setting_caret_browsing_get(const Evas_Object* o)
    20392039{
    20402040    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    20432043}
    20442044
    2045 Eina_Bool ewk_view_setting_caret_browsing_set(Evas_Object *o, Eina_Bool enable)
     2045Eina_Bool ewk_view_setting_caret_browsing_set(Evas_Object* o, Eina_Bool enable)
    20462046{
    20472047    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    20552055}
    20562056
    2057 const char *ewk_view_setting_encoding_custom_get(const Evas_Object *o)
     2057const char* ewk_view_setting_encoding_custom_get(const Evas_Object* o)
    20582058{
    20592059    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    20712071}
    20722072
    2073 Eina_Bool ewk_view_setting_encoding_custom_set(Evas_Object *o, const char *encoding)
     2073Eina_Bool ewk_view_setting_encoding_custom_set(Evas_Object* o, const char* encoding)
    20742074{
    20752075    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    20772077    Evas_Object* main_frame = ewk_view_frame_main_get(o);
    20782078    WebCore::Frame* core_frame = ewk_frame_core_get(main_frame);
    2079 DBG("%s", encoding);
     2079    DBG("%s", encoding);
    20802080    eina_stringshare_replace(&priv->settings.encoding_custom, encoding);
    20812081    core_frame->loader()->reloadWithOverrideEncoding(String::fromUTF8(encoding));
     
    20842084}
    20852085
    2086 const char *ewk_view_setting_encoding_default_get(const Evas_Object *o)
     2086const char* ewk_view_setting_encoding_default_get(const Evas_Object* o)
    20872087{
    20882088    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    20912091}
    20922092
    2093 Eina_Bool ewk_view_setting_encoding_default_set(Evas_Object *o, const char *encoding)
     2093Eina_Bool ewk_view_setting_encoding_default_set(Evas_Object* o, const char* encoding)
    20942094{
    20952095    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    21002100}
    21012101
    2102 Eina_Bool ewk_view_setting_encoding_detector_set(Evas_Object *o, Eina_Bool enable)
     2102Eina_Bool ewk_view_setting_encoding_detector_set(Evas_Object* o, Eina_Bool enable)
    21032103{
    21042104    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    21122112}
    21132113
    2114 Eina_Bool ewk_view_setting_encoding_detector_get(const Evas_Object *o)
     2114Eina_Bool ewk_view_setting_encoding_detector_get(const Evas_Object* o)
    21152115{
    21162116    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    21192119}
    21202120
    2121 Eina_Bool ewk_view_setting_enable_developer_extras_get(const Evas_Object *o)
     2121Eina_Bool ewk_view_setting_enable_developer_extras_get(const Evas_Object* o)
    21222122{
    21232123    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    21262126}
    21272127
    2128 Eina_Bool ewk_view_setting_enable_developer_extras_set(Evas_Object *o, Eina_Bool enable)
     2128Eina_Bool ewk_view_setting_enable_developer_extras_set(Evas_Object* o, Eina_Bool enable)
    21292129{
    21302130    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    21382138}
    21392139
    2140 int ewk_view_setting_font_minimum_size_get(const Evas_Object *o)
     2140int ewk_view_setting_font_minimum_size_get(const Evas_Object* o)
    21412141{
    21422142    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    21452145}
    21462146
    2147 Eina_Bool ewk_view_setting_font_minimum_size_set(Evas_Object *o, int size)
     2147Eina_Bool ewk_view_setting_font_minimum_size_set(Evas_Object* o, int size)
    21482148{
    21492149    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    21562156}
    21572157
    2158 int ewk_view_setting_font_minimum_logical_size_get(const Evas_Object *o)
     2158int ewk_view_setting_font_minimum_logical_size_get(const Evas_Object* o)
    21592159{
    21602160    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    21632163}
    21642164
    2165 Eina_Bool ewk_view_setting_font_minimum_logical_size_set(Evas_Object *o, int size)
     2165Eina_Bool ewk_view_setting_font_minimum_logical_size_set(Evas_Object* o, int size)
    21662166{
    21672167    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    21742174}
    21752175
    2176 int ewk_view_setting_font_default_size_get(const Evas_Object *o)
     2176int ewk_view_setting_font_default_size_get(const Evas_Object* o)
    21772177{
    21782178    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    21812181}
    21822182
    2183 Eina_Bool ewk_view_setting_font_default_size_set(Evas_Object *o, int size)
     2183Eina_Bool ewk_view_setting_font_default_size_set(Evas_Object* o, int size)
    21842184{
    21852185    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    21922192}
    21932193
    2194 int ewk_view_setting_font_monospace_size_get(const Evas_Object *o)
     2194int ewk_view_setting_font_monospace_size_get(const Evas_Object* o)
    21952195{
    21962196    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    21992199}
    22002200
    2201 Eina_Bool ewk_view_setting_font_monospace_size_set(Evas_Object *o, int size)
     2201Eina_Bool ewk_view_setting_font_monospace_size_set(Evas_Object* o, int size)
    22022202{
    22032203    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    22102210}
    22112211
    2212 const char *ewk_view_font_family_name_get(const Evas_Object *o, Ewk_Font_Family font_family)
     2212const char* ewk_view_font_family_name_get(const Evas_Object* o, Ewk_Font_Family font_family)
    22132213{
    22142214    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    22322232}
    22332233
    2234 Eina_Bool ewk_view_font_family_name_set(Evas_Object *o, Ewk_Font_Family font_family, const char *name)
     2234Eina_Bool ewk_view_font_family_name_set(Evas_Object* o, Ewk_Font_Family font_family, const char* name)
    22352235{
    22362236    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    22692269}
    22702270
    2271 Eina_Bool ewk_view_setting_spatial_navigation_get(const Evas_Object *o)
     2271Eina_Bool ewk_view_setting_spatial_navigation_get(const Evas_Object* o)
    22722272{
    22732273    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    22762276}
    22772277
    2278 Eina_Bool ewk_view_setting_spatial_navigation_set(Evas_Object *o, Eina_Bool enable)
     2278Eina_Bool ewk_view_setting_spatial_navigation_set(Evas_Object* o, Eina_Bool enable)
    22792279{
    22802280    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    22882288}
    22892289
    2290 Eina_Bool ewk_view_setting_local_storage_get(const Evas_Object *o)
     2290Eina_Bool ewk_view_setting_local_storage_get(const Evas_Object* o)
    22912291{
    22922292    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    22952295}
    22962296
    2297 Eina_Bool ewk_view_setting_local_storage_set(Evas_Object *o, Eina_Bool enable)
     2297Eina_Bool ewk_view_setting_local_storage_set(Evas_Object* o, Eina_Bool enable)
    22982298{
    22992299    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    23072307}
    23082308
    2309 Eina_Bool ewk_view_setting_page_cache_get(const Evas_Object *o)
     2309Eina_Bool ewk_view_setting_page_cache_get(const Evas_Object* o)
    23102310{
    23112311    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    23142314}
    23152315
    2316 Eina_Bool ewk_view_setting_page_cache_set(Evas_Object *o, Eina_Bool enable)
     2316Eina_Bool ewk_view_setting_page_cache_set(Evas_Object* o, Eina_Bool enable)
    23172317{
    23182318    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    23262326}
    23272327
    2328 const char* ewk_view_setting_local_storage_database_path_get(const Evas_Object *o)
     2328const char* ewk_view_setting_local_storage_database_path_get(const Evas_Object* o)
    23292329{
    23302330    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    23332333}
    23342334
    2335 Eina_Bool ewk_view_setting_local_storage_database_path_set(Evas_Object *o, const char *path)
     2335Eina_Bool ewk_view_setting_local_storage_database_path_set(Evas_Object* o, const char* path)
    23362336{
    23372337    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    23422342}
    23432343
    2344 Eina_Bool ewk_view_setting_minimum_timer_interval_set(Evas_Object *o, double interval)
     2344Eina_Bool ewk_view_setting_minimum_timer_interval_set(Evas_Object* o, double interval)
    23452345{
    23462346    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    23532353}
    23542354
    2355 double ewk_view_setting_minimum_timer_interval_get(const Evas_Object *o)
     2355double ewk_view_setting_minimum_timer_interval_get(const Evas_Object* o)
    23562356{
    23572357    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    23602360}
    23612361
    2362 Ewk_View_Smart_Data *ewk_view_smart_data_get(const Evas_Object *o)
     2362Ewk_View_Smart_Data* ewk_view_smart_data_get(const Evas_Object* o)
    23632363{
    23642364    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    23832383 *       to define their own backing store.
    23842384 */
    2385 const Eina_Rectangle *ewk_view_repaints_get(const Ewk_View_Private_Data *priv, size_t *count)
     2385const Eina_Rectangle* ewk_view_repaints_get(const Ewk_View_Private_Data* priv, size_t* count)
    23862386{
    23872387    EINA_SAFETY_ON_NULL_RETURN_VAL(count, 0);
     
    24112411 *       to define their own backing store.
    24122412 */
    2413 const Ewk_Scroll_Request *ewk_view_scroll_requests_get(const Ewk_View_Private_Data *priv, size_t *count)
     2413const Ewk_Scroll_Request* ewk_view_scroll_requests_get(const Ewk_View_Private_Data* priv, size_t* count)
    24142414{
    24152415    EINA_SAFETY_ON_NULL_RETURN_VAL(count, 0);
     
    24362436 *       to define their own backing store.
    24372437 */
    2438 void ewk_view_repaint_add(Ewk_View_Private_Data *priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
     2438void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
    24392439{
    24402440    EINA_SAFETY_ON_NULL_RETURN(priv);
     
    24502450 *       to define their own backing store.
    24512451 */
    2452 void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data *priv)
     2452void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data* priv)
    24532453{
    24542454    EINA_SAFETY_ON_NULL_RETURN(priv);
    24552455
    2456     WebCore::FrameView *v = priv->main_frame->view();
     2456    WebCore::FrameView* v = priv->main_frame->view();
    24572457    if (!v) {
    24582458        ERR("no main frame view");
     
    24622462}
    24632463
    2464 void ewk_view_scrolls_process(Ewk_View_Smart_Data *sd)
     2464void ewk_view_scrolls_process(Ewk_View_Smart_Data* sd)
    24652465{
    24662466    EINA_SAFETY_ON_NULL_RETURN(sd);
     
    24802480 */
    24812481struct _Ewk_View_Paint_Context {
    2482     WebCore::GraphicsContext *gc;
    2483     WebCore::FrameView *view;
    2484     cairo_t *cr;
     2482    WebCore::GraphicsContext* gc;
     2483    WebCore::FrameView* view;
     2484    cairo_t* cr;
    24852485};
    24862486
    2487 Ewk_View_Paint_Context *ewk_view_paint_context_new(Ewk_View_Private_Data *priv, cairo_t *cr)
     2487Ewk_View_Paint_Context* ewk_view_paint_context_new(Ewk_View_Private_Data* priv, cairo_t* cr)
    24882488{
    24892489    EINA_SAFETY_ON_NULL_RETURN_VAL(priv, 0);
    24902490    EINA_SAFETY_ON_NULL_RETURN_VAL(cr, 0);
    24912491    EINA_SAFETY_ON_NULL_RETURN_VAL(priv->main_frame, 0);
    2492     WebCore::FrameView *view = priv->main_frame->view();
     2492    WebCore::FrameView* view = priv->main_frame->view();
    24932493    EINA_SAFETY_ON_NULL_RETURN_VAL(view, 0);
    2494     Ewk_View_Paint_Context *ctxt = (Ewk_View_Paint_Context *)malloc(sizeof(*ctxt));
     2494    Ewk_View_Paint_Context* ctxt = (Ewk_View_Paint_Context*)malloc(sizeof(*ctxt));
    24952495    EINA_SAFETY_ON_NULL_RETURN_VAL(ctxt, 0);
    24962496
     
    25052505}
    25062506
    2507 void ewk_view_paint_context_free(Ewk_View_Paint_Context *ctxt)
     2507void ewk_view_paint_context_free(Ewk_View_Paint_Context* ctxt)
    25082508{
    25092509    EINA_SAFETY_ON_NULL_RETURN(ctxt);
     
    25132513}
    25142514
    2515 void ewk_view_paint_context_save(Ewk_View_Paint_Context *ctxt)
     2515void ewk_view_paint_context_save(Ewk_View_Paint_Context* ctxt)
    25162516{
    25172517    EINA_SAFETY_ON_NULL_RETURN(ctxt);
     
    25202520}
    25212521
    2522 void ewk_view_paint_context_restore(Ewk_View_Paint_Context *ctxt)
     2522void ewk_view_paint_context_restore(Ewk_View_Paint_Context* ctxt)
    25232523{
    25242524    EINA_SAFETY_ON_NULL_RETURN(ctxt);
     
    25272527}
    25282528
    2529 void ewk_view_paint_context_clip(Ewk_View_Paint_Context *ctxt, const Eina_Rectangle *area)
     2529void ewk_view_paint_context_clip(Ewk_View_Paint_Context* ctxt, const Eina_Rectangle* area)
    25302530{
    25312531    EINA_SAFETY_ON_NULL_RETURN(ctxt);
     
    25342534}
    25352535
    2536 void ewk_view_paint_context_paint(Ewk_View_Paint_Context *ctxt, const Eina_Rectangle *area)
     2536void ewk_view_paint_context_paint(Ewk_View_Paint_Context* ctxt, const Eina_Rectangle* area)
    25372537{
    25382538    EINA_SAFETY_ON_NULL_RETURN(ctxt);
     
    25462546}
    25472547
    2548 void ewk_view_paint_context_paint_contents(Ewk_View_Paint_Context *ctxt, const Eina_Rectangle *area)
     2548void ewk_view_paint_context_paint_contents(Ewk_View_Paint_Context* ctxt, const Eina_Rectangle* area)
    25492549{
    25502550    EINA_SAFETY_ON_NULL_RETURN(ctxt);
     
    25592559}
    25602560
    2561 void ewk_view_paint_context_scale(Ewk_View_Paint_Context *ctxt, float scale_x, float scale_y)
     2561void ewk_view_paint_context_scale(Ewk_View_Paint_Context* ctxt, float scale_x, float scale_y)
    25622562{
    25632563    EINA_SAFETY_ON_NULL_RETURN(ctxt);
     
    25662566}
    25672567
    2568 void ewk_view_paint_context_translate(Ewk_View_Paint_Context *ctxt, float x, float y)
     2568void ewk_view_paint_context_translate(Ewk_View_Paint_Context* ctxt, float x, float y)
    25692569{
    25702570    EINA_SAFETY_ON_NULL_RETURN(ctxt);
     
    25732573}
    25742574
    2575 Eina_Bool ewk_view_paint(Ewk_View_Private_Data *priv, cairo_t *cr, const Eina_Rectangle *area)
     2575Eina_Bool ewk_view_paint(Ewk_View_Private_Data* priv, cairo_t* cr, const Eina_Rectangle* area)
    25762576{
    25772577    EINA_SAFETY_ON_NULL_RETURN_VAL(priv, EINA_FALSE);
     
    25982598}
    25992599
    2600 Eina_Bool ewk_view_paint_contents(Ewk_View_Private_Data *priv, cairo_t *cr, const Eina_Rectangle *area)
     2600Eina_Bool ewk_view_paint_contents(Ewk_View_Private_Data* priv, cairo_t* cr, const Eina_Rectangle* area)
    26012601{
    26022602    EINA_SAFETY_ON_NULL_RETURN_VAL(priv, EINA_FALSE);
     
    26292629 * Emits signal: "ready" with no parameters.
    26302630 */
    2631 void ewk_view_ready(Evas_Object *o)
     2631void ewk_view_ready(Evas_Object* o)
    26322632{
    26332633    DBG("o=%p", o);
     
    26432643 * enabled or not.
    26442644 */
    2645 void ewk_view_input_method_state_set(Evas_Object *o, Eina_Bool active)
     2645void ewk_view_input_method_state_set(Evas_Object* o, Eina_Bool active)
    26462646{
    26472647    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    26722672    }
    26732673
    2674     evas_object_smart_callback_call(o, "inputmethod,changed", (void *)active);
     2674    evas_object_smart_callback_call(o, "inputmethod,changed", (void*)active);
    26752675}
    26762676
     
    26812681 * Emits signal: "title,changed" with pointer to new title string.
    26822682 */
    2683 void ewk_view_title_set(Evas_Object *o, const char *title)
     2683void ewk_view_title_set(Evas_Object* o, const char* title)
    26842684{
    26852685    DBG("o=%p, title=%s", o, title ? title : "(null)");
    2686     evas_object_smart_callback_call(o, "title,changed", (void *)title);
     2686    evas_object_smart_callback_call(o, "title,changed", (void*)title);
    26872687}
    26882688
     
    26932693 * Emits signal: "uri,changed" with pointer to the new uri string.
    26942694 */
    2695 void ewk_view_uri_changed(Evas_Object *o)
     2695void ewk_view_uri_changed(Evas_Object* o)
    26962696{
    26972697    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
    2698     const char *uri = ewk_frame_uri_get(sd->main_frame);
     2698    const char* uri = ewk_frame_uri_get(sd->main_frame);
    26992699    DBG("o=%p, uri=%s", o, uri ? uri : "(null)");
    2700     evas_object_smart_callback_call(o, "uri,changed", (void *)uri);
     2700    evas_object_smart_callback_call(o, "uri,changed", (void*)uri);
    27012701}
    27022702
     
    27092709 * Emits signal: "load,started" with no parameters.
    27102710 */
    2711 void ewk_view_load_started(Evas_Object *o)
     2711void ewk_view_load_started(Evas_Object* o)
    27122712{
    27132713    DBG("o=%p", o);
     
    27222722 * Emits signal: "load,started" on main frame with no parameters.
    27232723 */
    2724 void ewk_view_frame_main_load_started(Evas_Object *o)
     2724void ewk_view_frame_main_load_started(Evas_Object* o)
    27252725{
    27262726    DBG("o=%p", o);
    2727     Evas_Object *frame = ewk_view_frame_main_get(o);
     2727    Evas_Object* frame = ewk_view_frame_main_get(o);
    27282728    evas_object_smart_callback_call(frame, "load,started", 0);
    27292729}
     
    27372737 * Emits signal: "load,provisional" on View with no parameters.
    27382738 */
    2739 void ewk_view_load_provisional(Evas_Object *o)
     2739void ewk_view_load_provisional(Evas_Object* o)
    27402740{
    27412741    DBG("o=%p", o);
     
    27512751 * Emits signal: "load,newwindow,show" on view with no parameters.
    27522752 */
    2753 void ewk_view_load_show(Evas_Object *o)
     2753void ewk_view_load_show(Evas_Object* o)
    27542754{
    27552755    DBG("o=%p", o);
     
    27642764 * @param o View.
    27652765 */
    2766 void ewk_view_frame_main_cleared(Evas_Object *o)
     2766void ewk_view_frame_main_cleared(Evas_Object* o)
    27672767{
    27682768    DBG("o=%p", o);
     
    27802780 * Emits signal: "icon,received" with no parameters.
    27812781 */
    2782 void ewk_view_frame_main_icon_received(Evas_Object *o)
     2782void ewk_view_frame_main_icon_received(Evas_Object* o)
    27832783{
    27842784    DBG("o=%p", o);
    2785     Evas_Object *frame = ewk_view_frame_main_get(o);
     2785    Evas_Object* frame = ewk_view_frame_main_get(o);
    27862786    evas_object_smart_callback_call(frame, "icon,received", 0);
    27872787}
     
    27972797 *       compatible with previous WebKit.
    27982798 */
    2799 void ewk_view_load_finished(Evas_Object *o, const Ewk_Frame_Load_Error *error)
     2799void ewk_view_load_finished(Evas_Object* o, const Ewk_Frame_Load_Error* error)
    28002800{
    28012801    DBG("o=%p, error=%p", o, error);
    2802     evas_object_smart_callback_call(o, "load,finished", (void *)error);
     2802    evas_object_smart_callback_call(o, "load,finished", (void*)error);
    28032803}
    28042804
     
    28092809 * Emits signal: "load,error" with pointer to Ewk_Frame_Load_Error.
    28102810 */
    2811 void ewk_view_load_error(Evas_Object *o, const Ewk_Frame_Load_Error *error)
     2811void ewk_view_load_error(Evas_Object* o, const Ewk_Frame_Load_Error* error)
    28122812{
    28132813    DBG("o=%p, error=%p", o, error);
    2814     evas_object_smart_callback_call(o, "load,error", (void *)error);
     2814    evas_object_smart_callback_call(o, "load,error", (void*)error);
    28152815}
    28162816
     
    28212821 * Emits signal: "load,progress" with pointer to a double from 0.0 to 1.0.
    28222822 */
    2823 void ewk_view_load_progress_changed(Evas_Object *o)
     2823void ewk_view_load_progress_changed(Evas_Object* o)
    28242824{
    28252825    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    28432843 * Emits signal: "restore" with frame.
    28442844 */
    2845 void ewk_view_restore_state(Evas_Object *o, Evas_Object *frame)
     2845void ewk_view_restore_state(Evas_Object* o, Evas_Object* frame)
    28462846{
    28472847    evas_object_smart_callback_call(o, "restore", frame);
     
    28692869 * @see ewk_window_features_ref().
    28702870 */
    2871 Evas_Object *ewk_view_window_create(Evas_Object *o, Eina_Bool javascript, const WebCore::WindowFeatures *coreFeatures)
     2871Evas_Object* ewk_view_window_create(Evas_Object* o, Eina_Bool javascript, const WebCore::WindowFeatures* coreFeatures)
    28722872{
    28732873    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    28762876        return o;
    28772877
    2878     Ewk_Window_Features *window_features = ewk_window_features_new_from_core(coreFeatures);
     2878    Ewk_Window_Features* window_features = ewk_window_features_new_from_core(coreFeatures);
    28792879    if (!window_features)
    28802880        return 0;
     
    28972897 * @param o View to be closed.
    28982898 */
    2899 void ewk_view_window_close(Evas_Object *o)
     2899void ewk_view_window_close(Evas_Object* o)
    29002900{
    29012901    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    29132913 * Emits signal: "link,hover,in"
    29142914 */
    2915 void ewk_view_mouse_link_hover_in(Evas_Object *o, void *data)
     2915void ewk_view_mouse_link_hover_in(Evas_Object* o, void* data)
    29162916{
    29172917    evas_object_smart_callback_call(o, "link,hover,in", data);
     
    29242924 * Emits signal: "link,hover,out"
    29252925 */
    2926 void ewk_view_mouse_link_hover_out(Evas_Object *o)
     2926void ewk_view_mouse_link_hover_out(Evas_Object* o)
    29272927{
    29282928    evas_object_smart_callback_call(o, "link,hover,out", 0);
     
    29352935 * Emits signal: "toolbars,visible,set" with a pointer to a boolean.
    29362936 */
    2937 void ewk_view_toolbars_visible_set(Evas_Object *o, Eina_Bool visible)
     2937void ewk_view_toolbars_visible_set(Evas_Object* o, Eina_Bool visible)
    29382938{
    29392939    DBG("o=%p (visible=%d)", o, !!visible);
     
    29522952 * Emits signal: "toolbars,visible,get" with a pointer to a boolean.
    29532953 */
    2954 void ewk_view_toolbars_visible_get(Evas_Object *o, Eina_Bool *visible)
     2954void ewk_view_toolbars_visible_get(Evas_Object* o, Eina_Bool* visible)
    29552955{
    29562956    DBG("%s, o=%p", __func__, o);
     
    29682968 * Emits signal: "statusbar,visible,set" with a pointer to a boolean.
    29692969 */
    2970 void ewk_view_statusbar_visible_set(Evas_Object *o, Eina_Bool visible)
     2970void ewk_view_statusbar_visible_set(Evas_Object* o, Eina_Bool visible)
    29712971{
    29722972    DBG("o=%p (visible=%d)", o, !!visible);
     
    29852985 * Emits signal: "statusbar,visible,get" with a pointer to a boolean.
    29862986 */
    2987 void ewk_view_statusbar_visible_get(Evas_Object *o, Eina_Bool *visible)
     2987void ewk_view_statusbar_visible_get(Evas_Object* o, Eina_Bool* visible)
    29882988{
    29892989    DBG("%s, o=%p", __func__, o);
     
    30013001 * Emits signal: "statusbar,text,set" with a string.
    30023002 */
    3003 void ewk_view_statusbar_text_set(Evas_Object *o, const char *text)
     3003void ewk_view_statusbar_text_set(Evas_Object* o, const char* text)
    30043004{
    30053005    DBG("o=%p (text=%s)", o, text);
    30063006    INF("status bar text set: %s", text);
    3007     evas_object_smart_callback_call(o, "statusbar,text,set", (void *)text);
     3007    evas_object_smart_callback_call(o, "statusbar,text,set", (void*)text);
    30083008}
    30093009
     
    30173017 * Emits signal: "scrollbars,visible,set" with a pointer to a boolean.
    30183018 */
    3019 void ewk_view_scrollbars_visible_set(Evas_Object *o, Eina_Bool visible)
     3019void ewk_view_scrollbars_visible_set(Evas_Object* o, Eina_Bool visible)
    30203020{
    30213021    DBG("o=%p (visible=%d)", o, !!visible);
     
    30343034 * Emits signal: "scrollbars,visible,get" with a pointer to a boolean.
    30353035 */
    3036 void ewk_view_scrollbars_visible_get(Evas_Object *o, Eina_Bool *visible)
     3036void ewk_view_scrollbars_visible_get(Evas_Object* o, Eina_Bool* visible)
    30373037{
    30383038    DBG("%s, o=%p", __func__, o);
     
    30503050 * Emits signal: "menubar,visible,set" with a pointer to a boolean.
    30513051 */
    3052 void ewk_view_menubar_visible_set(Evas_Object *o, Eina_Bool visible)
     3052void ewk_view_menubar_visible_set(Evas_Object* o, Eina_Bool visible)
    30533053{
    30543054    DBG("o=%p (visible=%d)", o, !!visible);
     
    30673067 * Emits signal: "menubar,visible,get" with a pointer to a boolean.
    30683068 */
    3069 void ewk_view_menubar_visible_get(Evas_Object *o, Eina_Bool *visible)
     3069void ewk_view_menubar_visible_get(Evas_Object* o, Eina_Bool* visible)
    30703070{
    30713071    DBG("%s, o=%p", __func__, o);
     
    30843084 * removed, text will be 0 or '\0'
    30853085 */
    3086 void ewk_view_tooltip_text_set(Evas_Object *o, const char *text)
     3086void ewk_view_tooltip_text_set(Evas_Object* o, const char* text)
    30873087{
    30883088    DBG("o=%p text=%s", o, text);
    3089     evas_object_smart_callback_call(o, "tooltip,text,set", (void *)text);
     3089    evas_object_smart_callback_call(o, "tooltip,text,set", (void*)text);
    30903090}
    30913091
     
    30993099 *
    31003100 */
    3101 void ewk_view_add_console_message(Evas_Object *o, const char *message, unsigned int lineNumber, const char *sourceID)
     3101void ewk_view_add_console_message(Evas_Object* o, const char* message, unsigned int lineNumber, const char* sourceID)
    31023102{
    31033103    DBG("o=%p message=%s lineNumber=%u sourceID=%s", o, message, lineNumber, sourceID);
     
    31083108}
    31093109
    3110 void ewk_view_run_javascript_alert(Evas_Object *o, Evas_Object *frame, const char *message)
     3110void ewk_view_run_javascript_alert(Evas_Object* o, Evas_Object* frame, const char* message)
    31113111{
    31123112    DBG("o=%p frame=%p message=%s", o, frame, message);
     
    31203120}
    31213121
    3122 Eina_Bool ewk_view_run_javascript_confirm(Evas_Object *o, Evas_Object *frame, const char *message)
     3122Eina_Bool ewk_view_run_javascript_confirm(Evas_Object* o, Evas_Object* frame, const char* message)
    31233123{
    31243124    DBG("o=%p frame=%p message=%s", o, frame, message);
     
    31323132}
    31333133
    3134 Eina_Bool ewk_view_run_javascript_prompt(Evas_Object *o, Evas_Object *frame, const char *message, const char *defaultValue, char **value)
     3134Eina_Bool ewk_view_run_javascript_prompt(Evas_Object* o, Evas_Object* frame, const char* message, const char* defaultValue, char** value)
    31353135{
    31363136    DBG("o=%p frame=%p message=%s", o, frame, message);
     
    31553155 * @return @c EINA_TRUE if script should be stopped; @c EINA_FALSE otherwise
    31563156 */
    3157 Eina_Bool ewk_view_should_interrupt_javascript(Evas_Object *o)
     3157Eina_Bool ewk_view_should_interrupt_javascript(Evas_Object* o)
    31583158{
    31593159    DBG("o=%p", o);
     
    31813181 * site's requirement.
    31823182 */
    3183 uint64_t ewk_view_exceeded_database_quota(Evas_Object *o, Evas_Object *frame, const char *databaseName, uint64_t current_size, uint64_t expected_size)
     3183uint64_t ewk_view_exceeded_database_quota(Evas_Object* o, Evas_Object* frame, const char* databaseName, uint64_t current_size, uint64_t expected_size)
    31843184{
    31853185    DBG("o=%p", o);
     
    31893189        return 0;
    31903190
    3191     INF("current_size=%"PRIu64" expected_size=%"PRIu64, current_size, expected_size);
     3191    INF("current_size=%" PRIu64 " expected_size=%" PRIu64, current_size, expected_size);
    31923192    return sd->api->exceeded_database_quota(sd, frame, databaseName, current_size, expected_size);
    31933193}
     
    32063206 * @return @EINA_FALSE if user canceled file selection; @EINA_TRUE if confirmed.
    32073207 */
    3208 Eina_Bool ewk_view_run_open_panel(Evas_Object *o, Evas_Object *frame, Eina_Bool allows_multiple_files, const char *accept_types, Eina_List **selected_filenames)
     3208Eina_Bool ewk_view_run_open_panel(Evas_Object* o, Evas_Object* frame, Eina_Bool allows_multiple_files, const char* accept_types, Eina_List** selected_filenames)
    32093209{
    32103210    DBG("o=%p frame=%p allows_multiple_files=%d", o, frame, allows_multiple_files);
     
    32243224}
    32253225
    3226 void ewk_view_repaint(Evas_Object *o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
     3226void ewk_view_repaint(Evas_Object* o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
    32273227{
    32283228    DBG("o=%p, region=%d,%d + %dx%d", o, x, y, w, h);
     
    32393239}
    32403240
    3241 void ewk_view_scroll(Evas_Object *o, Evas_Coord dx, Evas_Coord dy, Evas_Coord sx, Evas_Coord sy, Evas_Coord sw, Evas_Coord sh, Evas_Coord cx, Evas_Coord cy, Evas_Coord cw, Evas_Coord ch, Eina_Bool main_frame)
     3241void ewk_view_scroll(Evas_Object* o, Evas_Coord dx, Evas_Coord dy, Evas_Coord sx, Evas_Coord sy, Evas_Coord sw, Evas_Coord sh, Evas_Coord cx, Evas_Coord cy, Evas_Coord cw, Evas_Coord ch, Eina_Bool main_frame)
    32423242{
    32433243    DBG("o=%p, delta: %d,%d, scroll: %d,%d+%dx%d, clip: %d,%d+%dx%d",
     
    32573257}
    32583258
    3259 WebCore::Page* ewk_view_core_page_get(const Evas_Object *o)
     3259WebCore::Page* ewk_view_core_page_get(const Evas_Object* o)
    32603260{
    32613261    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     
    32693269 * Emits "frame,created" with the new frame object on success.
    32703270 */
    3271 WTF::PassRefPtr<WebCore::Frame> ewk_view_frame_create(Evas_Object *o, Evas_Object *frame, const WTF::String &name, WebCore::HTMLFrameOwnerElement *ownerElement, const WebCore::KURL &url, const WTF::String &referrer)
     3271WTF::PassRefPtr<WebCore::Frame> ewk_view_frame_create(Evas_Object* o, Evas_Object* frame, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, const WebCore::KURL& url, const WTF::String& referrer)
    32723272{
    32733273    DBG("o=%p, frame=%p, name=%s, ownerElement=%p, url=%s, referrer=%s",
     
    32793279
    32803280    WTF::RefPtr<WebCore::Frame> cf = _ewk_view_core_frame_new
    3281         (sd, priv, ownerElement);
     3281                                         (sd, priv, ownerElement);
    32823282    if (!cf) {
    32833283        ERR("Could not create child core frame '%s'", name.utf8().data());
     
    33013301}
    33023302
    3303 WTF::PassRefPtr<WebCore::Widget> ewk_view_plugin_create(Evas_Object *o, Evas_Object *frame, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement *element, const WebCore::KURL &url, const WTF::Vector<WTF::String> &paramNames, const WTF::Vector<WTF::String> &paramValues, const WTF::String &mimeType, bool loadManually)
     3303WTF::PassRefPtr<WebCore::Widget> ewk_view_plugin_create(Evas_Object* o, Evas_Object* frame, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually)
    33043304{
    33053305    DBG("o=%p, frame=%p, size=%dx%d, element=%p, url=%s, mimeType=%s",
     
    33123312
    33133313    return ewk_frame_plugin_create
    3314         (frame, pluginSize, element, url, paramNames, paramValues,
    3315          mimeType, loadManually);
     3314               (frame, pluginSize, element, url, paramNames, paramValues,
     3315               mimeType, loadManually);
    33163316}
    33173317
     
    33273327 * Emits: "popup,create" with a list of Ewk_Menu containing each item's data
    33283328 */
    3329 void ewk_view_popup_new(Evas_Object *o, WebCore::PopupMenuClient *client, int selected, const WebCore::IntRect &rect)
     3329void ewk_view_popup_new(Evas_Object* o, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect)
    33303330{
    33313331    INF("o=%p", o);
     
    33413341    const int size = client->listSize();
    33423342    for (int i = 0; i < size; ++i) {
    3343         Ewk_Menu_Item *item = (Ewk_Menu_Item *) malloc(sizeof(*item));
     3343        Ewk_Menu_Item* item = (Ewk_Menu_Item*) malloc(sizeof(*item));
    33443344        if (client->itemIsSeparator(i))
    33453345            item->type = EWK_MENU_SEPARATOR;
     
    33603360}
    33613361
    3362 Eina_Bool ewk_view_popup_destroy(Evas_Object *o)
     3362Eina_Bool ewk_view_popup_destroy(Evas_Object* o)
    33633363{
    33643364    INF("o=%p", o);
     
    33733373    void* itemv;
    33743374    EINA_LIST_FREE(priv->popup.menu.items, itemv) {
    3375         Ewk_Menu_Item* item = (Ewk_Menu_Item *)itemv;
     3375        Ewk_Menu_Item* item = (Ewk_Menu_Item*)itemv;
    33763376        eina_stringshare_del(item->text);
    33773377        free(item);
     
    33833383}
    33843384
    3385 void ewk_view_popup_selected_set(Evas_Object *o, int index)
     3385void ewk_view_popup_selected_set(Evas_Object* o, int index)
    33863386{
    33873387    INF("o=%p", o);
     
    34033403 * requested download. The download per se must be handled outside of webkit.
    34043404 */
    3405 void ewk_view_download_request(Evas_Object *o, Ewk_Download *download)
     3405void ewk_view_download_request(Evas_Object* o, Ewk_Download* download)
    34063406{
    34073407    DBG("view=%p", o);
     
    34163416 * @param frame the frame.
    34173417 */
    3418 void ewk_view_js_window_object_clear(Evas_Object *o, Evas_Object *frame)
     3418void ewk_view_js_window_object_clear(Evas_Object* o, Evas_Object* frame)
    34193419{
    34203420    evas_object_smart_callback_call(o, "js,windowobject,clear", frame);
     
    34293429 * Emits signal: "viewport,changed" with no parameters.
    34303430 */
    3431 void ewk_view_viewport_attributes_set(Evas_Object *o, const WebCore::ViewportArguments &arguments)
     3431void ewk_view_viewport_attributes_set(Evas_Object* o, const WebCore::ViewportArguments& arguments)
    34323432{
    34333433    EWK_VIEW_SD_GET(o, sd);
    34343434    EWK_VIEW_PRIV_GET(sd, priv);
    3435    
     3435
    34363436    priv->viewport_arguments = arguments;
    34373437    evas_object_smart_callback_call(o, "viewport,changed", 0);
    34383438}
    34393439
    3440 void ewk_view_viewport_attributes_get(const Evas_Object *o, float *w, float *h, float *init_scale, float *max_scale, float *min_scale, float *device_pixel_ratio, Eina_Bool *user_scalable)
     3440void ewk_view_viewport_attributes_get(const Evas_Object* o, float* w, float* h, float* init_scale, float* max_scale, float* min_scale, float* device_pixel_ratio, Eina_Bool* user_scalable)
    34413441{
    34423442    WebCore::ViewportAttributes attributes = _ewk_view_viewport_attributes_compute(o);
     
    34583458}
    34593459
    3460 Eina_Bool ewk_view_zoom_range_set(Evas_Object *o, float min_scale, float max_scale)
     3460Eina_Bool ewk_view_zoom_range_set(Evas_Object* o, float min_scale, float max_scale)
    34613461{
    34623462    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    34743474}
    34753475
    3476 float ewk_view_zoom_range_min_get(const Evas_Object *o)
     3476float ewk_view_zoom_range_min_get(const Evas_Object* o)
    34773477{
    34783478    EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
     
    34823482}
    34833483
    3484 float ewk_view_zoom_range_max_get(const Evas_Object *o)
     3484float ewk_view_zoom_range_max_get(const Evas_Object* o)
    34853485{
    34863486    EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
     
    34903490}
    34913491
    3492 Eina_Bool ewk_view_user_scalable_set(Evas_Object *o, Eina_Bool user_scalable)
     3492Eina_Bool ewk_view_user_scalable_set(Evas_Object* o, Eina_Bool user_scalable)
    34933493{
    34943494    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    35003500}
    35013501
    3502 Eina_Bool ewk_view_user_scalable_get(const Evas_Object *o)
     3502Eina_Bool ewk_view_user_scalable_get(const Evas_Object* o)
    35033503{
    35043504    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    35083508}
    35093509
    3510 float ewk_view_device_pixel_ratio_get(const Evas_Object *o)
     3510float ewk_view_device_pixel_ratio_get(const Evas_Object* o)
    35113511{
    35123512    EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
     
    35163516}
    35173517
    3518 void ewk_view_did_first_visually_nonempty_layout(Evas_Object *o)
     3518void ewk_view_did_first_visually_nonempty_layout(Evas_Object* o)
    35193519{
    35203520    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    35333533 * @param o view.
    35343534 */
    3535 void ewk_view_dispatch_did_finish_loading(Evas_Object *o)
     3535void ewk_view_dispatch_did_finish_loading(Evas_Object* o)
    35363536{
    35373537    /* If we reach this point and rendering is still disabled, WebCore will not
     
    35423542}
    35433543
    3544 void ewk_view_transition_to_commited_for_newpage(Evas_Object *o)
     3544void ewk_view_transition_to_commited_for_newpage(Evas_Object* o)
    35453545{
    35463546    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    35613561 * @param request Request which contain url to navigate
    35623562 */
    3563 Eina_Bool ewk_view_navigation_policy_decision(Evas_Object *o, Ewk_Frame_Resource_Request *request)
     3563Eina_Bool ewk_view_navigation_policy_decision(Evas_Object* o, Ewk_Frame_Resource_Request* request)
    35643564{
    35653565    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_TRUE);
     
    35723572}
    35733573
    3574 Eina_Bool ewk_view_js_object_add(Evas_Object *o, Ewk_JS_Object *obj, const char *obj_name)
     3574Eina_Bool ewk_view_js_object_add(Evas_Object* o, Ewk_JS_Object* obj, const char* obj_name)
    35753575{
    35763576#if ENABLE(NETSCAPE_PLUGIN_API)
     
    35823582
    35833583    JSC::JSLock lock(JSC::SilenceAssertionsOnly);
    3584     WebCore::JSDOMWindow *window = toJSDOMWindow(priv->main_frame, WebCore::mainThreadNormalWorld());
    3585     JSC::Bindings::RootObject *root;
     3584    WebCore::JSDOMWindow* window = toJSDOMWindow(priv->main_frame, WebCore::mainThreadNormalWorld());
     3585    JSC::Bindings::RootObject* root;
    35863586    root = priv->main_frame->script()->bindingRootObject();
    35873587
     
    35943594
    35953595    obj->view = o;
    3596     JSC::JSObject *runtimeObject = (JSC::JSObject*)JSC::Bindings::CInstance::create((NPObject*)obj, root)->createRuntimeObject(exec);
     3596    JSC::JSObject* runtimeObject = (JSC::JSObject*)JSC::Bindings::CInstance::create((NPObject*)obj, root)->createRuntimeObject(exec);
    35973597    JSC::Identifier id = JSC::Identifier(exec, obj_name);
    35983598
     
    36543654 * @param h new content height.
    36553655 */
    3656 void ewk_view_contents_size_changed(Evas_Object *o, int w, int h)
     3656void ewk_view_contents_size_changed(Evas_Object* o, int w, int h)
    36573657{
    36583658    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
     
    36663666/**
    36673667 * @internal
    3668  * Gets page size from frameview. 
     3668 * Gets page size from frameview.
    36693669 *
    36703670 * @param o view.
     
    36723672 * @return page size.
    36733673 */
    3674 WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object *o)
     3674WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* o)
    36753675{
    36763676    EWK_VIEW_SD_GET(o, sd);
     
    36823682
    36833683#if ENABLE(TOUCH_EVENTS)
    3684 void ewk_view_need_touch_events_set(Evas_Object *o, bool needed)
     3684void ewk_view_need_touch_events_set(Evas_Object* o, bool needed)
    36853685{
    36863686    EWK_VIEW_SD_GET(o, sd);
     
    36903690}
    36913691
    3692 Eina_Bool ewk_view_need_touch_events_get(const Evas_Object *o)
     3692Eina_Bool ewk_view_need_touch_events_get(const Evas_Object* o)
    36933693{
    36943694    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    36983698#endif
    36993699
    3700 Eina_Bool ewk_view_mode_set(Evas_Object *o, Ewk_View_Mode view_mode)
     3700Eina_Bool ewk_view_mode_set(Evas_Object* o, Ewk_View_Mode view_mode)
    37013701{
    37023702    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     
    37263726}
    37273727
    3728 Ewk_View_Mode ewk_view_mode_get(const Evas_Object *o)
     3728Ewk_View_Mode ewk_view_mode_get(const Evas_Object* o)
    37293729{
    37303730    Ewk_View_Mode mode = EWK_VIEW_MODE_WINDOWED;
     
    37653765 * Emits signal: "editorclientselection,changed" with no parameters.
    37663766 */
    3767 void ewk_view_editor_client_selection_changed(Evas_Object *o)
     3767void ewk_view_editor_client_selection_changed(Evas_Object* o)
    37683768{
    37693769    evas_object_smart_callback_call(o, "editorclient,selection,changed", 0);
     
    37783778 * Emits signal: "editorclient,contents,changed" with no parameters.
    37793779 */
    3780 void ewk_view_editor_client_contents_changed(Evas_Object *o)
     3780void ewk_view_editor_client_contents_changed(Evas_Object* o)
    37813781{
    37823782    evas_object_smart_callback_call(o, "editorclient,contents,changed", 0);
  • trunk/Source/WebKit/efl/ewk/ewk_view_single.cpp

    r94509 r95659  
    3232static Ewk_View_Smart_Class _parent_sc = EWK_VIEW_SMART_CLASS_INIT_NULL;
    3333
    34 static void _ewk_view_single_on_del(void *data, Evas *e, Evas_Object *o, void *event_info)
    35 {
    36     Evas_Object *clip = (Evas_Object*)data;
     34static void _ewk_view_single_on_del(void* data, Evas* e, Evas_Object* o, void* event_info)
     35{
     36    Evas_Object* clip = (Evas_Object*)data;
    3737    evas_object_del(clip);
    3838}
    3939
    40 static void _ewk_view_single_smart_add(Evas_Object *o)
    41 {
    42     Ewk_View_Smart_Data *sd;
     40static void _ewk_view_single_smart_add(Evas_Object* o)
     41{
     42    Ewk_View_Smart_Data* sd;
    4343
    4444    _parent_sc.sc.add(o);
    4545
    46     sd = (Ewk_View_Smart_Data *)evas_object_smart_data_get(o);
     46    sd = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o);
    4747    if (!sd)
    4848        return;
    4949
    50     Evas_Object *clip = evas_object_rectangle_add(sd->base.evas);
     50    Evas_Object* clip = evas_object_rectangle_add(sd->base.evas);
    5151    evas_object_clip_set(sd->backing_store, clip);
    5252    evas_object_smart_member_add(clip, o);
     
    5757}
    5858
    59 static Evas_Object *_ewk_view_single_smart_backing_store_add(Ewk_View_Smart_Data *sd)
    60 {
    61     Evas_Object *bs = evas_object_image_add(sd->base.evas);
     59static Evas_Object* _ewk_view_single_smart_backing_store_add(Ewk_View_Smart_Data* sd)
     60{
     61    Evas_Object* bs = evas_object_image_add(sd->base.evas);
    6262    evas_object_image_alpha_set(bs, EINA_FALSE);
    6363    evas_object_image_smooth_scale_set(bs, sd->zoom_weak_smooth_scale);
     
    6666}
    6767
    68 static void _ewk_view_single_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)
    69 {
    70     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o);
     68static void _ewk_view_single_smart_resize(Evas_Object* o, Evas_Coord w, Evas_Coord h)
     69{
     70    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o);
    7171    _parent_sc.sc.resize(o, w, h);
    7272
     
    7777    evas_object_image_size_set(sd->backing_store, w, h);
    7878    if (sd->animated_zoom.zoom.current < 0.00001) {
    79         Evas_Object *clip = evas_object_clip_get(sd->backing_store);
     79        Evas_Object* clip = evas_object_clip_get(sd->backing_store);
    8080        Evas_Coord x, y, cw, ch;
    8181        evas_object_image_fill_set(sd->backing_store, 0, 0, w, h);
     
    9191}
    9292
    93 static inline void _ewk_view_4b_move_region_up(uint32_t *image, size_t rows, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
    94 {
    95     uint32_t *src;
    96     uint32_t *dst;
     93static inline void _ewk_view_4b_move_region_up(uint32_t* image, size_t rows, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
     94{
     95    uint32_t* src;
     96    uint32_t* dst;
    9797
    9898    dst = image + x + y * rowsize;
     
    104104}
    105105
    106 static inline void _ewk_view_4b_move_region_down(uint32_t *image, size_t rows, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
    107 {
    108     uint32_t *src;
    109     uint32_t *dst;
     106static inline void _ewk_view_4b_move_region_down(uint32_t* image, size_t rows, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
     107{
     108    uint32_t* src;
     109    uint32_t* dst;
    110110
    111111    h -= rows;
     
    117117}
    118118
    119 static inline void _ewk_view_4b_move_line_left(uint32_t *dst, const uint32_t *src, size_t count)
    120 {
    121     uint32_t *dst_end = dst + count;
     119static inline void _ewk_view_4b_move_line_left(uint32_t* dst, const uint32_t* src, size_t count)
     120{
     121    uint32_t* dst_end = dst + count;
    122122    /* no memcpy() as it does not allow overlapping regions */
    123123    /* no memmove() as it will copy to a temporary buffer */
     
    127127}
    128128
    129 static inline void _ewk_view_4b_move_line_right(uint32_t *dst, uint32_t *src, size_t count)
    130 {
    131     uint32_t *dst_end = dst - count;
     129static inline void _ewk_view_4b_move_line_right(uint32_t* dst, uint32_t* src, size_t count)
     130{
     131    uint32_t* dst_end = dst - count;
    132132    /* no memcpy() as it does not allow overlapping regions */
    133133    /* no memmove() as it will copy to a temporary buffer */
     
    137137}
    138138
    139 static inline void _ewk_view_4b_move_region_left(uint32_t *image, size_t cols, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
    140 {
    141     uint32_t *src;
    142     uint32_t *dst;
     139static inline void _ewk_view_4b_move_region_left(uint32_t* image, size_t cols, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
     140{
     141    uint32_t* src;
     142    uint32_t* dst;
    143143
    144144    dst = image + x + y * rowsize;
     
    150150}
    151151
    152 static inline void _ewk_view_4b_move_region_right(uint32_t *image, size_t cols, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
    153 {
    154     uint32_t *src;
    155     uint32_t *dst;
     152static inline void _ewk_view_4b_move_region_right(uint32_t* image, size_t cols, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
     153{
     154    uint32_t* src;
     155    uint32_t* dst;
    156156
    157157    w -= cols;
     
    164164
    165165/* catch-all function, not as optimized as the others, but does the work. */
    166 static inline void _ewk_view_4b_move_region(uint32_t *image, int dx, int dy, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
    167 {
    168     uint32_t *src;
    169     uint32_t *dst;
     166static inline void _ewk_view_4b_move_region(uint32_t* image, int dx, int dy, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
     167{
     168    uint32_t* src;
     169    uint32_t* dst;
    170170
    171171    if (dy < 0) {
     
    204204}
    205205
    206 static inline void _ewk_view_single_scroll_process_single(Ewk_View_Smart_Data *sd, void *pixels, Evas_Coord ow, Evas_Coord oh, const Ewk_Scroll_Request *sr)
     206static inline void _ewk_view_single_scroll_process_single(Ewk_View_Smart_Data* sd, void* pixels, Evas_Coord ow, Evas_Coord oh, const Ewk_Scroll_Request* sr)
    207207{
    208208    Evas_Coord sx, sy, sw, sh;
     
    341341}
    342342
    343 static Eina_Bool _ewk_view_single_smart_scrolls_process(Ewk_View_Smart_Data *sd)
    344 {
    345     const Ewk_Scroll_Request *sr;
    346     const Ewk_Scroll_Request *sr_end;
     343static Eina_Bool _ewk_view_single_smart_scrolls_process(Ewk_View_Smart_Data* sd)
     344{
     345    const Ewk_Scroll_Request* sr;
     346    const Ewk_Scroll_Request* sr_end;
    347347    Evas_Coord ow, oh;
    348348    size_t count;
    349     void *pixels = evas_object_image_data_get(sd->backing_store, 1);
     349    void* pixels = evas_object_image_data_get(sd->backing_store, 1);
    350350    evas_object_image_size_get(sd->backing_store, &ow, &oh);
    351351
     
    360360}
    361361
    362 static Eina_Bool _ewk_view_single_smart_repaints_process(Ewk_View_Smart_Data *sd)
    363 {
    364     Ewk_View_Paint_Context *ctxt;
     362static Eina_Bool _ewk_view_single_smart_repaints_process(Ewk_View_Smart_Data* sd)
     363{
     364    Ewk_View_Paint_Context* ctxt;
    365365    Evas_Coord ow, oh;
    366     void *pixels;
    367     Eina_Rectangle *r;
    368     const Eina_Rectangle *pr;
    369     const Eina_Rectangle *pr_end;
    370     Eina_Tiler *tiler;
    371     Eina_Iterator *itr;
     366    void* pixels;
     367    Eina_Rectangle* r;
     368    const Eina_Rectangle* pr;
     369    const Eina_Rectangle* pr_end;
     370    Eina_Tiler* tiler;
     371    Eina_Iterator* itr;
    372372    cairo_status_t status;
    373     cairo_surface_t *surface;
     373    cairo_surface_t* surface;
    374374    cairo_format_t format;
    375     cairo_t *cairo;
     375    cairo_t* cairo;
    376376    size_t count;
    377377    Eina_Bool ret = EINA_TRUE;
    378378
    379379    if (sd->animated_zoom.zoom.current < 0.00001) {
    380         Evas_Object *clip = evas_object_clip_get(sd->backing_store);
     380        Evas_Object* clip = evas_object_clip_get(sd->backing_store);
    381381        Evas_Coord w, h, cw, ch;
    382382        // reset effects of zoom_weak_set()
     
    401401
    402402    surface = cairo_image_surface_create_for_data
    403         ((unsigned char*)pixels, format, ow, oh, ow * 4);
     403                  ((unsigned char*)pixels, format, ow, oh, ow * 4);
    404404    status = cairo_surface_status(surface);
    405405    if (status != CAIRO_STATUS_SUCCESS) {
     
    483483}
    484484
    485 static Eina_Bool _ewk_view_single_smart_zoom_weak_set(Ewk_View_Smart_Data *sd, float zoom, Evas_Coord cx, Evas_Coord cy)
     485static Eina_Bool _ewk_view_single_smart_zoom_weak_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy)
    486486{
    487487    // TODO: review
     
    490490    Evas_Coord h = sd->view.h * scale;
    491491    Evas_Coord dx, dy, cw, ch;
    492     Evas_Object *clip = evas_object_clip_get(sd->backing_store);
     492    Evas_Object* clip = evas_object_clip_get(sd->backing_store);
    493493
    494494    ewk_frame_contents_size_get(sd->main_frame, &cw, &ch);
     
    520520}
    521521
    522 static void _ewk_view_single_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data *sd, Eina_Bool smooth_scale)
     522static void _ewk_view_single_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data* sd, Eina_Bool smooth_scale)
    523523{
    524524    evas_object_image_smooth_scale_set(sd->backing_store, smooth_scale);
    525525}
    526526
    527 static void _ewk_view_single_smart_bg_color_set(Ewk_View_Smart_Data *sd, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
     527static void _ewk_view_single_smart_bg_color_set(Ewk_View_Smart_Data* sd, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
    528528{
    529529    evas_object_image_alpha_set(sd->backing_store, a < 255);
    530530}
    531531
    532 Eina_Bool ewk_view_single_smart_set(Ewk_View_Smart_Class *api)
     532Eina_Bool ewk_view_single_smart_set(Ewk_View_Smart_Class* api)
    533533{
    534534    if (!ewk_view_base_smart_set(api))
     
    551551}
    552552
    553 static inline Evas_Smart *_ewk_view_single_smart_class_new(void)
     553static inline Evas_Smart* _ewk_view_single_smart_class_new(void)
    554554{
    555555    static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("Ewk_View_Single");
    556     static Evas_Smart *smart = 0;
     556    static Evas_Smart* smart = 0;
    557557
    558558    if (EINA_UNLIKELY(!smart)) {
     
    564564}
    565565
    566 Evas_Object *ewk_view_single_add(Evas *e)
     566Evas_Object* ewk_view_single_add(Evas* e)
    567567{
    568568    return evas_object_smart_add(e, _ewk_view_single_smart_class_new());
  • trunk/Source/WebKit/efl/ewk/ewk_view_tiled.cpp

    r94509 r95659  
    3131static Ewk_View_Smart_Class _parent_sc = EWK_VIEW_SMART_CLASS_INIT_NULL;
    3232
    33 static Eina_Bool _ewk_view_tiled_render_cb(void *data, Ewk_Tile *t, const Eina_Rectangle *area)
    34 {
    35     Ewk_View_Private_Data *priv = (Ewk_View_Private_Data*)data;
     33static Eina_Bool _ewk_view_tiled_render_cb(void* data, Ewk_Tile* t, const Eina_Rectangle* area)
     34{
     35    Ewk_View_Private_Data* priv = (Ewk_View_Private_Data*)data;
    3636    Eina_Rectangle r = {area->x + t->x, area->y + t->y, area->w, area->h};
    3737
     
    3939}
    4040
    41 static void *_ewk_view_tiled_updates_process_pre(void *data, Evas_Object *o)
    42 {
    43     Ewk_View_Private_Data *priv = (Ewk_View_Private_Data*)data;
     41static void* _ewk_view_tiled_updates_process_pre(void* data, Evas_Object* o)
     42{
     43    Ewk_View_Private_Data* priv = (Ewk_View_Private_Data*)data;
    4444    ewk_view_layout_if_needed_recursive(priv);
    4545    return 0;
    4646}
    4747
    48 static Evas_Object *_ewk_view_tiled_smart_backing_store_add(Ewk_View_Smart_Data *sd)
    49 {
    50     Evas_Object *bs = ewk_tiled_backing_store_add(sd->base.evas);
     48static Evas_Object* _ewk_view_tiled_smart_backing_store_add(Ewk_View_Smart_Data* sd)
     49{
     50    Evas_Object* bs = ewk_tiled_backing_store_add(sd->base.evas);
    5151    ewk_tiled_backing_store_render_cb_set
    5252        (bs, _ewk_view_tiled_render_cb, sd->_priv);
     
    5757
    5858static void
    59 _ewk_view_tiled_contents_size_changed_cb(void *data, Evas_Object *o, void *event_info)
    60 {
    61     Evas_Coord *size = (Evas_Coord*)event_info;
    62     Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data*)data;
     59_ewk_view_tiled_contents_size_changed_cb(void* data, Evas_Object* o, void* event_info)
     60{
     61    Evas_Coord* size = (Evas_Coord*)event_info;
     62    Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
    6363
    6464    ewk_tiled_backing_store_contents_resize
     
    6666}
    6767
    68 static void _ewk_view_tiled_smart_add(Evas_Object *o)
    69 {
    70     Ewk_View_Smart_Data *sd;
     68static void _ewk_view_tiled_smart_add(Evas_Object* o)
     69{
     70    Ewk_View_Smart_Data* sd;
    7171
    7272    _parent_sc.sc.add(o);
     
    8282}
    8383
    84 static Eina_Bool _ewk_view_tiled_smart_scrolls_process(Ewk_View_Smart_Data *sd)
    85 {
    86     const Ewk_Scroll_Request *sr;
    87     const Ewk_Scroll_Request *sr_end;
     84static Eina_Bool _ewk_view_tiled_smart_scrolls_process(Ewk_View_Smart_Data* sd)
     85{
     86    const Ewk_Scroll_Request* sr;
     87    const Ewk_Scroll_Request* sr_end;
    8888    size_t count;
    8989    Evas_Coord vw, vh;
     
    138138}
    139139
    140 static Eina_Bool _ewk_view_tiled_smart_repaints_process(Ewk_View_Smart_Data *sd)
    141 {
    142     const Eina_Rectangle *pr, *pr_end;
     140static Eina_Bool _ewk_view_tiled_smart_repaints_process(Ewk_View_Smart_Data* sd)
     141{
     142    const Eina_Rectangle* pr, * pr_end;
    143143    size_t count;
    144144    int sx, sy;
     
    161161}
    162162
    163 static Eina_Bool _ewk_view_tiled_smart_contents_resize(Ewk_View_Smart_Data *sd, int w, int h)
     163static Eina_Bool _ewk_view_tiled_smart_contents_resize(Ewk_View_Smart_Data* sd, int w, int h)
    164164{
    165165    ewk_tiled_backing_store_contents_resize(sd->backing_store, w, h);
     
    167167}
    168168
    169 static Eina_Bool _ewk_view_tiled_smart_zoom_set(Ewk_View_Smart_Data *sd, float zoom, Evas_Coord cx, Evas_Coord cy)
     169static Eina_Bool _ewk_view_tiled_smart_zoom_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy)
    170170{
    171171    Evas_Coord x, y, w, h;
     
    187187}
    188188
    189 static Eina_Bool _ewk_view_tiled_smart_zoom_weak_set(Ewk_View_Smart_Data *sd, float zoom, Evas_Coord cx, Evas_Coord cy)
     189static Eina_Bool _ewk_view_tiled_smart_zoom_weak_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy)
    190190{
    191191    return ewk_tiled_backing_store_zoom_weak_set(sd->backing_store, zoom, cx, cy);
    192192}
    193193
    194 static void _ewk_view_tiled_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data *sd, Eina_Bool smooth_scale)
     194static void _ewk_view_tiled_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data* sd, Eina_Bool smooth_scale)
    195195{
    196196    ewk_tiled_backing_store_zoom_weak_smooth_scale_set(sd->backing_store, smooth_scale);
    197197}
    198198
    199 static void _ewk_view_tiled_smart_flush(Ewk_View_Smart_Data *sd)
     199static void _ewk_view_tiled_smart_flush(Ewk_View_Smart_Data* sd)
    200200{
    201201    ewk_tiled_backing_store_flush(sd->backing_store);
     
    203203}
    204204
    205 static Eina_Bool _ewk_view_tiled_smart_pre_render_region(Ewk_View_Smart_Data *sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
     205static Eina_Bool _ewk_view_tiled_smart_pre_render_region(Ewk_View_Smart_Data* sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
    206206{
    207207    return ewk_tiled_backing_store_pre_render_region
    208         (sd->backing_store, x, y, w, h, zoom);
    209 }
    210 
    211 static Eina_Bool _ewk_view_tiled_smart_pre_render_relative_radius(Ewk_View_Smart_Data *sd, unsigned int n, float zoom)
     208               (sd->backing_store, x, y, w, h, zoom);
     209}
     210
     211static Eina_Bool _ewk_view_tiled_smart_pre_render_relative_radius(Ewk_View_Smart_Data* sd, unsigned int n, float zoom)
    212212{
    213213    return ewk_tiled_backing_store_pre_render_relative_radius
    214         (sd->backing_store, n, zoom);
    215 }
    216 
    217 static void _ewk_view_tiled_smart_pre_render_cancel(Ewk_View_Smart_Data *sd)
     214               (sd->backing_store, n, zoom);
     215}
     216
     217static void _ewk_view_tiled_smart_pre_render_cancel(Ewk_View_Smart_Data* sd)
    218218{
    219219    ewk_tiled_backing_store_pre_render_cancel(sd->backing_store);
    220220}
    221221
    222 static Eina_Bool _ewk_view_tiled_smart_disable_render(Ewk_View_Smart_Data *sd)
     222static Eina_Bool _ewk_view_tiled_smart_disable_render(Ewk_View_Smart_Data* sd)
    223223{
    224224    return ewk_tiled_backing_store_disable_render(sd->backing_store);
    225225}
    226226
    227 static Eina_Bool _ewk_view_tiled_smart_enable_render(Ewk_View_Smart_Data *sd)
     227static Eina_Bool _ewk_view_tiled_smart_enable_render(Ewk_View_Smart_Data* sd)
    228228{
    229229    return ewk_tiled_backing_store_enable_render(sd->backing_store);
    230230}
    231231
    232 Eina_Bool ewk_view_tiled_smart_set(Ewk_View_Smart_Class *api)
     232Eina_Bool ewk_view_tiled_smart_set(Ewk_View_Smart_Class* api)
    233233{
    234234    if (!ewk_view_base_smart_set(api))
     
    256256}
    257257
    258 static inline Evas_Smart *_ewk_view_tiled_smart_class_new(void)
     258static inline Evas_Smart* _ewk_view_tiled_smart_class_new(void)
    259259{
    260260    static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("EWK_View_Tiled");
    261     static Evas_Smart *smart = 0;
     261    static Evas_Smart* smart = 0;
    262262
    263263    if (EINA_UNLIKELY(!smart)) {
     
    269269}
    270270
    271 Evas_Object *ewk_view_tiled_add(Evas *e)
     271Evas_Object* ewk_view_tiled_add(Evas* e)
    272272{
    273273    return evas_object_smart_add(e, _ewk_view_tiled_smart_class_new());
    274274}
    275275
    276 Ewk_Tile_Unused_Cache *ewk_view_tiled_unused_cache_get(const Evas_Object *o)
    277 {
    278     Ewk_View_Smart_Data *sd = ewk_view_smart_data_get(o);
     276Ewk_Tile_Unused_Cache* ewk_view_tiled_unused_cache_get(const Evas_Object* o)
     277{
     278    Ewk_View_Smart_Data* sd = ewk_view_smart_data_get(o);
    279279    EINA_SAFETY_ON_NULL_RETURN_VAL(sd, 0);
    280280    return ewk_tiled_backing_store_tile_unused_cache_get(sd->backing_store);
    281281}
    282282
    283 void ewk_view_tiled_unused_cache_set(Evas_Object *o, Ewk_Tile_Unused_Cache *cache)
    284 {
    285     Ewk_View_Smart_Data *sd = ewk_view_smart_data_get(o);
     283void ewk_view_tiled_unused_cache_set(Evas_Object* o, Ewk_Tile_Unused_Cache* cache)
     284{
     285    Ewk_View_Smart_Data* sd = ewk_view_smart_data_get(o);
    286286    EINA_SAFETY_ON_NULL_RETURN(sd);
    287287    ewk_tiled_backing_store_tile_unused_cache_set(sd->backing_store, cache);
  • trunk/Source/WebKit/efl/ewk/ewk_window_features.cpp

    r95088 r95659  
    3333struct _Ewk_Window_Features {
    3434    unsigned int __ref;
    35     WebCore::WindowFeatures *core;
     35    WebCore::WindowFeatures* core;
    3636};
    3737
    38 void ewk_window_features_unref(Ewk_Window_Features *window_features)
     38void ewk_window_features_unref(Ewk_Window_Features* window_features)
    3939{
    4040    EINA_SAFETY_ON_NULL_RETURN(window_features);
     
    4949}
    5050
    51 void ewk_window_features_ref(Ewk_Window_Features *window_features)
     51void ewk_window_features_ref(Ewk_Window_Features* window_features)
    5252{
    5353    EINA_SAFETY_ON_NULL_RETURN(window_features);
     
    5555}
    5656
    57 void ewk_window_features_bool_property_get(const Ewk_Window_Features *window_features, Eina_Bool *toolbar_visible, Eina_Bool *statusbar_visible, Eina_Bool *scrollbars_visible, Eina_Bool *menubar_visible, Eina_Bool *locationbar_visible, Eina_Bool *fullscreen)
     57void ewk_window_features_bool_property_get(const Ewk_Window_Features* window_features, Eina_Bool* toolbar_visible, Eina_Bool* statusbar_visible, Eina_Bool* scrollbars_visible, Eina_Bool* menubar_visible, Eina_Bool* locationbar_visible, Eina_Bool* fullscreen)
    5858{
    5959    EINA_SAFETY_ON_NULL_RETURN(window_features);
     
    7979}
    8080
    81 void ewk_window_features_int_property_get(const Ewk_Window_Features *window_features, int *x, int *y, int *w, int *h)
     81void ewk_window_features_int_property_get(const Ewk_Window_Features* window_features, int* x, int* y, int* w, int* h)
    8282{
    8383    EINA_SAFETY_ON_NULL_RETURN(window_features);
     
    108108 * @return a new allocated the Ewk_Window_Features object on sucess or @c 0 on failure
    109109 */
    110 Ewk_Window_Features *ewk_window_features_new_from_core(const WebCore::WindowFeatures *core)
     110Ewk_Window_Features* ewk_window_features_new_from_core(const WebCore::WindowFeatures* core)
    111111{
    112     Ewk_Window_Features *window_features = static_cast<Ewk_Window_Features*>(malloc(sizeof(*window_features)));
     112    Ewk_Window_Features* window_features = static_cast<Ewk_Window_Features*>(malloc(sizeof(*window_features)));
    113113    if (!window_features) {
    114114        CRITICAL("Could not allocate Ewk_Window_Features.");
Note: See TracChangeset for help on using the changeset viewer.