Changeset 95659 in webkit
- Timestamp:
- Sep 21, 2011 12:17:57 PM (13 years ago)
- Location:
- trunk/Source/WebKit/efl
- Files:
-
- 28 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/efl/ChangeLog
r95656 r95659 1 2011-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 1 30 2011-09-21 Lucas De Marchi <lucas.demarchi@profusion.mobi> 2 31 -
trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
r95271 r95659 403 403 DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(databaseName, origin); 404 404 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()); 407 407 408 408 /* if client did not set quota, and database is being created now, the … … 439 439 440 440 EINA_LIST_FREE(selectedFilenames, filename) { 441 filenames.append((char 441 filenames.append((char*)filename); 442 442 free(filename); 443 443 } -
trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
r92039 r95659 386 386 case VK_LEFT: 387 387 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); 391 391 return true; 392 392 case VK_RIGHT: 393 393 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); 397 397 return true; 398 398 case VK_UP: 399 399 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); 403 403 return true; 404 404 case VK_DOWN: 405 405 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); 409 409 return true; 410 410 } -
trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
r95387 r95659 69 69 namespace WebCore { 70 70 71 FrameLoaderClientEfl::FrameLoaderClientEfl(Evas_Object *view)71 FrameLoaderClientEfl::FrameLoaderClientEfl(Evas_Object* view) 72 72 : m_view(view) 73 73 , m_frame(0) … … 108 108 } 109 109 110 void FrameLoaderClientEfl::setCustomUserAgent(const String &agent)110 void FrameLoaderClientEfl::setCustomUserAgent(const String& agent) 111 111 { 112 112 m_customUserAgent = agent; … … 378 378 379 379 PassRefPtr<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) 381 381 { 382 382 notImplemented(); … … 679 679 } 680 680 681 void FrameLoaderClientEfl::didChangeTitle(DocumentLoader *l)681 void FrameLoaderClientEfl::didChangeTitle(DocumentLoader*) 682 682 { 683 683 // no need for, dispatchDidReceiveTitle is the right callback -
trunk/Source/WebKit/efl/WebCoreSupport/IconDatabaseClientEfl.cpp
r93697 r95659 1 /* 1 /* 2 2 * Copyright (C) 2011 Samsung Electronics 3 3 * -
trunk/Source/WebKit/efl/WebCoreSupport/NotificationPresenterClientEfl.cpp
r91910 r95659 1 /* 1 /* 2 2 * Copyright (C) 2011 Samsung Electronics 3 3 * -
trunk/Source/WebKit/efl/ewk/ewk_auth.cpp
r92473 r95659 32 32 } 33 33 34 void ewk_auth_credentials_set(char *username, char *password, void *data)34 void ewk_auth_credentials_set(char* username, char* password, void* data) 35 35 { 36 36 #if USE(SOUP) -
trunk/Source/WebKit/efl/ewk/ewk_auth_soup.cpp
r91972 r95659 41 41 42 42 typedef struct _Ewk_Auth_Data { 43 SoupMessage *msg;44 SoupAuth *auth;45 SoupSession *session;43 SoupMessage* msg; 44 SoupAuth* auth; 45 SoupSession* session; 46 46 } Ewk_Auth_Data; 47 47 … … 56 56 G_IMPLEMENT_INTERFACE(SOUP_TYPE_SESSION_FEATURE, ewk_auth_soup_dialog_session_feature_init)) 57 57 58 static void ewk_auth_soup_dialog_class_init(Ewk_Soup_Auth_DialogClass *klass)58 static void ewk_auth_soup_dialog_class_init(Ewk_Soup_Auth_DialogClass* klass) 59 59 { 60 60 } 61 61 62 static void ewk_auth_soup_dialog_init(Ewk_Soup_Auth_Dialog *instance)62 static void ewk_auth_soup_dialog_init(Ewk_Soup_Auth_Dialog* instance) 63 63 { 64 64 } 65 65 66 static void ewk_auth_soup_dialog_session_feature_init(SoupSessionFeatureInterface *feature_interface, gpointer interface_data)66 static void ewk_auth_soup_dialog_session_feature_init(SoupSessionFeatureInterface* feature_interface, gpointer interface_data) 67 67 { 68 68 feature_interface->attach = attach; … … 75 75 } 76 76 77 void ewk_auth_soup_credentials_set(const char *username, const char *password, void *data)77 void ewk_auth_soup_credentials_set(const char* username, const char* password, void* data) 78 78 { 79 79 if (!data) 80 80 return; 81 81 82 Ewk_Auth_Data *auth_data = (Ewk_Auth_Data*)data;82 Ewk_Auth_Data* auth_data = (Ewk_Auth_Data*)data; 83 83 soup_auth_authenticate(auth_data->auth, username, password); 84 84 soup_session_unpause_message(auth_data->session, auth_data->msg); … … 86 86 } 87 87 88 static void session_authenticate(SoupSession *session, SoupMessage *msg, SoupAuth *auth, gboolean retrying, gpointer /* user_data */)88 static void session_authenticate(SoupSession* session, SoupMessage* msg, SoupAuth* auth, gboolean retrying, gpointer /* user_data */) 89 89 { 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; 93 93 94 94 if (!ewk_auth_show_dialog_callback) 95 95 return; 96 96 97 auth_data = (Ewk_Auth_Data 97 auth_data = (Ewk_Auth_Data*)calloc(1, sizeof(Ewk_Auth_Data)); 98 98 99 99 if (!auth_data) { … … 119 119 } 120 120 121 static void free_auth_data(Ewk_Auth_Data *auth_data)121 static void free_auth_data(Ewk_Auth_Data* auth_data) 122 122 { 123 123 g_object_unref(auth_data->msg); … … 127 127 } 128 128 129 static void attach(SoupSessionFeature *manager, SoupSession *session)129 static void attach(SoupSessionFeature* manager, SoupSession* session) 130 130 { 131 131 g_signal_connect(session, "authenticate", G_CALLBACK(session_authenticate), manager); 132 132 } 133 133 134 static void detach(SoupSessionFeature *manager, SoupSession *session)134 static void detach(SoupSessionFeature* manager, SoupSession* session) 135 135 { 136 g_signal_handlers_disconnect_by_func(session, (void 136 g_signal_handlers_disconnect_by_func(session, (void*)session_authenticate, manager); 137 137 } 138 138 -
trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp
r94063 r95659 39 39 unsigned int __ref; /**< the reference count of the object */ 40 40 #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 */ 42 42 #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 */ 46 46 }; 47 47 … … 54 54 Ewk_Context_Menu_Action action; /**< contains the action of the item */ 55 55 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; 61 61 }; 62 62 63 void ewk_context_menu_ref(Ewk_Context_Menu *menu)63 void ewk_context_menu_ref(Ewk_Context_Menu* menu) 64 64 { 65 65 EINA_SAFETY_ON_NULL_RETURN(menu); … … 67 67 } 68 68 69 void ewk_context_menu_unref(Ewk_Context_Menu *menu)69 void ewk_context_menu_unref(Ewk_Context_Menu* menu) 70 70 { 71 71 EINA_SAFETY_ON_NULL_RETURN(menu); 72 void *item;72 void* item; 73 73 74 74 if (--menu->__ref) … … 81 81 } 82 82 83 Eina_Bool ewk_context_menu_destroy(Ewk_Context_Menu *menu)83 Eina_Bool ewk_context_menu_destroy(Ewk_Context_Menu* menu) 84 84 { 85 85 #if ENABLE(CONTEXT_MENUS) … … 88 88 menu->controller->clearContextMenu(); 89 89 return EINA_TRUE; 90 #else 90 #else 91 91 return EINA_FALSE; 92 92 #endif 93 93 } 94 94 95 const Eina_List *ewk_context_menu_item_list_get(const Ewk_Context_Menu *o)95 const Eina_List* ewk_context_menu_item_list_get(const Ewk_Context_Menu* o) 96 96 { 97 97 EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0); … … 100 100 } 101 101 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));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)); 107 107 if (!item) 108 108 return 0; … … 118 118 } 119 119 120 Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu *menu, Ewk_Context_Menu_Item *item)120 Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu* menu, Ewk_Context_Menu_Item* item) 121 121 { 122 122 #if ENABLE(CONTEXT_MENUS) … … 135 135 } 136 136 137 void ewk_context_menu_item_free(Ewk_Context_Menu_Item *item)137 void ewk_context_menu_item_free(Ewk_Context_Menu_Item* item) 138 138 { 139 139 EINA_SAFETY_ON_NULL_RETURN(item); … … 143 143 } 144 144 145 Ewk_Context_Menu_Item_Type ewk_context_menu_item_type_get(const Ewk_Context_Menu_Item *o)145 Ewk_Context_Menu_Item_Type ewk_context_menu_item_type_get(const Ewk_Context_Menu_Item* o) 146 146 { 147 147 EINA_SAFETY_ON_NULL_RETURN_VAL(o, EWK_ACTION_TYPE); … … 149 149 } 150 150 151 Eina_Bool ewk_context_menu_item_type_set(Ewk_Context_Menu_Item *o, Ewk_Context_Menu_Item_Type type)151 Eina_Bool ewk_context_menu_item_type_set(Ewk_Context_Menu_Item* o, Ewk_Context_Menu_Item_Type type) 152 152 { 153 153 EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE); … … 156 156 } 157 157 158 Ewk_Context_Menu_Action ewk_context_menu_item_action_get(const Ewk_Context_Menu_Item *o)158 Ewk_Context_Menu_Action ewk_context_menu_item_action_get(const Ewk_Context_Menu_Item* o) 159 159 { 160 160 EINA_SAFETY_ON_NULL_RETURN_VAL(o, EWK_CONTEXT_MENU_ITEM_TAG_NO_ACTION); … … 162 162 } 163 163 164 Eina_Bool ewk_context_menu_item_action_set(Ewk_Context_Menu_Item *o, Ewk_Context_Menu_Action action)164 Eina_Bool ewk_context_menu_item_action_set(Ewk_Context_Menu_Item* o, Ewk_Context_Menu_Action action) 165 165 { 166 166 EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE); … … 169 169 } 170 170 171 const char *ewk_context_menu_item_title_get(const Ewk_Context_Menu_Item *o)171 const char* ewk_context_menu_item_title_get(const Ewk_Context_Menu_Item* o) 172 172 { 173 173 EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0); … … 175 175 } 176 176 177 const char *ewk_context_menu_item_title_set(Ewk_Context_Menu_Item *o, const char *title)177 const char* ewk_context_menu_item_title_set(Ewk_Context_Menu_Item* o, const char* title) 178 178 { 179 179 EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0); … … 182 182 } 183 183 184 Eina_Bool ewk_context_menu_item_checked_get(const Ewk_Context_Menu_Item *o)184 Eina_Bool ewk_context_menu_item_checked_get(const Ewk_Context_Menu_Item* o) 185 185 { 186 186 EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE); … … 188 188 } 189 189 190 Eina_Bool ewk_context_menu_item_checked_set(Ewk_Context_Menu_Item *o, Eina_Bool checked)190 Eina_Bool ewk_context_menu_item_checked_set(Ewk_Context_Menu_Item* o, Eina_Bool checked) 191 191 { 192 192 EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE); … … 195 195 } 196 196 197 Eina_Bool ewk_context_menu_item_enabled_get(const Ewk_Context_Menu_Item *o)197 Eina_Bool ewk_context_menu_item_enabled_get(const Ewk_Context_Menu_Item* o) 198 198 { 199 199 EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE); … … 201 201 } 202 202 203 Eina_Bool ewk_context_menu_item_enabled_set(Ewk_Context_Menu_Item *o, Eina_Bool enabled)203 Eina_Bool ewk_context_menu_item_enabled_set(Ewk_Context_Menu_Item* o, Eina_Bool enabled) 204 204 { 205 205 EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE); … … 223 223 * @note emits a signal "contextmenu,new" 224 224 */ 225 Ewk_Context_Menu *ewk_context_menu_new(Evas_Object *view, WebCore::ContextMenuController *controller)225 Ewk_Context_Menu* ewk_context_menu_new(Evas_Object* view, WebCore::ContextMenuController* controller) 226 226 { 227 227 Ewk_Context_Menu* menu; … … 257 257 * @see ewk_context_menu_destroy 258 258 */ 259 Eina_Bool ewk_context_menu_free(Ewk_Context_Menu *o)259 Eina_Bool ewk_context_menu_free(Ewk_Context_Menu* o) 260 260 { 261 261 EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE); … … 276 276 * @see ewk_context_menu_item_new 277 277 */ 278 void ewk_context_menu_item_append(Ewk_Context_Menu *o, WebCore::ContextMenuItem &core)278 void ewk_context_menu_item_append(Ewk_Context_Menu* o, WebCore::ContextMenuItem& core) 279 279 { 280 280 Ewk_Context_Menu_Item_Type type = static_cast<Ewk_Context_Menu_Item_Type>(core.type()); 281 281 Ewk_Context_Menu_Action action = static_cast<Ewk_Context_Menu_Action>(core.action()); 282 282 283 Ewk_Context_Menu_Item *menu_item = ewk_context_menu_item_new284 (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()); 286 286 EINA_SAFETY_ON_NULL_RETURN(menu_item); 287 287 … … 302 302 * @see ewk_context_menu_item_list_get 303 303 */ 304 Ewk_Context_Menu *ewk_context_menu_custom_get(const Ewk_Context_Menu *o)304 Ewk_Context_Menu* ewk_context_menu_custom_get(const Ewk_Context_Menu* o) 305 305 { 306 306 EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0); … … 317 317 * @param o the context menu object 318 318 */ 319 void ewk_context_menu_show(const Ewk_Context_Menu *o)319 void ewk_context_menu_show(const Ewk_Context_Menu* o) 320 320 { 321 321 EINA_SAFETY_ON_NULL_RETURN(o); -
trunk/Source/WebKit/efl/ewk/ewk_cookies.cpp
r94034 r95659 37 37 38 38 39 Eina_Bool ewk_cookies_file_set(const char *filename)39 Eina_Bool ewk_cookies_file_set(const char* filename) 40 40 { 41 41 #if USE(SOUP) 42 SoupCookieJar *cookieJar = 0;42 SoupCookieJar* cookieJar = 0; 43 43 if (filename) 44 44 cookieJar = soup_cookie_jar_text_new(filename, FALSE); … … 51 51 soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY); 52 52 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); 55 55 if (oldjar) 56 56 soup_session_remove_feature(session, oldjar); … … 68 68 { 69 69 #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(); 73 73 74 74 l = soup_cookie_jar_all_cookies(cookieJar); 75 75 for (p = l; p; p = p->next) 76 soup_cookie_jar_delete_cookie(cookieJar, (SoupCookie 76 soup_cookie_jar_delete_cookie(cookieJar, (SoupCookie*)p->data); 77 77 78 78 soup_cookies_free(l); … … 80 80 } 81 81 82 Eina_List *ewk_cookies_get_all(void)82 Eina_List* ewk_cookies_get_all(void) 83 83 { 84 Eina_List *el = 0;84 Eina_List* el = 0; 85 85 #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(); 89 89 90 90 l = soup_cookie_jar_all_cookies(cookieJar); 91 91 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))); 94 94 c->name = strdup(cookie->name); 95 95 c->value = strdup(cookie->value); … … 107 107 } 108 108 109 void ewk_cookies_cookie_del(Ewk_Cookie *cookie)109 void ewk_cookies_cookie_del(Ewk_Cookie* cookie) 110 110 { 111 111 #if USE(SOUP) … … 113 113 GSList* l; 114 114 GSList* p; 115 SoupCookieJar *cookieJar = WebCore::defaultCookieJar();116 SoupCookie *c1 = soup_cookie_new(115 SoupCookieJar* cookieJar = WebCore::defaultCookieJar(); 116 SoupCookie* c1 = soup_cookie_new( 117 117 cookie->name, cookie->value, cookie->domain, cookie->path, -1); 118 118 119 119 l = soup_cookie_jar_all_cookies(cookieJar); 120 120 for (p = l; p; p = p->next) { 121 SoupCookie *c2 = static_cast<SoupCookie*>(p->data);121 SoupCookie* c2 = static_cast<SoupCookie*>(p->data); 122 122 if (soup_cookie_equal(c1, c2)) { 123 123 soup_cookie_jar_delete_cookie(cookieJar, c2); … … 131 131 } 132 132 133 void ewk_cookies_cookie_free(Ewk_Cookie *cookie)133 void ewk_cookies_cookie_free(Ewk_Cookie* cookie) 134 134 { 135 135 #if USE(SOUP) … … 146 146 { 147 147 #if USE(SOUP) 148 SoupCookieJar *cookieJar = WebCore::defaultCookieJar();148 SoupCookieJar* cookieJar = WebCore::defaultCookieJar(); 149 149 SoupCookieJarAcceptPolicy policy; 150 150 … … 170 170 Ewk_Cookie_Policy ewk_policy = EWK_COOKIE_JAR_ACCEPT_ALWAYS; 171 171 #if USE(SOUP) 172 SoupCookieJar *cookieJar = WebCore::defaultCookieJar();172 SoupCookieJar* cookieJar = WebCore::defaultCookieJar(); 173 173 SoupCookieJarAcceptPolicy policy; 174 174 -
trunk/Source/WebKit/efl/ewk/ewk_frame.cpp
r95656 r95659 64 64 struct Ewk_Frame_Smart_Data { 65 65 Evas_Object_Smart_Clipped_Data base; 66 Evas_Object *self;67 Evas_Object *view;66 Evas_Object* self; 67 Evas_Object* view; 68 68 #ifdef EWK_FRAME_DEBUG 69 Evas_Object *region;69 Evas_Object* region; 70 70 #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; 75 75 struct { 76 76 Evas_Coord w, h; 77 77 } contents_size; 78 Eina_Bool textZoom :1;79 Eina_Bool editable :1;78 Eina_Bool textZoom : 1; 79 Eina_Bool editable : 1; 80 80 }; 81 81 82 82 struct Eina_Iterator_Ewk_Frame { 83 83 Eina_Iterator base; 84 Evas_Object *obj;84 Evas_Object* obj; 85 85 unsigned currentIndex; 86 86 }; … … 91 91 #define EWK_FRAME_TYPE_CHECK(o, ...) \ 92 92 do { \ 93 const char *_tmp_otype = evas_object_type_get(o); \93 const char* _tmp_otype = evas_object_type_get(o); \ 94 94 if (EINA_UNLIKELY(_tmp_otype != EWK_FRAME_TYPE_STR)) { \ 95 95 EINA_LOG_CRIT \ 96 96 ("%p (%s) is not of an ewk_frame!", o, \ 97 _tmp_otype ? _tmp_otype : "(null)");\97 _tmp_otype ? _tmp_otype : "(null)"); \ 98 98 return __VA_ARGS__; \ 99 99 } \ … … 102 102 103 103 #define EWK_FRAME_SD_GET(o, ptr) \ 104 Ewk_Frame_Smart_Data *ptr = (Ewk_Frame_Smart_Data 104 Ewk_Frame_Smart_Data *ptr = (Ewk_Frame_Smart_Data*)evas_object_smart_data_get(o) 105 105 106 106 #define EWK_FRAME_SD_GET_OR_RETURN(o, ptr, ...) \ … … 116 116 117 117 #ifdef EWK_FRAME_DEBUG 118 static inline void _ewk_frame_debug(Evas_Object *o)119 { 120 Evas_Object *clip, *parent;118 static inline void _ewk_frame_debug(Evas_Object* o) 119 { 120 Evas_Object* clip, * parent; 121 121 Evas_Coord x, y, w, h, cx, cy, cw, ch; 122 122 int r, g, b, a, cr, cg, cb, ca; … … 141 141 #endif 142 142 143 static WebCore::FrameLoaderClientEfl *_ewk_frame_loader_efl_get(WebCore::Frame *frame)143 static WebCore::FrameLoaderClientEfl* _ewk_frame_loader_efl_get(WebCore::Frame* frame) 144 144 { 145 145 return static_cast<WebCore::FrameLoaderClientEfl*>(frame->loader()->client()); 146 146 } 147 147 148 static inline Evas_Object *kit(WebCore::Frame *frame)148 static inline Evas_Object* kit(WebCore::Frame* frame) 149 149 { 150 150 if (!frame) 151 151 return 0; 152 WebCore::FrameLoaderClientEfl *fl = _ewk_frame_loader_efl_get(frame);152 WebCore::FrameLoaderClientEfl* fl = _ewk_frame_loader_efl_get(frame); 153 153 if (!fl) 154 154 return 0; … … 156 156 } 157 157 158 static Eina_Bool _ewk_frame_children_iterator_next(Eina_Iterator_Ewk_Frame *it, Evas_Object **data)158 static Eina_Bool _ewk_frame_children_iterator_next(Eina_Iterator_Ewk_Frame* it, Evas_Object** data) 159 159 { 160 160 EWK_FRAME_SD_GET_OR_RETURN(it->obj, sd, EINA_FALSE); … … 172 172 } 173 173 174 static Evas_Object *_ewk_frame_children_iterator_get_container(Eina_Iterator_Ewk_Frame *it)174 static Evas_Object* _ewk_frame_children_iterator_get_container(Eina_Iterator_Ewk_Frame* it) 175 175 { 176 176 return it->obj; 177 177 } 178 178 179 static void _ewk_frame_smart_add(Evas_Object *o)179 static void _ewk_frame_smart_add(Evas_Object* o) 180 180 { 181 181 EWK_FRAME_SD_GET(o, sd); … … 256 256 } 257 257 258 static void _ewk_frame_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)258 static void _ewk_frame_smart_resize(Evas_Object* o, Evas_Coord w, Evas_Coord h) 259 259 { 260 260 EWK_FRAME_SD_GET(o, sd); … … 271 271 } 272 272 273 static void _ewk_frame_smart_set(Evas_Smart_Class *api)273 static void _ewk_frame_smart_set(Evas_Smart_Class* api) 274 274 { 275 275 evas_object_smart_clipped_smart_set(api); … … 279 279 } 280 280 281 static inline Evas_Smart *_ewk_frame_smart_class_new(void)281 static inline Evas_Smart* _ewk_frame_smart_class_new(void) 282 282 { 283 283 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; 285 285 286 286 if (EINA_UNLIKELY(!smart)) { … … 293 293 } 294 294 295 Evas_Object *ewk_frame_view_get(const Evas_Object *o)295 Evas_Object* ewk_frame_view_get(const Evas_Object* o) 296 296 { 297 297 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 299 299 } 300 300 301 Eina_Iterator *ewk_frame_children_iterator_new(Evas_Object *o)301 Eina_Iterator* ewk_frame_children_iterator_new(Evas_Object* o) 302 302 { 303 303 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)); 306 306 if (!it) 307 307 return 0; … … 316 316 } 317 317 318 Evas_Object *ewk_frame_child_find(Evas_Object *o, const char *name)318 Evas_Object* ewk_frame_child_find(Evas_Object* o, const char* name) 319 319 { 320 320 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 325 325 } 326 326 327 Eina_Bool ewk_frame_uri_set(Evas_Object *o, const char *uri)327 Eina_Bool ewk_frame_uri_set(Evas_Object* o, const char* uri) 328 328 { 329 329 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); 330 330 WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(uri)); 331 331 WebCore::ResourceRequest req(kurl); 332 WebCore::FrameLoader *loader = sd->frame->loader();332 WebCore::FrameLoader* loader = sd->frame->loader(); 333 333 loader->load(req, false); 334 334 return EINA_TRUE; 335 335 } 336 336 337 const char *ewk_frame_uri_get(const Evas_Object *o)337 const char* ewk_frame_uri_get(const Evas_Object* o) 338 338 { 339 339 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 341 341 } 342 342 343 const char *ewk_frame_title_get(const Evas_Object *o)343 const char* ewk_frame_title_get(const Evas_Object* o) 344 344 { 345 345 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 347 347 } 348 348 349 const char *ewk_frame_name_get(const Evas_Object *o)349 const char* ewk_frame_name_get(const Evas_Object* o) 350 350 { 351 351 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 366 366 } 367 367 368 Eina_Bool ewk_frame_contents_size_get(const Evas_Object *o, Evas_Coord *w, Evas_Coord *h)368 Eina_Bool ewk_frame_contents_size_get(const Evas_Object* o, Evas_Coord* w, Evas_Coord* h) 369 369 { 370 370 if (w) … … 380 380 } 381 381 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)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) 383 383 { 384 384 size_t len = strlen(contents); … … 402 402 WebCore::SubstituteData substituteData 403 403 (buffer.release(), 404 405 406 404 WTF::String::fromUTF8(mime_type), 405 WTF::String::fromUTF8(encoding), 406 baseKURL, unreachableKURL); 407 407 WebCore::ResourceRequest request(baseKURL); 408 408 … … 411 411 } 412 412 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)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) 414 414 { 415 415 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 417 417 EINA_SAFETY_ON_NULL_RETURN_VAL(contents, EINA_FALSE); 418 418 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 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) 423 423 { 424 424 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 427 427 EINA_SAFETY_ON_NULL_RETURN_VAL(unreachable_uri, EINA_FALSE); 428 428 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 433 Eina_Bool ewk_frame_script_execute(Evas_Object* o, const char* script) 434 434 { 435 435 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 440 440 } 441 441 442 Eina_Bool ewk_frame_editable_get(const Evas_Object *o)442 Eina_Bool ewk_frame_editable_get(const Evas_Object* o) 443 443 { 444 444 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 447 447 } 448 448 449 Eina_Bool ewk_frame_editable_set(Evas_Object *o, Eina_Bool editable)449 Eina_Bool ewk_frame_editable_set(Evas_Object* o, Eina_Bool editable) 450 450 { 451 451 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 459 459 } 460 460 461 char *ewk_frame_selection_get(const Evas_Object *o)461 char* ewk_frame_selection_get(const Evas_Object* o) 462 462 { 463 463 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 469 469 } 470 470 471 Eina_Bool ewk_frame_text_search(const Evas_Object *o, const char *string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap)471 Eina_Bool ewk_frame_text_search(const Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap) 472 472 { 473 473 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 478 478 } 479 479 480 unsigned int ewk_frame_text_matches_mark(Evas_Object *o, const char *string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit)480 unsigned int ewk_frame_text_matches_mark(Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit) 481 481 { 482 482 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 488 488 } 489 489 490 Eina_Bool ewk_frame_text_matches_unmark_all(Evas_Object *o)490 Eina_Bool ewk_frame_text_matches_unmark_all(Evas_Object* o) 491 491 { 492 492 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 497 497 } 498 498 499 Eina_Bool ewk_frame_text_matches_highlight_set(Evas_Object *o, Eina_Bool highlight)499 Eina_Bool ewk_frame_text_matches_highlight_set(Evas_Object* o, Eina_Bool highlight) 500 500 { 501 501 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 505 505 } 506 506 507 Eina_Bool ewk_frame_text_matches_highlight_get(const Evas_Object *o)507 Eina_Bool ewk_frame_text_matches_highlight_get(const Evas_Object* o) 508 508 { 509 509 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 515 515 * Comparison function used by ewk_frame_text_matches_nth_pos_get 516 516 */ 517 static bool _ewk_frame_rect_cmp_less_than(const WebCore::IntRect &i, const WebCore::IntRect &j)517 static bool _ewk_frame_rect_cmp_less_than(const WebCore::IntRect& i, const WebCore::IntRect& j) 518 518 { 519 519 return (i.y() < j.y() || (i.y() == j.y() && i.x() < j.x())); … … 523 523 * Predicate used by ewk_frame_text_matches_nth_pos_get 524 524 */ 525 static bool _ewk_frame_rect_is_negative_value(const WebCore::IntRect &i)525 static bool _ewk_frame_rect_is_negative_value(const WebCore::IntRect& i) 526 526 { 527 527 return (i.x() < 0 || i.y() < 0); 528 528 } 529 529 530 Eina_Bool ewk_frame_text_matches_nth_pos_get(const Evas_Object *o, size_t n, int *x, int *y)530 Eina_Bool ewk_frame_text_matches_nth_pos_get(const Evas_Object* o, size_t n, int* x, int* y) 531 531 { 532 532 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 539 539 540 540 if (intRects.isEmpty() || n > intRects.size()) 541 return EINA_FALSE;541 return EINA_FALSE; 542 542 543 543 std::sort(intRects.begin(), intRects.end(), _ewk_frame_rect_cmp_less_than); 544 544 545 545 if (x) 546 *x = intRects[n - 1].x();546 *x = intRects[n - 1].x(); 547 547 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 552 Eina_Bool ewk_frame_stop(Evas_Object* o) 553 553 { 554 554 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 558 558 } 559 559 560 Eina_Bool ewk_frame_reload(Evas_Object *o)560 Eina_Bool ewk_frame_reload(Evas_Object* o) 561 561 { 562 562 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 566 566 } 567 567 568 Eina_Bool ewk_frame_reload_full(Evas_Object *o)568 Eina_Bool ewk_frame_reload_full(Evas_Object* o) 569 569 { 570 570 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 574 574 } 575 575 576 Eina_Bool ewk_frame_back(Evas_Object *o)576 Eina_Bool ewk_frame_back(Evas_Object* o) 577 577 { 578 578 return ewk_frame_navigate(o, -1); 579 579 } 580 580 581 Eina_Bool ewk_frame_forward(Evas_Object *o)581 Eina_Bool ewk_frame_forward(Evas_Object* o) 582 582 { 583 583 return ewk_frame_navigate(o, 1); 584 584 } 585 585 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();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(); 591 591 if (!page->canGoBackOrForward(steps)) 592 592 return EINA_FALSE; … … 595 595 } 596 596 597 Eina_Bool ewk_frame_back_possible(Evas_Object *o)597 Eina_Bool ewk_frame_back_possible(Evas_Object* o) 598 598 { 599 599 return ewk_frame_navigate_possible(o, -1); 600 600 } 601 601 602 Eina_Bool ewk_frame_forward_possible(Evas_Object *o)602 Eina_Bool ewk_frame_forward_possible(Evas_Object* o) 603 603 { 604 604 return ewk_frame_navigate_possible(o, 1); 605 605 } 606 606 607 Eina_Bool ewk_frame_navigate_possible(Evas_Object *o, int steps)607 Eina_Bool ewk_frame_navigate_possible(Evas_Object* o, int steps) 608 608 { 609 609 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 613 613 } 614 614 615 float ewk_frame_zoom_get(const Evas_Object *o)615 float ewk_frame_zoom_get(const Evas_Object* o) 616 616 { 617 617 EWK_FRAME_SD_GET_OR_RETURN(o, sd, -1.0); … … 623 623 } 624 624 625 Eina_Bool ewk_frame_zoom_set(Evas_Object *o, float zoom)625 Eina_Bool ewk_frame_zoom_set(Evas_Object* o, float zoom) 626 626 { 627 627 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 634 634 } 635 635 636 Eina_Bool ewk_frame_zoom_text_only_get(const Evas_Object *o)636 Eina_Bool ewk_frame_zoom_text_only_get(const Evas_Object* o) 637 637 { 638 638 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 640 640 } 641 641 642 Eina_Bool ewk_frame_zoom_text_only_set(Evas_Object *o, Eina_Bool setting)642 Eina_Bool ewk_frame_zoom_text_only_set(Evas_Object* o, Eina_Bool setting) 643 643 { 644 644 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 656 656 } 657 657 658 void ewk_frame_hit_test_free(Ewk_Hit_Test *hit_test)658 void ewk_frame_hit_test_free(Ewk_Hit_Test* hit_test) 659 659 { 660 660 EINA_SAFETY_ON_NULL_RETURN(hit_test); … … 669 669 } 670 670 671 Ewk_Hit_Test *ewk_frame_hit_test_new(const Evas_Object *o, int x, int y)671 Ewk_Hit_Test* ewk_frame_hit_test_new(const Evas_Object* o, int x, int y) 672 672 { 673 673 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 679 679 680 680 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); 683 683 684 684 if (result.scrollbar()) … … 687 687 return 0; 688 688 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)); 690 690 if (!hit_test) { 691 691 CRITICAL("Could not allocate memory for hit test."); … … 742 742 743 743 Eina_Bool 744 ewk_frame_scroll_add(Evas_Object *o, int dx, int dy)744 ewk_frame_scroll_add(Evas_Object* o, int dx, int dy) 745 745 { 746 746 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 752 752 753 753 Eina_Bool 754 ewk_frame_scroll_set(Evas_Object *o, int x, int y)754 ewk_frame_scroll_set(Evas_Object* o, int x, int y) 755 755 { 756 756 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 762 762 763 763 Eina_Bool 764 ewk_frame_scroll_size_get(const Evas_Object *o, int *w, int *h)764 ewk_frame_scroll_size_get(const Evas_Object* o, int* w, int* h) 765 765 { 766 766 if (w) … … 780 780 781 781 Eina_Bool 782 ewk_frame_scroll_pos_get(const Evas_Object *o, int *x, int *y)782 ewk_frame_scroll_pos_get(const Evas_Object* o, int* x, int* y) 783 783 { 784 784 if (x) … … 797 797 } 798 798 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)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) 800 800 { 801 801 if (x) … … 822 822 } 823 823 824 Eina_Bool ewk_frame_paint_full_get(const Evas_Object *o)824 Eina_Bool ewk_frame_paint_full_get(const Evas_Object* o) 825 825 { 826 826 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 830 830 } 831 831 832 void ewk_frame_paint_full_set(Evas_Object *o, Eina_Bool flag)832 void ewk_frame_paint_full_set(Evas_Object* o, Eina_Bool flag) 833 833 { 834 834 EWK_FRAME_SD_GET_OR_RETURN(o, sd); … … 838 838 } 839 839 840 Eina_Bool ewk_frame_feed_focus_in(Evas_Object *o)840 Eina_Bool ewk_frame_feed_focus_in(Evas_Object* o) 841 841 { 842 842 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 847 847 } 848 848 849 Eina_Bool ewk_frame_feed_focus_out(Evas_Object *o)849 Eina_Bool ewk_frame_feed_focus_out(Evas_Object* o) 850 850 { 851 851 // TODO: what to do on focus out? … … 854 854 } 855 855 856 Eina_Bool ewk_frame_feed_mouse_wheel(Evas_Object *o, const Evas_Event_Mouse_Wheel *ev)856 Eina_Bool ewk_frame_feed_mouse_wheel(Evas_Object* o, const Evas_Event_Mouse_Wheel* ev) 857 857 { 858 858 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 869 869 } 870 870 871 Eina_Bool ewk_frame_feed_mouse_down(Evas_Object *o, const Evas_Event_Mouse_Down *ev)871 Eina_Bool ewk_frame_feed_mouse_down(Evas_Object* o, const Evas_Event_Mouse_Down* ev) 872 872 { 873 873 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 887 887 } 888 888 889 Eina_Bool ewk_frame_feed_mouse_up(Evas_Object *o, const Evas_Event_Mouse_Up *ev)889 Eina_Bool ewk_frame_feed_mouse_up(Evas_Object* o, const Evas_Event_Mouse_Up* ev) 890 890 { 891 891 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 893 893 EINA_SAFETY_ON_NULL_RETURN_VAL(ev, EINA_FALSE); 894 894 895 WebCore::FrameView *view = sd->frame->view();895 WebCore::FrameView* view = sd->frame->view(); 896 896 DBG("o=%p, view=%p, button=%d, pos=%d,%d", 897 897 o, view, ev->button, ev->canvas.x, ev->canvas.y); … … 905 905 } 906 906 907 Eina_Bool ewk_frame_feed_mouse_move(Evas_Object *o, const Evas_Event_Mouse_Move *ev)907 Eina_Bool ewk_frame_feed_mouse_move(Evas_Object* o, const Evas_Event_Mouse_Move* ev) 908 908 { 909 909 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 924 924 } 925 925 926 Eina_Bool ewk_frame_feed_touch_event(Evas_Object *o, Ewk_Touch_Event_Type action, Eina_List *points, int metaState)926 Eina_Bool ewk_frame_feed_touch_event(Evas_Object* o, Ewk_Touch_Event_Type action, Eina_List* points, int metaState) 927 927 { 928 928 Eina_Bool ret = EINA_FALSE; … … 962 962 } 963 963 964 static inline Eina_Bool _ewk_frame_handle_key_scrolling(WebCore::Frame *frame, const WebCore::PlatformKeyboardEvent &event)964 static inline Eina_Bool _ewk_frame_handle_key_scrolling(WebCore::Frame* frame, const WebCore::PlatformKeyboardEvent& event) 965 965 { 966 966 WebCore::ScrollDirection direction; … … 1010 1010 case VK_DOWN: 1011 1011 direction = WebCore::ScrollDown; 1012 1012 if (event.ctrlKey()) 1013 1013 granularity = WebCore::ScrollByDocument; 1014 1014 else … … 1026 1026 } 1027 1027 1028 Eina_Bool ewk_frame_feed_key_down(Evas_Object *o, const Evas_Event_Key_Down *ev)1028 Eina_Bool ewk_frame_feed_key_down(Evas_Object* o, const Evas_Event_Key_Down* ev) 1029 1029 { 1030 1030 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1042 1042 } 1043 1043 1044 Eina_Bool ewk_frame_feed_key_up(Evas_Object *o, const Evas_Event_Key_Up *ev)1044 Eina_Bool ewk_frame_feed_key_up(Evas_Object* o, const Evas_Event_Key_Up* ev) 1045 1045 { 1046 1046 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1055 1055 } 1056 1056 1057 Ewk_Text_Selection_Type ewk_frame_text_selection_type_get(const Evas_Object *o)1057 Ewk_Text_Selection_Type ewk_frame_text_selection_type_get(const Evas_Object* o) 1058 1058 { 1059 1059 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EWK_TEXT_SELECTION_NONE); 1060 1060 EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EWK_TEXT_SELECTION_NONE); 1061 1061 1062 WebCore::FrameSelection *controller = sd->frame->selection();1062 WebCore::FrameSelection* controller = sd->frame->selection(); 1063 1063 if (!controller) 1064 1064 return EWK_TEXT_SELECTION_NONE; … … 1089 1089 * @return a new frame object or @c 0 on failure 1090 1090 */ 1091 Evas_Object *ewk_frame_add(Evas *e)1091 Evas_Object* ewk_frame_add(Evas* e) 1092 1092 { 1093 1093 return evas_object_smart_add(e, _ewk_frame_smart_class_new()); … … 1101 1101 * This is internal and should never be called by external users. 1102 1102 */ 1103 Eina_Bool ewk_frame_init(Evas_Object *o, Evas_Object *view, WebCore::Frame *frame)1103 Eina_Bool ewk_frame_init(Evas_Object* o, Evas_Object* view, WebCore::Frame* frame) 1104 1104 { 1105 1105 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1123 1123 * Adds child to the frame. 1124 1124 */ 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)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) 1126 1126 { 1127 1127 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); 1128 1128 char buf[256]; 1129 Evas_Object *frame;1129 Evas_Object* frame; 1130 1130 WebCore::Frame* cf; 1131 1131 … … 1192 1192 * Frame was destroyed by loader, remove internal reference. 1193 1193 */ 1194 void ewk_frame_core_gone(Evas_Object *o)1194 void ewk_frame_core_gone(Evas_Object* o) 1195 1195 { 1196 1196 DBG("o=%p", o); … … 1206 1206 * actions instead. 1207 1207 */ 1208 WebCore::Frame* ewk_frame_core_get(const Evas_Object *o)1208 WebCore::Frame* ewk_frame_core_get(const Evas_Object* o) 1209 1209 { 1210 1210 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 1225 1225 * Emits signal: "resource,request,willsend" 1226 1226 */ 1227 void ewk_frame_request_will_send(Evas_Object *o, Ewk_Frame_Resource_Request *request)1227 void ewk_frame_request_will_send(Evas_Object* o, Ewk_Frame_Resource_Request* request) 1228 1228 { 1229 1229 evas_object_smart_callback_call(o, "resource,request,willsend", request); … … 1239 1239 * Emits signal: "resource,request,new" 1240 1240 */ 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 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); 1244 1244 } 1245 1245 … … 1252 1252 * Emits signal: "navigation,first" 1253 1253 */ 1254 void ewk_frame_did_perform_first_navigation(Evas_Object *o)1254 void ewk_frame_did_perform_first_navigation(Evas_Object* o) 1255 1255 { 1256 1256 evas_object_smart_callback_call(o, "navigation,first", 0); … … 1266 1266 * Emits signal: "state,save" 1267 1267 */ 1268 void ewk_frame_view_state_save(Evas_Object *o, WebCore::HistoryItem *item)1268 void ewk_frame_view_state_save(Evas_Object* o, WebCore::HistoryItem* item) 1269 1269 { 1270 1270 evas_object_smart_callback_call(o, "state,save", 0); … … 1277 1277 * Emits signal: "load,started" with no parameters. 1278 1278 */ 1279 void ewk_frame_load_started(Evas_Object *o)1280 { 1281 Evas_Object *main_frame;1279 void ewk_frame_load_started(Evas_Object* o) 1280 { 1281 Evas_Object* main_frame; 1282 1282 DBG("o=%p", o); 1283 1283 evas_object_smart_callback_call(o, "load,started", 0); … … 1298 1298 * Emits signal: "load,provisional" with no parameters. 1299 1299 */ 1300 void ewk_frame_load_provisional(Evas_Object *o)1300 void ewk_frame_load_provisional(Evas_Object* o) 1301 1301 { 1302 1302 evas_object_smart_callback_call(o, "load,provisional", 0); … … 1311 1311 * Emits signal: "load,firstlayout,finished" with no parameters. 1312 1312 */ 1313 void ewk_frame_load_firstlayout_finished(Evas_Object *o)1313 void ewk_frame_load_firstlayout_finished(Evas_Object* o) 1314 1314 { 1315 1315 evas_object_smart_callback_call(o, "load,firstlayout,finished", 0); … … 1324 1324 * Emits signal: "load,nonemptylayout,finished" with no parameters. 1325 1325 */ 1326 void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object *o)1326 void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* o) 1327 1327 { 1328 1328 evas_object_smart_callback_call(o, "load,nonemptylayout,finished", 0); … … 1337 1337 * Emits signal: "load,document,finished" with no parameters. 1338 1338 */ 1339 void ewk_frame_load_document_finished(Evas_Object *o)1339 void ewk_frame_load_document_finished(Evas_Object* o) 1340 1340 { 1341 1341 evas_object_smart_callback_call(o, "load,document,finished", 0); … … 1352 1352 * compatible with previous WebKit. 1353 1353 */ 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;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; 1357 1357 if (!error_domain) { 1358 1358 DBG("o=%p, success.", o); … … 1382 1382 * Emits signal: "load,error" with pointer to Ewk_Frame_Load_Error. 1383 1383 */ 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)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) 1385 1385 { 1386 1386 Ewk_Frame_Load_Error error; … … 1409 1409 * Emits signal: "load,progress" with pointer to a double from 0.0 to 1.0. 1410 1410 */ 1411 void ewk_frame_load_progress_changed(Evas_Object *o)1411 void ewk_frame_load_progress_changed(Evas_Object* o) 1412 1412 { 1413 1413 EWK_FRAME_SD_GET_OR_RETURN(o, sd); … … 1429 1429 * Reports contents size changed. 1430 1430 */ 1431 void ewk_frame_contents_size_changed(Evas_Object *o, Evas_Coord w, Evas_Coord h)1431 void ewk_frame_contents_size_changed(Evas_Object* o, Evas_Coord w, Evas_Coord h) 1432 1432 { 1433 1433 DBG("o=%p: %dx%d", o, w, h); … … 1448 1448 * Reports title changed. 1449 1449 */ 1450 void ewk_frame_title_set(Evas_Object *o, const char *title)1450 void ewk_frame_title_set(Evas_Object* o, const char* title) 1451 1451 { 1452 1452 DBG("o=%p, title=%s", o, title ? title : "(null)"); … … 1454 1454 if (!eina_stringshare_replace(&sd->title, title)) 1455 1455 return; 1456 evas_object_smart_callback_call(o, "title,changed", (void 1456 evas_object_smart_callback_call(o, "title,changed", (void*)sd->title); 1457 1457 } 1458 1458 … … 1462 1462 * Creates a view. 1463 1463 */ 1464 void ewk_frame_view_create_for_view(Evas_Object *o, Evas_Object *view)1464 void ewk_frame_view_create_for_view(Evas_Object* o, Evas_Object* view) 1465 1465 { 1466 1466 DBG("o=%p, view=%p", o, view); … … 1487 1487 return; 1488 1488 1489 const char *theme = ewk_view_theme_get(view);1489 const char* theme = ewk_view_theme_get(view); 1490 1490 sd->frame->view()->setEdjeTheme(theme); 1491 1491 sd->frame->view()->setEvasObject(o); 1492 1492 } 1493 1493 1494 ssize_t ewk_frame_source_get(const Evas_Object *o, char **frame_source)1494 ssize_t ewk_frame_source_get(const Evas_Object* o, char** frame_source) 1495 1495 { 1496 1496 EWK_FRAME_SD_GET_OR_RETURN(o, sd, -1); … … 1509 1509 1510 1510 // 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(); 1512 1512 if (documentNode) 1513 for (WebCore::Node *node = documentNode->firstChild(); node; node = node->parentElement()) {1513 for (WebCore::Node* node = documentNode->firstChild(); node; node = node->parentElement()) { 1514 1514 if (node->hasTagName(WebCore::HTMLNames::htmlTag)) { 1515 WebCore::HTMLElement *element = static_cast<WebCore::HTMLElement*>(node);1515 WebCore::HTMLElement* element = static_cast<WebCore::HTMLElement*>(node); 1516 1516 if (element) 1517 1517 source = element->outerHTML(); … … 1542 1542 } 1543 1543 1544 Eina_List *ewk_frame_resources_location_get(const Evas_Object *o)1544 Eina_List* ewk_frame_resources_location_get(const Evas_Object* o) 1545 1545 { 1546 1546 EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0); … … 1548 1548 EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->document(), 0); 1549 1549 1550 Eina_List *listOfImagesLocation = 0;1550 Eina_List* listOfImagesLocation = 0; 1551 1551 1552 1552 // Get src attibute of images and saves them to the Eina_List. 1553 1553 RefPtr<WebCore::HTMLCollection> images = sd->frame->document()->images(); 1554 1554 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)); 1556 1556 if (!imageElement || imageElement->src().isNull() || imageElement->src().isEmpty()) 1557 1557 continue; … … 1559 1559 WTF::String imageLocation = imageElement->src().string(); 1560 1560 // Look for duplicated location. 1561 Eina_List *listIterator = 0;1562 void *data = 0;1561 Eina_List* listIterator = 0; 1562 void* data = 0; 1563 1563 Eina_Bool found = EINA_FALSE; 1564 1564 EINA_LIST_FOREACH(listOfImagesLocation, listIterator, data) … … 1568 1568 continue; 1569 1569 1570 char *imageLocationCopy = strdup(imageLocation.utf8().data());1570 char* imageLocationCopy = strdup(imageLocation.utf8().data()); 1571 1571 if (!imageLocationCopy) 1572 1572 goto out_of_memory_handler; … … 1580 1580 out_of_memory_handler: 1581 1581 CRITICAL("Could not allocate memory."); 1582 void *data;1582 void* data; 1583 1583 EINA_LIST_FREE(listOfImagesLocation, data) 1584 1584 free(data); … … 1592 1592 * Emits signal: "uri,changed" with new uri as parameter. 1593 1593 */ 1594 Eina_Bool ewk_frame_uri_changed(Evas_Object *o)1594 Eina_Bool ewk_frame_uri_changed(Evas_Object* o) 1595 1595 { 1596 1596 EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1614 1614 * Forces layout for frame. 1615 1615 */ 1616 void ewk_frame_force_layout(Evas_Object *o)1616 void ewk_frame_force_layout(Evas_Object* o) 1617 1617 { 1618 1618 DBG("o=%p", o); … … 1629 1629 * Creates plugin. 1630 1630 */ 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> ¶mNames, const WTF::Vector<WTF::String> ¶mValues, const WTF::String &mimeType, bool loadManually)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) 1632 1632 { 1633 1633 return 0; … … 1642 1642 * Emits signal: "editorclientselection,changed" with no parameters. 1643 1643 */ 1644 void ewk_frame_editor_client_selection_changed(Evas_Object *o)1644 void ewk_frame_editor_client_selection_changed(Evas_Object* o) 1645 1645 { 1646 1646 evas_object_smart_callback_call(o, "editorclient,selection,changed", 0); … … 1657 1657 * Emits signal: "editorclient,contents,changed" with no parameters. 1658 1658 */ 1659 void ewk_frame_editor_client_contents_changed(Evas_Object *o)1659 void ewk_frame_editor_client_contents_changed(Evas_Object* o) 1660 1660 { 1661 1661 evas_object_smart_callback_call(o, "editorclient,contents,changed", 0); -
trunk/Source/WebKit/efl/ewk/ewk_history.cpp
r93606 r95659 35 35 36 36 struct _Ewk_History { 37 WebCore::BackForwardListImpl *core;37 WebCore::BackForwardListImpl* core; 38 38 }; 39 39 … … 51 51 return __VA_ARGS__; \ 52 52 } \ 53 WebCore::BackForwardListImpl *core_ = (history)->core53 WebCore::BackForwardListImpl* core_ = (history)->core 54 54 55 55 56 56 struct _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; 63 63 }; 64 64 … … 72 72 return __VA_ARGS__; \ 73 73 } \ 74 WebCore::HistoryItem *core_ = (item)->core75 76 77 static inline Ewk_History_Item *_ewk_history_item_new(WebCore::HistoryItem *core)74 WebCore::HistoryItem* core_ = (item)->core 75 76 77 static inline Ewk_History_Item* _ewk_history_item_new(WebCore::HistoryItem* core) 78 78 { 79 79 Ewk_History_Item* item; … … 84 84 } 85 85 86 item = (Ewk_History_Item 86 item = (Ewk_History_Item*)calloc(1, sizeof(Ewk_History_Item)); 87 87 if (!item) { 88 88 CRITICAL("Could not allocate item memory."); … … 96 96 } 97 97 98 static inline Eina_List *_ewk_history_item_list_get(const WebCore::HistoryItemVector &core_items)98 static inline Eina_List* _ewk_history_item_list_get(const WebCore::HistoryItemVector& core_items) 99 99 { 100 100 Eina_List* ret = 0; … … 154 154 { 155 155 EWK_HISTORY_CORE_GET_OR_RETURN(history, core, 0); 156 WebCore::HistoryItem *currentItem = core->currentItem();156 WebCore::HistoryItem* currentItem = core->currentItem(); 157 157 if (currentItem) 158 158 return _ewk_history_item_new(currentItem); … … 323 323 { 324 324 EWK_HISTORY_ITEM_CORE_GET_OR_RETURN(item, core, 0); 325 325 326 326 WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(core->url(), WebCore::IntSize(16, 16)); 327 327 if (!icon) { -
trunk/Source/WebKit/efl/ewk/ewk_js.cpp
r93637 r95659 31 31 #define EINA_MAGIC_CHECK_OR_RETURN(o, ...) \ 32 32 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__; \ 35 35 } 36 36 -
trunk/Source/WebKit/efl/ewk/ewk_main.cpp
r94380 r95659 192 192 #if USE(SOUP) 193 193 if (1) { 194 SoupSession *session = WebCore::ResourceHandle::defaultSession();194 SoupSession* session = WebCore::ResourceHandle::defaultSession(); 195 195 soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_SNIFFER); 196 196 soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER); -
trunk/Source/WebKit/efl/ewk/ewk_network.cpp
r92473 r95659 31 31 #endif 32 32 33 void ewk_network_proxy_uri_set(const char *proxy)33 void ewk_network_proxy_uri_set(const char* proxy) 34 34 { 35 35 #if USE(SOUP) 36 SoupSession *session = WebCore::ResourceHandle::defaultSession();36 SoupSession* session = WebCore::ResourceHandle::defaultSession(); 37 37 38 38 if (!proxy) { … … 42 42 } 43 43 44 SoupURI *uri = soup_uri_new(proxy);44 SoupURI* uri = soup_uri_new(proxy); 45 45 EINA_SAFETY_ON_NULL_RETURN(uri); 46 46 … … 52 52 } 53 53 54 const char *ewk_network_proxy_uri_get(void)54 const char* ewk_network_proxy_uri_get(void) 55 55 { 56 56 #if USE(SOUP) 57 SoupURI *uri;58 SoupSession *session = WebCore::ResourceHandle::defaultSession();57 SoupURI* uri; 58 SoupSession* session = WebCore::ResourceHandle::defaultSession(); 59 59 g_object_get(session, SOUP_SESSION_PROXY_URI, &uri, NULL); 60 60 -
trunk/Source/WebKit/efl/ewk/ewk_private.h
r94965 r95659 56 56 struct _Ewk_JS_Object { 57 57 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_view58 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 62 62 Ewk_JS_Object_Type type; 63 63 EINA_MAGIC; … … 78 78 }; 79 79 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> ¶mNames, const WTF::Vector<WTF::String> ¶mValues, 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);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); 141 141 142 142 #if ENABLE(NETSCAPE_PLUGIN_API) 143 void ewk_view_js_window_object_clear(Evas_Object *o, Evas_Object *frame);143 void ewk_view_js_window_object_clear(Evas_Object* o, Evas_Object* frame); 144 144 #endif 145 145 … … 155 155 #endif 156 156 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);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); 162 162 163 163 #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> ¶mNames, const WTF::Vector<WTF::String> ¶mValues, 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);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); 217 217 218 218 const char* ewk_settings_default_user_agent_get(void); 219 219 220 void ewk_frame_editor_client_contents_changed(Evas_Object *o);221 void ewk_frame_editor_client_selection_changed(Evas_Object *o);220 void ewk_frame_editor_client_contents_changed(Evas_Object* o); 221 void ewk_frame_editor_client_selection_changed(Evas_Object* o); 222 222 223 223 #ifdef __cplusplus -
trunk/Source/WebKit/efl/ewk/ewk_protocol_handler_soup.h
r94965 r95659 43 43 typedef struct { 44 44 SoupRequest parent; 45 EwkProtocolHandlerPrivate *priv;45 EwkProtocolHandlerPrivate* priv; 46 46 } EwkCustomProtocolHandler; 47 47 -
trunk/Source/WebKit/efl/ewk/ewk_settings.cpp
r95271 r95659 90 90 } 91 91 92 void ewk_settings_web_database_path_set(const char *path)92 void ewk_settings_web_database_path_set(const char* path) 93 93 { 94 94 #if ENABLE(SQL_DATABASE) … … 103 103 } 104 104 105 const char *ewk_settings_web_database_path_get(void)105 const char* ewk_settings_web_database_path_get(void) 106 106 { 107 107 #if ENABLE(SQL_DATABASE) … … 112 112 } 113 113 114 Eina_Bool ewk_settings_icon_database_path_set(const char *directory)114 Eina_Bool ewk_settings_icon_database_path_set(const char* directory) 115 115 { 116 116 WebCore::IconDatabase::delayDatabaseCleanup(); … … 157 157 } 158 158 159 const char *ewk_settings_icon_database_path_get(void)159 const char* ewk_settings_icon_database_path_get(void) 160 160 { 161 161 if (!WebCore::iconDatabase().isEnabled()) … … 178 178 } 179 179 180 cairo_surface_t *ewk_settings_icon_database_icon_surface_get(const char *url)180 cairo_surface_t* ewk_settings_icon_database_icon_surface_get(const char* url) 181 181 { 182 182 EINA_SAFETY_ON_NULL_RETURN_VAL(url, 0); 183 183 184 184 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)); 186 186 187 187 if (!icon) { … … 193 193 } 194 194 195 Evas_Object *ewk_settings_icon_database_icon_object_add(const char *url, Evas *canvas)195 Evas_Object* ewk_settings_icon_database_icon_object_add(const char* url, Evas* canvas) 196 196 { 197 197 EINA_SAFETY_ON_NULL_RETURN_VAL(url, 0); … … 199 199 200 200 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; 203 203 204 204 if (!icon) { … … 246 246 * @return a pointer to an eina_stringshare containing the user agent string 247 247 */ 248 const char *ewk_settings_default_user_agent_get(void)248 const char* ewk_settings_default_user_agent_get(void) 249 249 { 250 250 WTF::String ua_version = makeString(String::number(WEBKIT_USER_AGENT_MAJOR_VERSION), '.', String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+'); … … 254 254 } 255 255 256 Eina_Bool ewk_settings_cache_directory_path_set(const char *path)256 Eina_Bool ewk_settings_cache_directory_path_set(const char* path) 257 257 { 258 258 #if ENABLE(OFFLINE_WEB_APPLICATIONS) … … 271 271 } 272 272 273 const char *ewk_settings_cache_directory_path_get()273 const char* ewk_settings_cache_directory_path_get() 274 274 { 275 275 #if ENABLE(OFFLINE_WEB_APPLICATIONS) -
trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.h
r94378 r95659 63 63 * repainted at all since it was not visible. 64 64 */ 65 Eina_Bool full_update :1; /**< tile requires full size update */65 Eina_Bool full_update : 1; /**< tile requires full size update */ 66 66 }; 67 67 68 68 struct _Ewk_Tile { 69 Eina_Tiler *updates; /**< updated/dirty areas */69 Eina_Tiler* updates; /**< updated/dirty areas */ 70 70 Ewk_Tile_Stats stats; /**< tile usage statistics */ 71 71 unsigned long col, row; /**< tile tile position */ … … 73 73 74 74 /* 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; 77 77 78 78 /** Never ever change those after tile is created (respect const!) */ … … 85 85 */ 86 86 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; 89 89 }; 90 90 … … 93 93 94 94 /* view */ 95 Evas_Object *ewk_tiled_backing_store_add(Evas *e);95 Evas_Object* ewk_tiled_backing_store_add(Evas* e); 96 96 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);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); 98 98 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);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); 102 102 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);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); 116 116 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);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); 119 119 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);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); 123 123 124 Eina_Bool ewk_tiled_backing_store_disable_render(Evas_Object *o);125 Eina_Bool ewk_tiled_backing_store_enable_render(Evas_Object *o);124 Eina_Bool ewk_tiled_backing_store_disable_render(Evas_Object* o); 125 Eina_Bool ewk_tiled_backing_store_enable_render(Evas_Object* o); 126 126 #ifdef __cplusplus 127 127 } -
trunk/Source/WebKit/efl/ewk/ewk_tiled_matrix.h
r93693 r95659 27 27 28 28 /* 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);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); 31 31 32 void ewk_tile_matrix_resize(Ewk_Tile_Matrix *tm, unsigned long cols, unsigned long rows);32 void ewk_tile_matrix_resize(Ewk_Tile_Matrix* tm, unsigned long cols, unsigned long rows); 33 33 34 Ewk_Tile_Unused_Cache *ewk_tile_matrix_unused_cache_get(const Ewk_Tile_Matrix *tm);34 Ewk_Tile_Unused_Cache* ewk_tile_matrix_unused_cache_get(const Ewk_Tile_Matrix* tm); 35 35 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);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); 41 41 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);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); 45 45 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);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); 51 51 52 52 // 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 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); 56 56 57 57 -
trunk/Source/WebKit/efl/ewk/ewk_tiled_model.h
r91974 r95659 27 27 28 28 /* 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);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); 39 39 40 40 /* 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);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); 46 46 47 void ewk_tile_unused_cache_dirty(Ewk_Tile_Unused_Cache *tuc);47 void ewk_tile_unused_cache_dirty(Ewk_Tile_Unused_Cache* tuc); 48 48 49 void ewk_tile_unused_cache_freeze(Ewk_Tile_Unused_Cache *tuc);50 void ewk_tile_unused_cache_thaw(Ewk_Tile_Unused_Cache *tuc);49 void ewk_tile_unused_cache_freeze(Ewk_Tile_Unused_Cache* tuc); 50 void ewk_tile_unused_cache_thaw(Ewk_Tile_Unused_Cache* tuc); 51 51 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);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); 54 54 55 55 #endif // ewk_tiled_model_h -
trunk/Source/WebKit/efl/ewk/ewk_tiled_private.h
r72579 r95659 51 51 #define REALLOC_OR_OOM_RET(ptr, size, ...) \ 52 52 do { \ 53 void *__tmp_ptr; \53 void* __tmp_ptr; \ 54 54 __tmp_ptr = realloc(ptr, size); \ 55 55 if (!__tmp_ptr && (size) > 0) { \ -
trunk/Source/WebKit/efl/ewk/ewk_util.cpp
r95627 r95659 38 38 * @return converted cairo_surface object to the Evas_Object 39 39 */ 40 Evas_Object *ewk_util_image_from_cairo_surface_add(Evas *canvas, cairo_surface_t *surface)40 Evas_Object* ewk_util_image_from_cairo_surface_add(Evas* canvas, cairo_surface_t* surface) 41 41 { 42 42 cairo_status_t status; … … 44 44 cairo_format_t format; 45 45 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; 49 49 50 50 EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0); … … 167 167 { 168 168 #ifdef HAVE_ECORE_X 169 169 return ecore_x_dpi_get(); 170 170 #else 171 171 return 160; 172 172 #endif 173 173 } -
trunk/Source/WebKit/efl/ewk/ewk_util.h
r91972 r95659 30 30 #include <cairo.h> 31 31 32 Evas_Object *ewk_util_image_from_cairo_surface_add(Evas *canvas, cairo_surface_t *surface);32 Evas_Object* ewk_util_image_from_cairo_surface_add(Evas* canvas, cairo_surface_t* surface); 33 33 34 34 #endif // ewk_util_h -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r95088 r95659 89 89 */ 90 90 struct _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; 94 94 WebCore::ViewportArguments viewport_arguments; 95 Ewk_History *history;95 Ewk_History* history; 96 96 struct { 97 97 void* context; … … 100 100 struct { 101 101 Ewk_Menu menu; 102 WebCore::PopupMenuClient *menu_client;102 WebCore::PopupMenuClient* menu_client; 103 103 } popup; 104 104 struct { 105 Eina_Rectangle *array;105 Eina_Rectangle* array; 106 106 size_t count; 107 107 size_t allocated; 108 108 } repaints; 109 109 struct { 110 Ewk_Scroll_Request *array;110 Ewk_Scroll_Request* array; 111 111 size_t count; 112 112 size_t allocated; … … 114 114 unsigned int imh; /**< input method hints */ 115 115 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; 118 118 } flags; 119 119 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; 126 126 int font_minimum_size; 127 127 int font_minimum_logical_size; 128 128 int font_default_size; 129 129 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; 153 153 struct { 154 154 float min_scale; 155 155 float max_scale; 156 Eina_Bool user_scalable :1;156 Eina_Bool user_scalable : 1; 157 157 } zoom_range; 158 158 float device_pixel_ratio; … … 173 173 Evas_Coord x, y; 174 174 } center; 175 Ecore_Animator *animator;175 Ecore_Animator* animator; 176 176 } animated_zoom; 177 177 }; … … 182 182 #define EWK_VIEW_TYPE_CHECK(o, ...) \ 183 183 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); \ 186 186 if (EINA_UNLIKELY(!_tmp_s)) { \ 187 187 EINA_LOG_CRIT \ 188 188 ("%p (%s) is not a smart object!", o, \ 189 189 _tmp_otype ? _tmp_otype : "(null)"); \ 190 190 return __VA_ARGS__; \ 191 191 } \ 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); \ 193 193 if (EINA_UNLIKELY(!_tmp_sc)) { \ 194 194 EINA_LOG_CRIT \ 195 195 ("%p (%s) is not a smart object!", o, \ 196 196 _tmp_otype ? _tmp_otype : "(null)"); \ 197 197 return __VA_ARGS__; \ 198 198 } \ … … 200 200 EINA_LOG_CRIT \ 201 201 ("%p (%s) is not of an ewk_view (need %p, got %p)!", \ 202 203 202 o, _tmp_otype ? _tmp_otype : "(null)", \ 203 EWK_VIEW_TYPE_STR, _tmp_sc->data); \ 204 204 return __VA_ARGS__; \ 205 205 } \ … … 208 208 209 209 #define EWK_VIEW_SD_GET(o, ptr) \ 210 Ewk_View_Smart_Data *ptr = (Ewk_View_Smart_Data 210 Ewk_View_Smart_Data *ptr = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o) 211 211 212 212 #define EWK_VIEW_SD_GET_OR_RETURN(o, ptr, ...) \ … … 230 230 } 231 231 232 static void _ewk_view_smart_changed(Ewk_View_Smart_Data *sd)232 static void _ewk_view_smart_changed(Ewk_View_Smart_Data* sd) 233 233 { 234 234 if (sd->changed.any) … … 238 238 } 239 239 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));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)); 243 243 if (!tmp) { 244 244 CRITICAL("could not realloc repaints array to %zu elements.", size); … … 246 246 } 247 247 priv->repaints.allocated = size; 248 priv->repaints.array = (Eina_Rectangle 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 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; 255 255 256 256 // fprintf(stderr, ">>> repaint requested: %d,%d+%dx%d\n", x, y, w, h); … … 276 276 } 277 277 278 static void _ewk_view_repaints_flush(Ewk_View_Private_Data *priv)278 static void _ewk_view_repaints_flush(Ewk_View_Private_Data* priv) 279 279 { 280 280 priv->repaints.count = 0; … … 284 284 } 285 285 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));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)); 289 289 if (!tmp) { 290 290 CRITICAL("could not realloc scrolls array to %zu elements.", size); … … 292 292 } 293 293 priv->scrolls.allocated = size; 294 priv->scrolls.array = (Ewk_Scroll_Request 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 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; 302 302 Evas_Coord x2 = x + w, y2 = y + h; 303 303 … … 346 346 DBG("add scroll in region: %d, %d+%dx%d %+03d, %+03d", x, y, w, h, dx, dy); 347 347 348 Eina_Rectangle *pr;349 Eina_Rectangle *pr_end;348 Eina_Rectangle* pr; 349 Eina_Rectangle* pr_end; 350 350 size_t count; 351 351 pr = priv->repaints.array; … … 358 358 } 359 359 360 static void _ewk_view_scrolls_flush(Ewk_View_Private_Data *priv)360 static void _ewk_view_scrolls_flush(Ewk_View_Private_Data* priv) 361 361 { 362 362 priv->scrolls.count = 0; … … 367 367 368 368 // Default Event Handling ////////////////////////////////////////////// 369 static Eina_Bool _ewk_view_smart_focus_in(Ewk_View_Smart_Data *sd)369 static Eina_Bool _ewk_view_smart_focus_in(Ewk_View_Smart_Data* sd) 370 370 { 371 371 EWK_VIEW_PRIV_GET(sd, priv); 372 WebCore::FocusController *fc = priv->page->focusController();372 WebCore::FocusController* fc = priv->page->focusController(); 373 373 DBG("o=%p, fc=%p", sd->self, fc); 374 374 EINA_SAFETY_ON_NULL_RETURN_VAL(fc, EINA_FALSE); … … 379 379 } 380 380 381 static Eina_Bool _ewk_view_smart_focus_out(Ewk_View_Smart_Data *sd)381 static Eina_Bool _ewk_view_smart_focus_out(Ewk_View_Smart_Data* sd) 382 382 { 383 383 EWK_VIEW_PRIV_GET(sd, priv); 384 WebCore::FocusController *fc = priv->page->focusController();384 WebCore::FocusController* fc = priv->page->focusController(); 385 385 DBG("o=%p, fc=%p", sd->self, fc); 386 386 EINA_SAFETY_ON_NULL_RETURN_VAL(fc, EINA_FALSE); … … 391 391 } 392 392 393 static Eina_Bool _ewk_view_smart_mouse_wheel(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Wheel *ev)393 static Eina_Bool _ewk_view_smart_mouse_wheel(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Wheel* ev) 394 394 { 395 395 return ewk_frame_feed_mouse_wheel(sd->main_frame, ev); 396 396 } 397 397 398 static Eina_Bool _ewk_view_smart_mouse_down(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Down *ev)398 static Eina_Bool _ewk_view_smart_mouse_down(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Down* ev) 399 399 { 400 400 return ewk_frame_feed_mouse_down(sd->main_frame, ev); 401 401 } 402 402 403 static Eina_Bool _ewk_view_smart_mouse_up(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Up *ev)403 static Eina_Bool _ewk_view_smart_mouse_up(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Up* ev) 404 404 { 405 405 return ewk_frame_feed_mouse_up(sd->main_frame, ev); 406 406 } 407 407 408 static Eina_Bool _ewk_view_smart_mouse_move(Ewk_View_Smart_Data *sd, const Evas_Event_Mouse_Move *ev)408 static Eina_Bool _ewk_view_smart_mouse_move(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Move* ev) 409 409 { 410 410 return ewk_frame_feed_mouse_move(sd->main_frame, ev); 411 411 } 412 412 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);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); 416 416 417 417 if (!frame) … … 421 421 } 422 422 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);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); 426 426 427 427 if (!frame) … … 431 431 } 432 432 433 static void _ewk_view_smart_add_console_message(Ewk_View_Smart_Data *sd, const char *message, unsigned int lineNumber, const char *sourceID)433 static void _ewk_view_smart_add_console_message(Ewk_View_Smart_Data* sd, const char* message, unsigned int lineNumber, const char* sourceID) 434 434 { 435 435 INF("console message: %s @%d: %s\n", sourceID, lineNumber, message); 436 436 } 437 437 438 static void _ewk_view_smart_run_javascript_alert(Ewk_View_Smart_Data *sd, Evas_Object *frame, const char *message)438 static void _ewk_view_smart_run_javascript_alert(Ewk_View_Smart_Data* sd, Evas_Object* frame, const char* message) 439 439 { 440 440 INF("javascript alert: %s\n", message); 441 441 } 442 442 443 static Eina_Bool _ewk_view_smart_run_javascript_confirm(Ewk_View_Smart_Data *sd, Evas_Object *frame, const char *message)443 static Eina_Bool _ewk_view_smart_run_javascript_confirm(Ewk_View_Smart_Data* sd, Evas_Object* frame, const char* message) 444 444 { 445 445 INF("javascript confirm: %s", message); … … 448 448 } 449 449 450 static Eina_Bool _ewk_view_smart_should_interrupt_javascript(Ewk_View_Smart_Data *sd)450 static Eina_Bool _ewk_view_smart_should_interrupt_javascript(Ewk_View_Smart_Data* sd) 451 451 { 452 452 INF("should interrupt javascript?\n" 453 453 "\t(HARD CODED) NO"); 454 454 return EINA_FALSE; 455 455 } 456 456 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)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) 458 458 { 459 459 *value = strdup("test"); 460 460 Eina_Bool ret = EINA_TRUE; 461 461 INF("javascript prompt:\n" 462 463 464 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"); 466 466 467 467 return ret; … … 469 469 470 470 // 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;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; 474 474 EINA_SAFETY_ON_NULL_RETURN(sd->api); 475 475 EINA_SAFETY_ON_NULL_RETURN(sd->api->focus_in); … … 477 477 } 478 478 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;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; 482 482 EINA_SAFETY_ON_NULL_RETURN(sd->api); 483 483 EINA_SAFETY_ON_NULL_RETURN(sd->api->focus_out); … … 485 485 } 486 486 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;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; 491 491 EINA_SAFETY_ON_NULL_RETURN(sd->api); 492 492 EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_wheel); … … 494 494 } 495 495 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;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; 500 500 EINA_SAFETY_ON_NULL_RETURN(sd->api); 501 501 EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_down); … … 503 503 } 504 504 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;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; 509 509 EINA_SAFETY_ON_NULL_RETURN(sd->api); 510 510 EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_up); … … 512 512 } 513 513 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;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; 518 518 EINA_SAFETY_ON_NULL_RETURN(sd->api); 519 519 EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_move); … … 521 521 } 522 522 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;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; 527 527 EINA_SAFETY_ON_NULL_RETURN(sd->api); 528 528 EINA_SAFETY_ON_NULL_RETURN(sd->api->key_down); … … 530 530 } 531 531 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;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; 536 536 EINA_SAFETY_ON_NULL_RETURN(sd->api); 537 537 EINA_SAFETY_ON_NULL_RETURN(sd->api->key_up); … … 539 539 } 540 540 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);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); 544 544 if (!flc) { 545 545 CRITICAL("Could not create frame loader client."); … … 553 553 static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL; 554 554 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 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)); 559 559 AtomicString s; 560 560 WebCore::KURL url; … … 612 612 613 613 priv->settings.encoding_default = eina_stringshare_add 614 (priv->page_settings->defaultTextEncodingName().utf8().data());614 (priv->page_settings->defaultTextEncodingName().utf8().data()); 615 615 priv->settings.encoding_custom = 0; 616 616 … … 672 672 } 673 673 674 priv->history = ewk_history_new(static_cast<WebCore::BackForwardListImpl 674 priv->history = ewk_history_new(static_cast<WebCore::BackForwardListImpl*>(priv->page->backForwardList())); 675 675 if (!priv->history) { 676 676 CRITICAL("Could not create history instance for view."); … … 690 690 } 691 691 692 static void _ewk_view_priv_del(Ewk_View_Private_Data *priv)692 static void _ewk_view_priv_del(Ewk_View_Private_Data* priv) 693 693 { 694 694 if (!priv) … … 721 721 } 722 722 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;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; 728 728 EINA_SAFETY_ON_NULL_RETURN(api->backing_store_add); 729 729 EWK_VIEW_SD_GET(o, sd); 730 730 731 731 if (!sd) { 732 sd = (Ewk_View_Smart_Data 732 sd = (Ewk_View_Smart_Data*)calloc(1, sizeof(Ewk_View_Smart_Data)); 733 733 if (!sd) { 734 734 CRITICAL("could not allocate Ewk_View_Smart_Data"); … … 801 801 } 802 802 803 static void _ewk_view_smart_del(Evas_Object *o)803 static void _ewk_view_smart_del(Evas_Object* o) 804 804 { 805 805 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; 807 807 808 808 ewk_view_stop(o); … … 811 811 } 812 812 813 static void _ewk_view_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)813 static void _ewk_view_smart_resize(Evas_Object* o, Evas_Coord w, Evas_Coord h) 814 814 { 815 815 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 822 822 } 823 823 824 static void _ewk_view_smart_move(Evas_Object *o, Evas_Coord x, Evas_Coord y)824 static void _ewk_view_smart_move(Evas_Object* o, Evas_Coord x, Evas_Coord y) 825 825 { 826 826 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 829 829 } 830 830 831 static void _ewk_view_smart_calculate(Evas_Object *o)831 static void _ewk_view_smart_calculate(Evas_Object* o) 832 832 { 833 833 EWK_VIEW_SD_GET(o, sd); … … 851 851 852 852 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(); 854 854 if (view) { 855 855 view->resize(w, h); … … 889 889 890 890 if (sd->changed.frame_rect) { 891 WebCore::FrameView *view = priv->main_frame->view();891 WebCore::FrameView* view = priv->main_frame->view(); 892 892 view->frameRectsChanged(); /* force tree to get position from root */ 893 893 sd->changed.frame_rect = EINA_FALSE; … … 895 895 } 896 896 897 static void _ewk_view_smart_show(Evas_Object *o)897 static void _ewk_view_smart_show(Evas_Object* o) 898 898 { 899 899 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 904 904 } 905 905 906 static void _ewk_view_smart_hide(Evas_Object *o)906 static void _ewk_view_smart_hide(Evas_Object* o) 907 907 { 908 908 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 912 912 } 913 913 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)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) 920 920 { 921 921 double px, py; … … 945 945 } 946 946 947 static void _ewk_view_smart_flush(Ewk_View_Smart_Data *sd)947 static void _ewk_view_smart_flush(Ewk_View_Smart_Data* sd) 948 948 { 949 949 EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv); … … 952 952 } 953 953 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)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) 955 955 { 956 956 WRN("not supported by engine. sd=%p area=%d,%d+%dx%d, zoom=%f", … … 959 959 } 960 960 961 static Eina_Bool _ewk_view_smart_pre_render_relative_radius(Ewk_View_Smart_Data *sd, unsigned int n, float zoom)961 static Eina_Bool _ewk_view_smart_pre_render_relative_radius(Ewk_View_Smart_Data* sd, unsigned int n, float zoom) 962 962 { 963 963 WRN("not supported by engine. sd=%p, n=%u zoom=%f", … … 966 966 } 967 967 968 static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data *sd)968 static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data* sd) 969 969 { 970 970 WRN("not supported by engine. sd=%p", sd); 971 971 } 972 972 973 static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data *sd)973 static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data* sd) 974 974 { 975 975 sd->animated_zoom.zoom.start = 0.0; … … 978 978 } 979 979 980 static void _ewk_view_zoom_animated_finish(Ewk_View_Smart_Data *sd)980 static void _ewk_view_zoom_animated_finish(Ewk_View_Smart_Data* sd) 981 981 { 982 982 EWK_VIEW_PRIV_GET(sd, priv); … … 987 987 } 988 988 989 static float _ewk_view_zoom_animated_current(Ewk_View_Private_Data *priv)989 static float _ewk_view_zoom_animated_current(Ewk_View_Private_Data* priv) 990 990 { 991 991 double now = ecore_loop_time_get(); … … 1003 1003 } 1004 1004 1005 static Eina_Bool _ewk_view_zoom_animator_cb(void *data)1006 { 1007 Ewk_View_Smart_Data *sd = (Ewk_View_Smart_Data*)data;1005 static Eina_Bool _ewk_view_zoom_animator_cb(void* data) 1006 { 1007 Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data; 1008 1008 Evas_Coord cx, cy; 1009 1009 EWK_VIEW_PRIV_GET(sd, priv); … … 1032 1032 } 1033 1033 1034 static void _ewk_view_zoom_animation_start(Ewk_View_Smart_Data *sd)1034 static void _ewk_view_zoom_animation_start(Ewk_View_Smart_Data* sd) 1035 1035 { 1036 1036 EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv); … … 1038 1038 return; 1039 1039 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 1043 static WebCore::ViewportAttributes _ewk_view_viewport_attributes_compute(const Evas_Object* o) 1044 1044 { 1045 1045 EWK_VIEW_SD_GET(o, sd); … … 1061 1061 } 1062 1062 1063 static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data *sd)1063 static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data* sd) 1064 1064 { 1065 1065 WRN("not supported by engine. sd=%p", sd); … … 1067 1067 } 1068 1068 1069 static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data *sd)1069 static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data* sd) 1070 1070 { 1071 1071 WRN("not supported by engine. sd=%p", sd); … … 1073 1073 } 1074 1074 1075 Eina_Bool ewk_view_base_smart_set(Ewk_View_Smart_Class *api)1075 Eina_Bool ewk_view_base_smart_set(Ewk_View_Smart_Class* api) 1076 1076 { 1077 1077 EINA_SAFETY_ON_NULL_RETURN_VAL(api, EINA_FALSE); … … 1080 1080 EINA_LOG_CRIT 1081 1081 ("Ewk_View_Smart_Class %p is version %lu while %lu was expected.", 1082 1082 api, api->version, EWK_VIEW_SMART_CLASS_VERSION); 1083 1083 return EINA_FALSE; 1084 1084 } … … 1124 1124 } 1125 1125 1126 void ewk_view_fixed_layout_size_set(Evas_Object *o, Evas_Coord w, Evas_Coord h)1126 void ewk_view_fixed_layout_size_set(Evas_Object* o, Evas_Coord w, Evas_Coord h) 1127 1127 { 1128 1128 EWK_VIEW_SD_GET_OR_RETURN(o, sd); 1129 1129 EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv); 1130 1130 1131 WebCore::FrameView *view = priv->main_frame->view();1131 WebCore::FrameView* view = priv->main_frame->view(); 1132 1132 if (w <= 0 && h <= 0) { 1133 1133 if (!view->useFixedLayout()) … … 1148 1148 } 1149 1149 1150 void ewk_view_fixed_layout_size_get(const Evas_Object *o, Evas_Coord *w, Evas_Coord *h)1150 void ewk_view_fixed_layout_size_get(const Evas_Object* o, Evas_Coord* w, Evas_Coord* h) 1151 1151 { 1152 1152 if (w) … … 1166 1166 } 1167 1167 1168 void ewk_view_theme_set(Evas_Object *o, const char *path)1168 void ewk_view_theme_set(Evas_Object* o, const char* path) 1169 1169 { 1170 1170 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 1173 1173 return; 1174 1174 1175 WebCore::FrameView *view = priv->main_frame->view();1175 WebCore::FrameView* view = priv->main_frame->view(); 1176 1176 if (view) { 1177 1177 view->setEdjeTheme(WTF::String(path)); … … 1181 1181 } 1182 1182 1183 const char* ewk_view_theme_get(const Evas_Object *o)1183 const char* ewk_view_theme_get(const Evas_Object* o) 1184 1184 { 1185 1185 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1188 1188 } 1189 1189 1190 Evas_Object* ewk_view_frame_main_get(const Evas_Object *o)1190 Evas_Object* ewk_view_frame_main_get(const Evas_Object* o) 1191 1191 { 1192 1192 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1194 1194 } 1195 1195 1196 Evas_Object* ewk_view_frame_focused_get(const Evas_Object *o)1196 Evas_Object* ewk_view_frame_focused_get(const Evas_Object* o) 1197 1197 { 1198 1198 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); 1199 1199 EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0); 1200 1200 1201 WebCore::Frame *core = priv->page->focusController()->focusedFrame();1201 WebCore::Frame* core = priv->page->focusController()->focusedFrame(); 1202 1202 if (!core) 1203 1203 return 0; … … 1209 1209 } 1210 1210 1211 Eina_Bool ewk_view_uri_set(Evas_Object *o, const char *uri)1211 Eina_Bool ewk_view_uri_set(Evas_Object* o, const char* uri) 1212 1212 { 1213 1213 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1215 1215 } 1216 1216 1217 const char *ewk_view_uri_get(const Evas_Object *o)1217 const char* ewk_view_uri_get(const Evas_Object* o) 1218 1218 { 1219 1219 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1221 1221 } 1222 1222 1223 const char *ewk_view_title_get(const Evas_Object *o)1223 const char* ewk_view_title_get(const Evas_Object* o) 1224 1224 { 1225 1225 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1227 1227 } 1228 1228 1229 Eina_Bool ewk_view_editable_get(const Evas_Object *o)1229 Eina_Bool ewk_view_editable_get(const Evas_Object* o) 1230 1230 { 1231 1231 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1233 1233 } 1234 1234 1235 void ewk_view_bg_color_set(Evas_Object *o, int r, int g, int b, int a)1235 void ewk_view_bg_color_set(Evas_Object* o, int r, int g, int b, int a) 1236 1236 { 1237 1237 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 1249 1249 #define CHECK_PREMUL_COLOR(c, a) \ 1250 1250 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); \ 1252 1252 c = 0; \ 1253 1253 } 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).", \ 1255 1255 c, a); \ 1256 1256 c = a; \ … … 1268 1268 sd->api->bg_color_set(sd, r, g, b, a); 1269 1269 1270 WebCore::FrameView *view = sd->_priv->main_frame->view();1270 WebCore::FrameView* view = sd->_priv->main_frame->view(); 1271 1271 if (view) { 1272 1272 WebCore::Color color; … … 1283 1283 } 1284 1284 1285 void ewk_view_bg_color_get(const Evas_Object *o, int *r, int *g, int *b, int *a)1285 void ewk_view_bg_color_get(const Evas_Object* o, int* r, int* g, int* b, int* a) 1286 1286 { 1287 1287 if (r) … … 1304 1304 } 1305 1305 1306 Eina_Bool ewk_view_text_search(const Evas_Object *o, const char *string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap)1306 Eina_Bool ewk_view_text_search(const Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap) 1307 1307 { 1308 1308 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1336 1336 * @return number of matches. 1337 1337 */ 1338 unsigned int ewk_view_text_matches_mark(Evas_Object *o, const char *string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit)1338 unsigned int ewk_view_text_matches_mark(Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit) 1339 1339 { 1340 1340 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1351 1351 } 1352 1352 1353 Eina_Bool ewk_view_text_matches_unmark_all(Evas_Object *o)1353 Eina_Bool ewk_view_text_matches_unmark_all(Evas_Object* o) 1354 1354 { 1355 1355 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1359 1359 } 1360 1360 1361 Eina_Bool ewk_view_text_matches_highlight_set(Evas_Object *o, Eina_Bool highlight)1361 Eina_Bool ewk_view_text_matches_highlight_set(Evas_Object* o, Eina_Bool highlight) 1362 1362 { 1363 1363 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1365 1365 } 1366 1366 1367 Eina_Bool ewk_view_text_matches_highlight_get(const Evas_Object *o)1367 Eina_Bool ewk_view_text_matches_highlight_get(const Evas_Object* o) 1368 1368 { 1369 1369 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1371 1371 } 1372 1372 1373 Eina_Bool ewk_view_editable_set(Evas_Object *o, Eina_Bool editable)1373 Eina_Bool ewk_view_editable_set(Evas_Object* o, Eina_Bool editable) 1374 1374 { 1375 1375 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1377 1377 } 1378 1378 1379 char *ewk_view_selection_get(const Evas_Object *o)1379 char* ewk_view_selection_get(const Evas_Object* o) 1380 1380 { 1381 1381 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1387 1387 } 1388 1388 1389 static Eina_Bool _ewk_view_editor_command(Ewk_View_Private_Data *priv, const char *command, const char *value = 0)1389 static Eina_Bool _ewk_view_editor_command(Ewk_View_Private_Data* priv, const char* command, const char* value = 0) 1390 1390 { 1391 1391 return priv->page->focusController()->focusedOrMainFrame()->editor()->command(WTF::String::fromUTF8(command)).execute(value); 1392 1392 } 1393 1393 1394 Eina_Bool ewk_view_execute_editor_command(Evas_Object *o, const Ewk_Editor_Command command, const char *value)1394 Eina_Bool ewk_view_execute_editor_command(Evas_Object* o, const Ewk_Editor_Command command, const char* value) 1395 1395 { 1396 1396 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1419 1419 } 1420 1420 1421 Eina_Bool ewk_view_context_menu_forward_event(Evas_Object *o, const Evas_Event_Mouse_Down *ev)1421 Eina_Bool ewk_view_context_menu_forward_event(Evas_Object* o, const Evas_Event_Mouse_Down* ev) 1422 1422 { 1423 1423 #if ENABLE(CONTEXT_MENUS) … … 1427 1427 1428 1428 priv->page->contextMenuController()->clearContextMenu(); 1429 WebCore::Frame *main_frame = priv->page->mainFrame();1429 WebCore::Frame* main_frame = priv->page->mainFrame(); 1430 1430 Evas_Coord x, y; 1431 1431 evas_object_geometry_get(sd->self, &x, &y, 0, 0); … … 1455 1455 } 1456 1456 1457 double ewk_view_load_progress_get(const Evas_Object *o)1457 double ewk_view_load_progress_get(const Evas_Object* o) 1458 1458 { 1459 1459 EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0); … … 1462 1462 } 1463 1463 1464 Eina_Bool ewk_view_stop(Evas_Object *o)1464 Eina_Bool ewk_view_stop(Evas_Object* o) 1465 1465 { 1466 1466 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1468 1468 } 1469 1469 1470 Eina_Bool ewk_view_reload(Evas_Object *o)1470 Eina_Bool ewk_view_reload(Evas_Object* o) 1471 1471 { 1472 1472 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1474 1474 } 1475 1475 1476 Eina_Bool ewk_view_reload_full(Evas_Object *o)1476 Eina_Bool ewk_view_reload_full(Evas_Object* o) 1477 1477 { 1478 1478 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1480 1480 } 1481 1481 1482 Eina_Bool ewk_view_back(Evas_Object *o)1482 Eina_Bool ewk_view_back(Evas_Object* o) 1483 1483 { 1484 1484 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1486 1486 } 1487 1487 1488 Eina_Bool ewk_view_forward(Evas_Object *o)1488 Eina_Bool ewk_view_forward(Evas_Object* o) 1489 1489 { 1490 1490 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1492 1492 } 1493 1493 1494 Eina_Bool ewk_view_navigate(Evas_Object *o, int steps)1494 Eina_Bool ewk_view_navigate(Evas_Object* o, int steps) 1495 1495 { 1496 1496 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1498 1498 } 1499 1499 1500 Eina_Bool ewk_view_back_possible(Evas_Object *o)1500 Eina_Bool ewk_view_back_possible(Evas_Object* o) 1501 1501 { 1502 1502 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1504 1504 } 1505 1505 1506 Eina_Bool ewk_view_forward_possible(Evas_Object *o)1506 Eina_Bool ewk_view_forward_possible(Evas_Object* o) 1507 1507 { 1508 1508 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1510 1510 } 1511 1511 1512 Eina_Bool ewk_view_navigate_possible(Evas_Object *o, int steps)1512 Eina_Bool ewk_view_navigate_possible(Evas_Object* o, int steps) 1513 1513 { 1514 1514 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1516 1516 } 1517 1517 1518 Eina_Bool ewk_view_history_enable_get(const Evas_Object *o)1518 Eina_Bool ewk_view_history_enable_get(const Evas_Object* o) 1519 1519 { 1520 1520 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1523 1523 } 1524 1524 1525 Eina_Bool ewk_view_history_enable_set(Evas_Object *o, Eina_Bool enable)1525 Eina_Bool ewk_view_history_enable_set(Evas_Object* o, Eina_Bool enable) 1526 1526 { 1527 1527 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1531 1531 } 1532 1532 1533 Ewk_History* ewk_view_history_get(const Evas_Object *o)1533 Ewk_History* ewk_view_history_get(const Evas_Object* o) 1534 1534 { 1535 1535 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1542 1542 } 1543 1543 1544 float ewk_view_zoom_get(const Evas_Object *o)1544 float ewk_view_zoom_get(const Evas_Object* o) 1545 1545 { 1546 1546 EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0); … … 1548 1548 } 1549 1549 1550 Eina_Bool ewk_view_zoom_set(Evas_Object *o, float zoom, Evas_Coord cx, Evas_Coord cy)1550 Eina_Bool ewk_view_zoom_set(Evas_Object* o, float zoom, Evas_Coord cx, Evas_Coord cy) 1551 1551 { 1552 1552 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1574 1574 } 1575 1575 1576 Eina_Bool ewk_view_zoom_weak_smooth_scale_get(const Evas_Object *o)1576 Eina_Bool ewk_view_zoom_weak_smooth_scale_get(const Evas_Object* o) 1577 1577 { 1578 1578 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1580 1580 } 1581 1581 1582 void ewk_view_zoom_weak_smooth_scale_set(Evas_Object *o, Eina_Bool smooth_scale)1582 void ewk_view_zoom_weak_smooth_scale_set(Evas_Object* o, Eina_Bool smooth_scale) 1583 1583 { 1584 1584 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 1592 1592 } 1593 1593 1594 Eina_Bool ewk_view_zoom_weak_set(Evas_Object *o, float zoom, Evas_Coord cx, Evas_Coord cy)1594 Eina_Bool ewk_view_zoom_weak_set(Evas_Object* o, float zoom, Evas_Coord cx, Evas_Coord cy) 1595 1595 { 1596 1596 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1620 1620 } 1621 1621 1622 Eina_Bool ewk_view_zoom_animated_mark_start(Evas_Object *o, float zoom)1622 Eina_Bool ewk_view_zoom_animated_mark_start(Evas_Object* o, float zoom) 1623 1623 { 1624 1624 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1627 1627 } 1628 1628 1629 Eina_Bool ewk_view_zoom_animated_mark_end(Evas_Object *o, float zoom)1629 Eina_Bool ewk_view_zoom_animated_mark_end(Evas_Object* o, float zoom) 1630 1630 { 1631 1631 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1634 1634 } 1635 1635 1636 Eina_Bool ewk_view_zoom_animated_mark_current(Evas_Object *o, float zoom)1636 Eina_Bool ewk_view_zoom_animated_mark_current(Evas_Object* o, float zoom) 1637 1637 { 1638 1638 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1641 1641 } 1642 1642 1643 Eina_Bool ewk_view_zoom_animated_mark_stop(Evas_Object *o)1643 Eina_Bool ewk_view_zoom_animated_mark_stop(Evas_Object* o) 1644 1644 { 1645 1645 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1648 1648 } 1649 1649 1650 Eina_Bool ewk_view_zoom_animated_set(Evas_Object *o, float zoom, float duration, Evas_Coord cx, Evas_Coord cy)1650 Eina_Bool ewk_view_zoom_animated_set(Evas_Object* o, float zoom, float duration, Evas_Coord cx, Evas_Coord cy) 1651 1651 { 1652 1652 double now; … … 1697 1697 } 1698 1698 1699 Eina_Bool ewk_view_zoom_text_only_get(const Evas_Object *o)1699 Eina_Bool ewk_view_zoom_text_only_get(const Evas_Object* o) 1700 1700 { 1701 1701 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1703 1703 } 1704 1704 1705 Eina_Bool ewk_view_zoom_text_only_set(Evas_Object *o, Eina_Bool setting)1705 Eina_Bool ewk_view_zoom_text_only_set(Evas_Object* o, Eina_Bool setting) 1706 1706 { 1707 1707 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1709 1709 } 1710 1710 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)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) 1712 1712 { 1713 1713 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1752 1752 } 1753 1753 1754 Eina_Bool ewk_view_pre_render_relative_radius(Evas_Object *o, unsigned int n)1754 Eina_Bool ewk_view_pre_render_relative_radius(Evas_Object* o, unsigned int n) 1755 1755 { 1756 1756 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1766 1766 } 1767 1767 1768 unsigned int ewk_view_imh_get(const Evas_Object *o)1768 unsigned int ewk_view_imh_get(const Evas_Object* o) 1769 1769 { 1770 1770 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1773 1773 } 1774 1774 1775 void ewk_view_pre_render_cancel(Evas_Object *o)1775 void ewk_view_pre_render_cancel(Evas_Object* o) 1776 1776 { 1777 1777 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 1780 1780 } 1781 1781 1782 Eina_Bool ewk_view_enable_render(const Evas_Object *o)1782 Eina_Bool ewk_view_enable_render(const Evas_Object* o) 1783 1783 { 1784 1784 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1787 1787 } 1788 1788 1789 Eina_Bool ewk_view_disable_render(const Evas_Object *o)1789 Eina_Bool ewk_view_disable_render(const Evas_Object* o) 1790 1790 { 1791 1791 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1794 1794 } 1795 1795 1796 const char *ewk_view_setting_user_agent_get(const Evas_Object *o)1796 const char* ewk_view_setting_user_agent_get(const Evas_Object* o) 1797 1797 { 1798 1798 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1801 1801 } 1802 1802 1803 Eina_Bool ewk_view_setting_user_agent_set(Evas_Object *o, const char *user_agent)1803 Eina_Bool ewk_view_setting_user_agent_set(Evas_Object* o, const char* user_agent) 1804 1804 { 1805 1805 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1812 1812 } 1813 1813 1814 const char *ewk_view_setting_user_stylesheet_get(const Evas_Object *o)1814 const char* ewk_view_setting_user_stylesheet_get(const Evas_Object* o) 1815 1815 { 1816 1816 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 1819 1819 } 1820 1820 1821 Eina_Bool ewk_view_setting_user_stylesheet_set(Evas_Object *o, const char *uri)1821 Eina_Bool ewk_view_setting_user_stylesheet_set(Evas_Object* o, const char* uri) 1822 1822 { 1823 1823 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1830 1830 } 1831 1831 1832 Eina_Bool ewk_view_setting_auto_load_images_get(const Evas_Object *o)1832 Eina_Bool ewk_view_setting_auto_load_images_get(const Evas_Object* o) 1833 1833 { 1834 1834 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1837 1837 } 1838 1838 1839 Eina_Bool ewk_view_setting_auto_load_images_set(Evas_Object *o, Eina_Bool automatic)1839 Eina_Bool ewk_view_setting_auto_load_images_set(Evas_Object* o, Eina_Bool automatic) 1840 1840 { 1841 1841 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1849 1849 } 1850 1850 1851 Eina_Bool ewk_view_setting_auto_shrink_images_get(const Evas_Object *o)1851 Eina_Bool ewk_view_setting_auto_shrink_images_get(const Evas_Object* o) 1852 1852 { 1853 1853 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1856 1856 } 1857 1857 1858 Eina_Bool ewk_view_setting_auto_shrink_images_set(Evas_Object *o, Eina_Bool automatic)1858 Eina_Bool ewk_view_setting_auto_shrink_images_set(Evas_Object* o, Eina_Bool automatic) 1859 1859 { 1860 1860 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1868 1868 } 1869 1869 1870 Eina_Bool ewk_view_setting_enable_auto_resize_window_get(const Evas_Object *o)1870 Eina_Bool ewk_view_setting_enable_auto_resize_window_get(const Evas_Object* o) 1871 1871 { 1872 1872 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1875 1875 } 1876 1876 1877 Eina_Bool ewk_view_setting_enable_auto_resize_window_set(Evas_Object *o, Eina_Bool resizable)1877 Eina_Bool ewk_view_setting_enable_auto_resize_window_set(Evas_Object* o, Eina_Bool resizable) 1878 1878 { 1879 1879 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1883 1883 } 1884 1884 1885 Eina_Bool ewk_view_setting_enable_scripts_get(const Evas_Object *o)1885 Eina_Bool ewk_view_setting_enable_scripts_get(const Evas_Object* o) 1886 1886 { 1887 1887 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1890 1890 } 1891 1891 1892 Eina_Bool ewk_view_setting_enable_scripts_set(Evas_Object *o, Eina_Bool enable)1892 Eina_Bool ewk_view_setting_enable_scripts_set(Evas_Object* o, Eina_Bool enable) 1893 1893 { 1894 1894 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1902 1902 } 1903 1903 1904 Eina_Bool ewk_view_setting_enable_plugins_get(const Evas_Object *o)1904 Eina_Bool ewk_view_setting_enable_plugins_get(const Evas_Object* o) 1905 1905 { 1906 1906 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1909 1909 } 1910 1910 1911 Eina_Bool ewk_view_setting_enable_plugins_set(Evas_Object *o, Eina_Bool enable)1911 Eina_Bool ewk_view_setting_enable_plugins_set(Evas_Object* o, Eina_Bool enable) 1912 1912 { 1913 1913 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1921 1921 } 1922 1922 1923 Eina_Bool ewk_view_setting_enable_frame_flattening_get(const Evas_Object *o)1923 Eina_Bool ewk_view_setting_enable_frame_flattening_get(const Evas_Object* o) 1924 1924 { 1925 1925 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1928 1928 } 1929 1929 1930 Eina_Bool ewk_view_setting_enable_frame_flattening_set(Evas_Object *o, Eina_Bool enable)1930 Eina_Bool ewk_view_setting_enable_frame_flattening_set(Evas_Object* o, Eina_Bool enable) 1931 1931 { 1932 1932 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1940 1940 } 1941 1941 1942 Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object *o)1942 Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object* o) 1943 1943 { 1944 1944 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1947 1947 } 1948 1948 1949 Eina_Bool ewk_view_setting_scripts_window_open_set(Evas_Object *o, Eina_Bool allow)1949 Eina_Bool ewk_view_setting_scripts_window_open_set(Evas_Object* o, Eina_Bool allow) 1950 1950 { 1951 1951 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1959 1959 } 1960 1960 1961 Eina_Bool ewk_view_setting_scripts_can_close_windows_get(const Evas_Object *o)1961 Eina_Bool ewk_view_setting_scripts_can_close_windows_get(const Evas_Object* o) 1962 1962 { 1963 1963 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1966 1966 } 1967 1967 1968 Eina_Bool ewk_view_setting_scripts_can_close_windows_set(Evas_Object *o, Eina_Bool allow)1968 Eina_Bool ewk_view_setting_scripts_can_close_windows_set(Evas_Object* o, Eina_Bool allow) 1969 1969 { 1970 1970 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1978 1978 } 1979 1979 1980 Eina_Bool ewk_view_setting_resizable_textareas_get(const Evas_Object *o)1980 Eina_Bool ewk_view_setting_resizable_textareas_get(const Evas_Object* o) 1981 1981 { 1982 1982 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1985 1985 } 1986 1986 1987 Eina_Bool ewk_view_setting_resizable_textareas_set(Evas_Object *o, Eina_Bool enable)1987 Eina_Bool ewk_view_setting_resizable_textareas_set(Evas_Object* o, Eina_Bool enable) 1988 1988 { 1989 1989 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 1997 1997 } 1998 1998 1999 Eina_Bool ewk_view_setting_private_browsing_get(const Evas_Object *o)1999 Eina_Bool ewk_view_setting_private_browsing_get(const Evas_Object* o) 2000 2000 { 2001 2001 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2004 2004 } 2005 2005 2006 Eina_Bool ewk_view_setting_private_browsing_set(Evas_Object *o, Eina_Bool enable)2006 Eina_Bool ewk_view_setting_private_browsing_set(Evas_Object* o, Eina_Bool enable) 2007 2007 { 2008 2008 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2016 2016 } 2017 2017 2018 Eina_Bool ewk_view_setting_offline_app_cache_get(const Evas_Object *o)2018 Eina_Bool ewk_view_setting_offline_app_cache_get(const Evas_Object* o) 2019 2019 { 2020 2020 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2023 2023 } 2024 2024 2025 Eina_Bool ewk_view_setting_offline_app_cache_set(Evas_Object *o, Eina_Bool enable)2025 Eina_Bool ewk_view_setting_offline_app_cache_set(Evas_Object* o, Eina_Bool enable) 2026 2026 { 2027 2027 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2036 2036 2037 2037 2038 Eina_Bool ewk_view_setting_caret_browsing_get(const Evas_Object *o)2038 Eina_Bool ewk_view_setting_caret_browsing_get(const Evas_Object* o) 2039 2039 { 2040 2040 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2043 2043 } 2044 2044 2045 Eina_Bool ewk_view_setting_caret_browsing_set(Evas_Object *o, Eina_Bool enable)2045 Eina_Bool ewk_view_setting_caret_browsing_set(Evas_Object* o, Eina_Bool enable) 2046 2046 { 2047 2047 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2055 2055 } 2056 2056 2057 const char *ewk_view_setting_encoding_custom_get(const Evas_Object *o)2057 const char* ewk_view_setting_encoding_custom_get(const Evas_Object* o) 2058 2058 { 2059 2059 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2071 2071 } 2072 2072 2073 Eina_Bool ewk_view_setting_encoding_custom_set(Evas_Object *o, const char *encoding)2073 Eina_Bool ewk_view_setting_encoding_custom_set(Evas_Object* o, const char* encoding) 2074 2074 { 2075 2075 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2077 2077 Evas_Object* main_frame = ewk_view_frame_main_get(o); 2078 2078 WebCore::Frame* core_frame = ewk_frame_core_get(main_frame); 2079 DBG("%s", encoding);2079 DBG("%s", encoding); 2080 2080 eina_stringshare_replace(&priv->settings.encoding_custom, encoding); 2081 2081 core_frame->loader()->reloadWithOverrideEncoding(String::fromUTF8(encoding)); … … 2084 2084 } 2085 2085 2086 const char *ewk_view_setting_encoding_default_get(const Evas_Object *o)2086 const char* ewk_view_setting_encoding_default_get(const Evas_Object* o) 2087 2087 { 2088 2088 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2091 2091 } 2092 2092 2093 Eina_Bool ewk_view_setting_encoding_default_set(Evas_Object *o, const char *encoding)2093 Eina_Bool ewk_view_setting_encoding_default_set(Evas_Object* o, const char* encoding) 2094 2094 { 2095 2095 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2100 2100 } 2101 2101 2102 Eina_Bool ewk_view_setting_encoding_detector_set(Evas_Object *o, Eina_Bool enable)2102 Eina_Bool ewk_view_setting_encoding_detector_set(Evas_Object* o, Eina_Bool enable) 2103 2103 { 2104 2104 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2112 2112 } 2113 2113 2114 Eina_Bool ewk_view_setting_encoding_detector_get(const Evas_Object *o)2114 Eina_Bool ewk_view_setting_encoding_detector_get(const Evas_Object* o) 2115 2115 { 2116 2116 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2119 2119 } 2120 2120 2121 Eina_Bool ewk_view_setting_enable_developer_extras_get(const Evas_Object *o)2121 Eina_Bool ewk_view_setting_enable_developer_extras_get(const Evas_Object* o) 2122 2122 { 2123 2123 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2126 2126 } 2127 2127 2128 Eina_Bool ewk_view_setting_enable_developer_extras_set(Evas_Object *o, Eina_Bool enable)2128 Eina_Bool ewk_view_setting_enable_developer_extras_set(Evas_Object* o, Eina_Bool enable) 2129 2129 { 2130 2130 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2138 2138 } 2139 2139 2140 int ewk_view_setting_font_minimum_size_get(const Evas_Object *o)2140 int ewk_view_setting_font_minimum_size_get(const Evas_Object* o) 2141 2141 { 2142 2142 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2145 2145 } 2146 2146 2147 Eina_Bool ewk_view_setting_font_minimum_size_set(Evas_Object *o, int size)2147 Eina_Bool ewk_view_setting_font_minimum_size_set(Evas_Object* o, int size) 2148 2148 { 2149 2149 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2156 2156 } 2157 2157 2158 int ewk_view_setting_font_minimum_logical_size_get(const Evas_Object *o)2158 int ewk_view_setting_font_minimum_logical_size_get(const Evas_Object* o) 2159 2159 { 2160 2160 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2163 2163 } 2164 2164 2165 Eina_Bool ewk_view_setting_font_minimum_logical_size_set(Evas_Object *o, int size)2165 Eina_Bool ewk_view_setting_font_minimum_logical_size_set(Evas_Object* o, int size) 2166 2166 { 2167 2167 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2174 2174 } 2175 2175 2176 int ewk_view_setting_font_default_size_get(const Evas_Object *o)2176 int ewk_view_setting_font_default_size_get(const Evas_Object* o) 2177 2177 { 2178 2178 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2181 2181 } 2182 2182 2183 Eina_Bool ewk_view_setting_font_default_size_set(Evas_Object *o, int size)2183 Eina_Bool ewk_view_setting_font_default_size_set(Evas_Object* o, int size) 2184 2184 { 2185 2185 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2192 2192 } 2193 2193 2194 int ewk_view_setting_font_monospace_size_get(const Evas_Object *o)2194 int ewk_view_setting_font_monospace_size_get(const Evas_Object* o) 2195 2195 { 2196 2196 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2199 2199 } 2200 2200 2201 Eina_Bool ewk_view_setting_font_monospace_size_set(Evas_Object *o, int size)2201 Eina_Bool ewk_view_setting_font_monospace_size_set(Evas_Object* o, int size) 2202 2202 { 2203 2203 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2210 2210 } 2211 2211 2212 const char *ewk_view_font_family_name_get(const Evas_Object *o, Ewk_Font_Family font_family)2212 const char* ewk_view_font_family_name_get(const Evas_Object* o, Ewk_Font_Family font_family) 2213 2213 { 2214 2214 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2232 2232 } 2233 2233 2234 Eina_Bool ewk_view_font_family_name_set(Evas_Object *o, Ewk_Font_Family font_family, const char *name)2234 Eina_Bool ewk_view_font_family_name_set(Evas_Object* o, Ewk_Font_Family font_family, const char* name) 2235 2235 { 2236 2236 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2269 2269 } 2270 2270 2271 Eina_Bool ewk_view_setting_spatial_navigation_get(const Evas_Object *o)2271 Eina_Bool ewk_view_setting_spatial_navigation_get(const Evas_Object* o) 2272 2272 { 2273 2273 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2276 2276 } 2277 2277 2278 Eina_Bool ewk_view_setting_spatial_navigation_set(Evas_Object *o, Eina_Bool enable)2278 Eina_Bool ewk_view_setting_spatial_navigation_set(Evas_Object* o, Eina_Bool enable) 2279 2279 { 2280 2280 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2288 2288 } 2289 2289 2290 Eina_Bool ewk_view_setting_local_storage_get(const Evas_Object *o)2290 Eina_Bool ewk_view_setting_local_storage_get(const Evas_Object* o) 2291 2291 { 2292 2292 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2295 2295 } 2296 2296 2297 Eina_Bool ewk_view_setting_local_storage_set(Evas_Object *o, Eina_Bool enable)2297 Eina_Bool ewk_view_setting_local_storage_set(Evas_Object* o, Eina_Bool enable) 2298 2298 { 2299 2299 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2307 2307 } 2308 2308 2309 Eina_Bool ewk_view_setting_page_cache_get(const Evas_Object *o)2309 Eina_Bool ewk_view_setting_page_cache_get(const Evas_Object* o) 2310 2310 { 2311 2311 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2314 2314 } 2315 2315 2316 Eina_Bool ewk_view_setting_page_cache_set(Evas_Object *o, Eina_Bool enable)2316 Eina_Bool ewk_view_setting_page_cache_set(Evas_Object* o, Eina_Bool enable) 2317 2317 { 2318 2318 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2326 2326 } 2327 2327 2328 const char* ewk_view_setting_local_storage_database_path_get(const Evas_Object *o)2328 const char* ewk_view_setting_local_storage_database_path_get(const Evas_Object* o) 2329 2329 { 2330 2330 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2333 2333 } 2334 2334 2335 Eina_Bool ewk_view_setting_local_storage_database_path_set(Evas_Object *o, const char *path)2335 Eina_Bool ewk_view_setting_local_storage_database_path_set(Evas_Object* o, const char* path) 2336 2336 { 2337 2337 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2342 2342 } 2343 2343 2344 Eina_Bool ewk_view_setting_minimum_timer_interval_set(Evas_Object *o, double interval)2344 Eina_Bool ewk_view_setting_minimum_timer_interval_set(Evas_Object* o, double interval) 2345 2345 { 2346 2346 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2353 2353 } 2354 2354 2355 double ewk_view_setting_minimum_timer_interval_get(const Evas_Object *o)2355 double ewk_view_setting_minimum_timer_interval_get(const Evas_Object* o) 2356 2356 { 2357 2357 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 2360 2360 } 2361 2361 2362 Ewk_View_Smart_Data *ewk_view_smart_data_get(const Evas_Object *o)2362 Ewk_View_Smart_Data* ewk_view_smart_data_get(const Evas_Object* o) 2363 2363 { 2364 2364 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2383 2383 * to define their own backing store. 2384 2384 */ 2385 const Eina_Rectangle *ewk_view_repaints_get(const Ewk_View_Private_Data *priv, size_t *count)2385 const Eina_Rectangle* ewk_view_repaints_get(const Ewk_View_Private_Data* priv, size_t* count) 2386 2386 { 2387 2387 EINA_SAFETY_ON_NULL_RETURN_VAL(count, 0); … … 2411 2411 * to define their own backing store. 2412 2412 */ 2413 const Ewk_Scroll_Request *ewk_view_scroll_requests_get(const Ewk_View_Private_Data *priv, size_t *count)2413 const Ewk_Scroll_Request* ewk_view_scroll_requests_get(const Ewk_View_Private_Data* priv, size_t* count) 2414 2414 { 2415 2415 EINA_SAFETY_ON_NULL_RETURN_VAL(count, 0); … … 2436 2436 * to define their own backing store. 2437 2437 */ 2438 void ewk_view_repaint_add(Ewk_View_Private_Data *priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)2438 void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) 2439 2439 { 2440 2440 EINA_SAFETY_ON_NULL_RETURN(priv); … … 2450 2450 * to define their own backing store. 2451 2451 */ 2452 void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data *priv)2452 void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data* priv) 2453 2453 { 2454 2454 EINA_SAFETY_ON_NULL_RETURN(priv); 2455 2455 2456 WebCore::FrameView *v = priv->main_frame->view();2456 WebCore::FrameView* v = priv->main_frame->view(); 2457 2457 if (!v) { 2458 2458 ERR("no main frame view"); … … 2462 2462 } 2463 2463 2464 void ewk_view_scrolls_process(Ewk_View_Smart_Data *sd)2464 void ewk_view_scrolls_process(Ewk_View_Smart_Data* sd) 2465 2465 { 2466 2466 EINA_SAFETY_ON_NULL_RETURN(sd); … … 2480 2480 */ 2481 2481 struct _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; 2485 2485 }; 2486 2486 2487 Ewk_View_Paint_Context *ewk_view_paint_context_new(Ewk_View_Private_Data *priv, cairo_t *cr)2487 Ewk_View_Paint_Context* ewk_view_paint_context_new(Ewk_View_Private_Data* priv, cairo_t* cr) 2488 2488 { 2489 2489 EINA_SAFETY_ON_NULL_RETURN_VAL(priv, 0); 2490 2490 EINA_SAFETY_ON_NULL_RETURN_VAL(cr, 0); 2491 2491 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(); 2493 2493 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)); 2495 2495 EINA_SAFETY_ON_NULL_RETURN_VAL(ctxt, 0); 2496 2496 … … 2505 2505 } 2506 2506 2507 void ewk_view_paint_context_free(Ewk_View_Paint_Context *ctxt)2507 void ewk_view_paint_context_free(Ewk_View_Paint_Context* ctxt) 2508 2508 { 2509 2509 EINA_SAFETY_ON_NULL_RETURN(ctxt); … … 2513 2513 } 2514 2514 2515 void ewk_view_paint_context_save(Ewk_View_Paint_Context *ctxt)2515 void ewk_view_paint_context_save(Ewk_View_Paint_Context* ctxt) 2516 2516 { 2517 2517 EINA_SAFETY_ON_NULL_RETURN(ctxt); … … 2520 2520 } 2521 2521 2522 void ewk_view_paint_context_restore(Ewk_View_Paint_Context *ctxt)2522 void ewk_view_paint_context_restore(Ewk_View_Paint_Context* ctxt) 2523 2523 { 2524 2524 EINA_SAFETY_ON_NULL_RETURN(ctxt); … … 2527 2527 } 2528 2528 2529 void ewk_view_paint_context_clip(Ewk_View_Paint_Context *ctxt, const Eina_Rectangle *area)2529 void ewk_view_paint_context_clip(Ewk_View_Paint_Context* ctxt, const Eina_Rectangle* area) 2530 2530 { 2531 2531 EINA_SAFETY_ON_NULL_RETURN(ctxt); … … 2534 2534 } 2535 2535 2536 void ewk_view_paint_context_paint(Ewk_View_Paint_Context *ctxt, const Eina_Rectangle *area)2536 void ewk_view_paint_context_paint(Ewk_View_Paint_Context* ctxt, const Eina_Rectangle* area) 2537 2537 { 2538 2538 EINA_SAFETY_ON_NULL_RETURN(ctxt); … … 2546 2546 } 2547 2547 2548 void ewk_view_paint_context_paint_contents(Ewk_View_Paint_Context *ctxt, const Eina_Rectangle *area)2548 void ewk_view_paint_context_paint_contents(Ewk_View_Paint_Context* ctxt, const Eina_Rectangle* area) 2549 2549 { 2550 2550 EINA_SAFETY_ON_NULL_RETURN(ctxt); … … 2559 2559 } 2560 2560 2561 void ewk_view_paint_context_scale(Ewk_View_Paint_Context *ctxt, float scale_x, float scale_y)2561 void ewk_view_paint_context_scale(Ewk_View_Paint_Context* ctxt, float scale_x, float scale_y) 2562 2562 { 2563 2563 EINA_SAFETY_ON_NULL_RETURN(ctxt); … … 2566 2566 } 2567 2567 2568 void ewk_view_paint_context_translate(Ewk_View_Paint_Context *ctxt, float x, float y)2568 void ewk_view_paint_context_translate(Ewk_View_Paint_Context* ctxt, float x, float y) 2569 2569 { 2570 2570 EINA_SAFETY_ON_NULL_RETURN(ctxt); … … 2573 2573 } 2574 2574 2575 Eina_Bool ewk_view_paint(Ewk_View_Private_Data *priv, cairo_t *cr, const Eina_Rectangle *area)2575 Eina_Bool ewk_view_paint(Ewk_View_Private_Data* priv, cairo_t* cr, const Eina_Rectangle* area) 2576 2576 { 2577 2577 EINA_SAFETY_ON_NULL_RETURN_VAL(priv, EINA_FALSE); … … 2598 2598 } 2599 2599 2600 Eina_Bool ewk_view_paint_contents(Ewk_View_Private_Data *priv, cairo_t *cr, const Eina_Rectangle *area)2600 Eina_Bool ewk_view_paint_contents(Ewk_View_Private_Data* priv, cairo_t* cr, const Eina_Rectangle* area) 2601 2601 { 2602 2602 EINA_SAFETY_ON_NULL_RETURN_VAL(priv, EINA_FALSE); … … 2629 2629 * Emits signal: "ready" with no parameters. 2630 2630 */ 2631 void ewk_view_ready(Evas_Object *o)2631 void ewk_view_ready(Evas_Object* o) 2632 2632 { 2633 2633 DBG("o=%p", o); … … 2643 2643 * enabled or not. 2644 2644 */ 2645 void ewk_view_input_method_state_set(Evas_Object *o, Eina_Bool active)2645 void ewk_view_input_method_state_set(Evas_Object* o, Eina_Bool active) 2646 2646 { 2647 2647 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 2672 2672 } 2673 2673 2674 evas_object_smart_callback_call(o, "inputmethod,changed", (void 2674 evas_object_smart_callback_call(o, "inputmethod,changed", (void*)active); 2675 2675 } 2676 2676 … … 2681 2681 * Emits signal: "title,changed" with pointer to new title string. 2682 2682 */ 2683 void ewk_view_title_set(Evas_Object *o, const char *title)2683 void ewk_view_title_set(Evas_Object* o, const char* title) 2684 2684 { 2685 2685 DBG("o=%p, title=%s", o, title ? title : "(null)"); 2686 evas_object_smart_callback_call(o, "title,changed", (void 2686 evas_object_smart_callback_call(o, "title,changed", (void*)title); 2687 2687 } 2688 2688 … … 2693 2693 * Emits signal: "uri,changed" with pointer to the new uri string. 2694 2694 */ 2695 void ewk_view_uri_changed(Evas_Object *o)2695 void ewk_view_uri_changed(Evas_Object* o) 2696 2696 { 2697 2697 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); 2699 2699 DBG("o=%p, uri=%s", o, uri ? uri : "(null)"); 2700 evas_object_smart_callback_call(o, "uri,changed", (void 2700 evas_object_smart_callback_call(o, "uri,changed", (void*)uri); 2701 2701 } 2702 2702 … … 2709 2709 * Emits signal: "load,started" with no parameters. 2710 2710 */ 2711 void ewk_view_load_started(Evas_Object *o)2711 void ewk_view_load_started(Evas_Object* o) 2712 2712 { 2713 2713 DBG("o=%p", o); … … 2722 2722 * Emits signal: "load,started" on main frame with no parameters. 2723 2723 */ 2724 void ewk_view_frame_main_load_started(Evas_Object *o)2724 void ewk_view_frame_main_load_started(Evas_Object* o) 2725 2725 { 2726 2726 DBG("o=%p", o); 2727 Evas_Object *frame = ewk_view_frame_main_get(o);2727 Evas_Object* frame = ewk_view_frame_main_get(o); 2728 2728 evas_object_smart_callback_call(frame, "load,started", 0); 2729 2729 } … … 2737 2737 * Emits signal: "load,provisional" on View with no parameters. 2738 2738 */ 2739 void ewk_view_load_provisional(Evas_Object *o)2739 void ewk_view_load_provisional(Evas_Object* o) 2740 2740 { 2741 2741 DBG("o=%p", o); … … 2751 2751 * Emits signal: "load,newwindow,show" on view with no parameters. 2752 2752 */ 2753 void ewk_view_load_show(Evas_Object *o)2753 void ewk_view_load_show(Evas_Object* o) 2754 2754 { 2755 2755 DBG("o=%p", o); … … 2764 2764 * @param o View. 2765 2765 */ 2766 void ewk_view_frame_main_cleared(Evas_Object *o)2766 void ewk_view_frame_main_cleared(Evas_Object* o) 2767 2767 { 2768 2768 DBG("o=%p", o); … … 2780 2780 * Emits signal: "icon,received" with no parameters. 2781 2781 */ 2782 void ewk_view_frame_main_icon_received(Evas_Object *o)2782 void ewk_view_frame_main_icon_received(Evas_Object* o) 2783 2783 { 2784 2784 DBG("o=%p", o); 2785 Evas_Object *frame = ewk_view_frame_main_get(o);2785 Evas_Object* frame = ewk_view_frame_main_get(o); 2786 2786 evas_object_smart_callback_call(frame, "icon,received", 0); 2787 2787 } … … 2797 2797 * compatible with previous WebKit. 2798 2798 */ 2799 void ewk_view_load_finished(Evas_Object *o, const Ewk_Frame_Load_Error *error)2799 void ewk_view_load_finished(Evas_Object* o, const Ewk_Frame_Load_Error* error) 2800 2800 { 2801 2801 DBG("o=%p, error=%p", o, error); 2802 evas_object_smart_callback_call(o, "load,finished", (void 2802 evas_object_smart_callback_call(o, "load,finished", (void*)error); 2803 2803 } 2804 2804 … … 2809 2809 * Emits signal: "load,error" with pointer to Ewk_Frame_Load_Error. 2810 2810 */ 2811 void ewk_view_load_error(Evas_Object *o, const Ewk_Frame_Load_Error *error)2811 void ewk_view_load_error(Evas_Object* o, const Ewk_Frame_Load_Error* error) 2812 2812 { 2813 2813 DBG("o=%p, error=%p", o, error); 2814 evas_object_smart_callback_call(o, "load,error", (void 2814 evas_object_smart_callback_call(o, "load,error", (void*)error); 2815 2815 } 2816 2816 … … 2821 2821 * Emits signal: "load,progress" with pointer to a double from 0.0 to 1.0. 2822 2822 */ 2823 void ewk_view_load_progress_changed(Evas_Object *o)2823 void ewk_view_load_progress_changed(Evas_Object* o) 2824 2824 { 2825 2825 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 2843 2843 * Emits signal: "restore" with frame. 2844 2844 */ 2845 void ewk_view_restore_state(Evas_Object *o, Evas_Object *frame)2845 void ewk_view_restore_state(Evas_Object* o, Evas_Object* frame) 2846 2846 { 2847 2847 evas_object_smart_callback_call(o, "restore", frame); … … 2869 2869 * @see ewk_window_features_ref(). 2870 2870 */ 2871 Evas_Object *ewk_view_window_create(Evas_Object *o, Eina_Bool javascript, const WebCore::WindowFeatures *coreFeatures)2871 Evas_Object* ewk_view_window_create(Evas_Object* o, Eina_Bool javascript, const WebCore::WindowFeatures* coreFeatures) 2872 2872 { 2873 2873 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 2876 2876 return o; 2877 2877 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); 2879 2879 if (!window_features) 2880 2880 return 0; … … 2897 2897 * @param o View to be closed. 2898 2898 */ 2899 void ewk_view_window_close(Evas_Object *o)2899 void ewk_view_window_close(Evas_Object* o) 2900 2900 { 2901 2901 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 2913 2913 * Emits signal: "link,hover,in" 2914 2914 */ 2915 void ewk_view_mouse_link_hover_in(Evas_Object *o, void *data)2915 void ewk_view_mouse_link_hover_in(Evas_Object* o, void* data) 2916 2916 { 2917 2917 evas_object_smart_callback_call(o, "link,hover,in", data); … … 2924 2924 * Emits signal: "link,hover,out" 2925 2925 */ 2926 void ewk_view_mouse_link_hover_out(Evas_Object *o)2926 void ewk_view_mouse_link_hover_out(Evas_Object* o) 2927 2927 { 2928 2928 evas_object_smart_callback_call(o, "link,hover,out", 0); … … 2935 2935 * Emits signal: "toolbars,visible,set" with a pointer to a boolean. 2936 2936 */ 2937 void ewk_view_toolbars_visible_set(Evas_Object *o, Eina_Bool visible)2937 void ewk_view_toolbars_visible_set(Evas_Object* o, Eina_Bool visible) 2938 2938 { 2939 2939 DBG("o=%p (visible=%d)", o, !!visible); … … 2952 2952 * Emits signal: "toolbars,visible,get" with a pointer to a boolean. 2953 2953 */ 2954 void ewk_view_toolbars_visible_get(Evas_Object *o, Eina_Bool *visible)2954 void ewk_view_toolbars_visible_get(Evas_Object* o, Eina_Bool* visible) 2955 2955 { 2956 2956 DBG("%s, o=%p", __func__, o); … … 2968 2968 * Emits signal: "statusbar,visible,set" with a pointer to a boolean. 2969 2969 */ 2970 void ewk_view_statusbar_visible_set(Evas_Object *o, Eina_Bool visible)2970 void ewk_view_statusbar_visible_set(Evas_Object* o, Eina_Bool visible) 2971 2971 { 2972 2972 DBG("o=%p (visible=%d)", o, !!visible); … … 2985 2985 * Emits signal: "statusbar,visible,get" with a pointer to a boolean. 2986 2986 */ 2987 void ewk_view_statusbar_visible_get(Evas_Object *o, Eina_Bool *visible)2987 void ewk_view_statusbar_visible_get(Evas_Object* o, Eina_Bool* visible) 2988 2988 { 2989 2989 DBG("%s, o=%p", __func__, o); … … 3001 3001 * Emits signal: "statusbar,text,set" with a string. 3002 3002 */ 3003 void ewk_view_statusbar_text_set(Evas_Object *o, const char *text)3003 void ewk_view_statusbar_text_set(Evas_Object* o, const char* text) 3004 3004 { 3005 3005 DBG("o=%p (text=%s)", o, text); 3006 3006 INF("status bar text set: %s", text); 3007 evas_object_smart_callback_call(o, "statusbar,text,set", (void 3007 evas_object_smart_callback_call(o, "statusbar,text,set", (void*)text); 3008 3008 } 3009 3009 … … 3017 3017 * Emits signal: "scrollbars,visible,set" with a pointer to a boolean. 3018 3018 */ 3019 void ewk_view_scrollbars_visible_set(Evas_Object *o, Eina_Bool visible)3019 void ewk_view_scrollbars_visible_set(Evas_Object* o, Eina_Bool visible) 3020 3020 { 3021 3021 DBG("o=%p (visible=%d)", o, !!visible); … … 3034 3034 * Emits signal: "scrollbars,visible,get" with a pointer to a boolean. 3035 3035 */ 3036 void ewk_view_scrollbars_visible_get(Evas_Object *o, Eina_Bool *visible)3036 void ewk_view_scrollbars_visible_get(Evas_Object* o, Eina_Bool* visible) 3037 3037 { 3038 3038 DBG("%s, o=%p", __func__, o); … … 3050 3050 * Emits signal: "menubar,visible,set" with a pointer to a boolean. 3051 3051 */ 3052 void ewk_view_menubar_visible_set(Evas_Object *o, Eina_Bool visible)3052 void ewk_view_menubar_visible_set(Evas_Object* o, Eina_Bool visible) 3053 3053 { 3054 3054 DBG("o=%p (visible=%d)", o, !!visible); … … 3067 3067 * Emits signal: "menubar,visible,get" with a pointer to a boolean. 3068 3068 */ 3069 void ewk_view_menubar_visible_get(Evas_Object *o, Eina_Bool *visible)3069 void ewk_view_menubar_visible_get(Evas_Object* o, Eina_Bool* visible) 3070 3070 { 3071 3071 DBG("%s, o=%p", __func__, o); … … 3084 3084 * removed, text will be 0 or '\0' 3085 3085 */ 3086 void ewk_view_tooltip_text_set(Evas_Object *o, const char *text)3086 void ewk_view_tooltip_text_set(Evas_Object* o, const char* text) 3087 3087 { 3088 3088 DBG("o=%p text=%s", o, text); 3089 evas_object_smart_callback_call(o, "tooltip,text,set", (void 3089 evas_object_smart_callback_call(o, "tooltip,text,set", (void*)text); 3090 3090 } 3091 3091 … … 3099 3099 * 3100 3100 */ 3101 void ewk_view_add_console_message(Evas_Object *o, const char *message, unsigned int lineNumber, const char *sourceID)3101 void ewk_view_add_console_message(Evas_Object* o, const char* message, unsigned int lineNumber, const char* sourceID) 3102 3102 { 3103 3103 DBG("o=%p message=%s lineNumber=%u sourceID=%s", o, message, lineNumber, sourceID); … … 3108 3108 } 3109 3109 3110 void ewk_view_run_javascript_alert(Evas_Object *o, Evas_Object *frame, const char *message)3110 void ewk_view_run_javascript_alert(Evas_Object* o, Evas_Object* frame, const char* message) 3111 3111 { 3112 3112 DBG("o=%p frame=%p message=%s", o, frame, message); … … 3120 3120 } 3121 3121 3122 Eina_Bool ewk_view_run_javascript_confirm(Evas_Object *o, Evas_Object *frame, const char *message)3122 Eina_Bool ewk_view_run_javascript_confirm(Evas_Object* o, Evas_Object* frame, const char* message) 3123 3123 { 3124 3124 DBG("o=%p frame=%p message=%s", o, frame, message); … … 3132 3132 } 3133 3133 3134 Eina_Bool ewk_view_run_javascript_prompt(Evas_Object *o, Evas_Object *frame, const char *message, const char *defaultValue, char **value)3134 Eina_Bool ewk_view_run_javascript_prompt(Evas_Object* o, Evas_Object* frame, const char* message, const char* defaultValue, char** value) 3135 3135 { 3136 3136 DBG("o=%p frame=%p message=%s", o, frame, message); … … 3155 3155 * @return @c EINA_TRUE if script should be stopped; @c EINA_FALSE otherwise 3156 3156 */ 3157 Eina_Bool ewk_view_should_interrupt_javascript(Evas_Object *o)3157 Eina_Bool ewk_view_should_interrupt_javascript(Evas_Object* o) 3158 3158 { 3159 3159 DBG("o=%p", o); … … 3181 3181 * site's requirement. 3182 3182 */ 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)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) 3184 3184 { 3185 3185 DBG("o=%p", o); … … 3189 3189 return 0; 3190 3190 3191 INF("current_size=%" PRIu64" expected_size=%"PRIu64, current_size, expected_size);3191 INF("current_size=%" PRIu64 " expected_size=%" PRIu64, current_size, expected_size); 3192 3192 return sd->api->exceeded_database_quota(sd, frame, databaseName, current_size, expected_size); 3193 3193 } … … 3206 3206 * @return @EINA_FALSE if user canceled file selection; @EINA_TRUE if confirmed. 3207 3207 */ 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)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) 3209 3209 { 3210 3210 DBG("o=%p frame=%p allows_multiple_files=%d", o, frame, allows_multiple_files); … … 3224 3224 } 3225 3225 3226 void ewk_view_repaint(Evas_Object *o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)3226 void ewk_view_repaint(Evas_Object* o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) 3227 3227 { 3228 3228 DBG("o=%p, region=%d,%d + %dx%d", o, x, y, w, h); … … 3239 3239 } 3240 3240 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)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) 3242 3242 { 3243 3243 DBG("o=%p, delta: %d,%d, scroll: %d,%d+%dx%d, clip: %d,%d+%dx%d", … … 3257 3257 } 3258 3258 3259 WebCore::Page* ewk_view_core_page_get(const Evas_Object *o)3259 WebCore::Page* ewk_view_core_page_get(const Evas_Object* o) 3260 3260 { 3261 3261 EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0); … … 3269 3269 * Emits "frame,created" with the new frame object on success. 3270 3270 */ 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)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) 3272 3272 { 3273 3273 DBG("o=%p, frame=%p, name=%s, ownerElement=%p, url=%s, referrer=%s", … … 3279 3279 3280 3280 WTF::RefPtr<WebCore::Frame> cf = _ewk_view_core_frame_new 3281 (sd, priv, ownerElement);3281 (sd, priv, ownerElement); 3282 3282 if (!cf) { 3283 3283 ERR("Could not create child core frame '%s'", name.utf8().data()); … … 3301 3301 } 3302 3302 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> ¶mNames, const WTF::Vector<WTF::String> ¶mValues, const WTF::String &mimeType, bool loadManually)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) 3304 3304 { 3305 3305 DBG("o=%p, frame=%p, size=%dx%d, element=%p, url=%s, mimeType=%s", … … 3312 3312 3313 3313 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); 3316 3316 } 3317 3317 … … 3327 3327 * Emits: "popup,create" with a list of Ewk_Menu containing each item's data 3328 3328 */ 3329 void ewk_view_popup_new(Evas_Object *o, WebCore::PopupMenuClient *client, int selected, const WebCore::IntRect &rect)3329 void ewk_view_popup_new(Evas_Object* o, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect) 3330 3330 { 3331 3331 INF("o=%p", o); … … 3341 3341 const int size = client->listSize(); 3342 3342 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)); 3344 3344 if (client->itemIsSeparator(i)) 3345 3345 item->type = EWK_MENU_SEPARATOR; … … 3360 3360 } 3361 3361 3362 Eina_Bool ewk_view_popup_destroy(Evas_Object *o)3362 Eina_Bool ewk_view_popup_destroy(Evas_Object* o) 3363 3363 { 3364 3364 INF("o=%p", o); … … 3373 3373 void* itemv; 3374 3374 EINA_LIST_FREE(priv->popup.menu.items, itemv) { 3375 Ewk_Menu_Item* item = (Ewk_Menu_Item 3375 Ewk_Menu_Item* item = (Ewk_Menu_Item*)itemv; 3376 3376 eina_stringshare_del(item->text); 3377 3377 free(item); … … 3383 3383 } 3384 3384 3385 void ewk_view_popup_selected_set(Evas_Object *o, int index)3385 void ewk_view_popup_selected_set(Evas_Object* o, int index) 3386 3386 { 3387 3387 INF("o=%p", o); … … 3403 3403 * requested download. The download per se must be handled outside of webkit. 3404 3404 */ 3405 void ewk_view_download_request(Evas_Object *o, Ewk_Download *download)3405 void ewk_view_download_request(Evas_Object* o, Ewk_Download* download) 3406 3406 { 3407 3407 DBG("view=%p", o); … … 3416 3416 * @param frame the frame. 3417 3417 */ 3418 void ewk_view_js_window_object_clear(Evas_Object *o, Evas_Object *frame)3418 void ewk_view_js_window_object_clear(Evas_Object* o, Evas_Object* frame) 3419 3419 { 3420 3420 evas_object_smart_callback_call(o, "js,windowobject,clear", frame); … … 3429 3429 * Emits signal: "viewport,changed" with no parameters. 3430 3430 */ 3431 void ewk_view_viewport_attributes_set(Evas_Object *o, const WebCore::ViewportArguments &arguments)3431 void ewk_view_viewport_attributes_set(Evas_Object* o, const WebCore::ViewportArguments& arguments) 3432 3432 { 3433 3433 EWK_VIEW_SD_GET(o, sd); 3434 3434 EWK_VIEW_PRIV_GET(sd, priv); 3435 3435 3436 3436 priv->viewport_arguments = arguments; 3437 3437 evas_object_smart_callback_call(o, "viewport,changed", 0); 3438 3438 } 3439 3439 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)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) 3441 3441 { 3442 3442 WebCore::ViewportAttributes attributes = _ewk_view_viewport_attributes_compute(o); … … 3458 3458 } 3459 3459 3460 Eina_Bool ewk_view_zoom_range_set(Evas_Object *o, float min_scale, float max_scale)3460 Eina_Bool ewk_view_zoom_range_set(Evas_Object* o, float min_scale, float max_scale) 3461 3461 { 3462 3462 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 3474 3474 } 3475 3475 3476 float ewk_view_zoom_range_min_get(const Evas_Object *o)3476 float ewk_view_zoom_range_min_get(const Evas_Object* o) 3477 3477 { 3478 3478 EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0); … … 3482 3482 } 3483 3483 3484 float ewk_view_zoom_range_max_get(const Evas_Object *o)3484 float ewk_view_zoom_range_max_get(const Evas_Object* o) 3485 3485 { 3486 3486 EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0); … … 3490 3490 } 3491 3491 3492 Eina_Bool ewk_view_user_scalable_set(Evas_Object *o, Eina_Bool user_scalable)3492 Eina_Bool ewk_view_user_scalable_set(Evas_Object* o, Eina_Bool user_scalable) 3493 3493 { 3494 3494 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 3500 3500 } 3501 3501 3502 Eina_Bool ewk_view_user_scalable_get(const Evas_Object *o)3502 Eina_Bool ewk_view_user_scalable_get(const Evas_Object* o) 3503 3503 { 3504 3504 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 3508 3508 } 3509 3509 3510 float ewk_view_device_pixel_ratio_get(const Evas_Object *o)3510 float ewk_view_device_pixel_ratio_get(const Evas_Object* o) 3511 3511 { 3512 3512 EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0); … … 3516 3516 } 3517 3517 3518 void ewk_view_did_first_visually_nonempty_layout(Evas_Object *o)3518 void ewk_view_did_first_visually_nonempty_layout(Evas_Object* o) 3519 3519 { 3520 3520 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 3533 3533 * @param o view. 3534 3534 */ 3535 void ewk_view_dispatch_did_finish_loading(Evas_Object *o)3535 void ewk_view_dispatch_did_finish_loading(Evas_Object* o) 3536 3536 { 3537 3537 /* If we reach this point and rendering is still disabled, WebCore will not … … 3542 3542 } 3543 3543 3544 void ewk_view_transition_to_commited_for_newpage(Evas_Object *o)3544 void ewk_view_transition_to_commited_for_newpage(Evas_Object* o) 3545 3545 { 3546 3546 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 3561 3561 * @param request Request which contain url to navigate 3562 3562 */ 3563 Eina_Bool ewk_view_navigation_policy_decision(Evas_Object *o, Ewk_Frame_Resource_Request *request)3563 Eina_Bool ewk_view_navigation_policy_decision(Evas_Object* o, Ewk_Frame_Resource_Request* request) 3564 3564 { 3565 3565 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_TRUE); … … 3572 3572 } 3573 3573 3574 Eina_Bool ewk_view_js_object_add(Evas_Object *o, Ewk_JS_Object *obj, const char *obj_name)3574 Eina_Bool ewk_view_js_object_add(Evas_Object* o, Ewk_JS_Object* obj, const char* obj_name) 3575 3575 { 3576 3576 #if ENABLE(NETSCAPE_PLUGIN_API) … … 3582 3582 3583 3583 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; 3586 3586 root = priv->main_frame->script()->bindingRootObject(); 3587 3587 … … 3594 3594 3595 3595 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); 3597 3597 JSC::Identifier id = JSC::Identifier(exec, obj_name); 3598 3598 … … 3654 3654 * @param h new content height. 3655 3655 */ 3656 void ewk_view_contents_size_changed(Evas_Object *o, int w, int h)3656 void ewk_view_contents_size_changed(Evas_Object* o, int w, int h) 3657 3657 { 3658 3658 EWK_VIEW_SD_GET_OR_RETURN(o, sd); … … 3666 3666 /** 3667 3667 * @internal 3668 * Gets page size from frameview. 3668 * Gets page size from frameview. 3669 3669 * 3670 3670 * @param o view. … … 3672 3672 * @return page size. 3673 3673 */ 3674 WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object *o)3674 WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* o) 3675 3675 { 3676 3676 EWK_VIEW_SD_GET(o, sd); … … 3682 3682 3683 3683 #if ENABLE(TOUCH_EVENTS) 3684 void ewk_view_need_touch_events_set(Evas_Object *o, bool needed)3684 void ewk_view_need_touch_events_set(Evas_Object* o, bool needed) 3685 3685 { 3686 3686 EWK_VIEW_SD_GET(o, sd); … … 3690 3690 } 3691 3691 3692 Eina_Bool ewk_view_need_touch_events_get(const Evas_Object *o)3692 Eina_Bool ewk_view_need_touch_events_get(const Evas_Object* o) 3693 3693 { 3694 3694 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 3698 3698 #endif 3699 3699 3700 Eina_Bool ewk_view_mode_set(Evas_Object *o, Ewk_View_Mode view_mode)3700 Eina_Bool ewk_view_mode_set(Evas_Object* o, Ewk_View_Mode view_mode) 3701 3701 { 3702 3702 EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE); … … 3726 3726 } 3727 3727 3728 Ewk_View_Mode ewk_view_mode_get(const Evas_Object *o)3728 Ewk_View_Mode ewk_view_mode_get(const Evas_Object* o) 3729 3729 { 3730 3730 Ewk_View_Mode mode = EWK_VIEW_MODE_WINDOWED; … … 3765 3765 * Emits signal: "editorclientselection,changed" with no parameters. 3766 3766 */ 3767 void ewk_view_editor_client_selection_changed(Evas_Object *o)3767 void ewk_view_editor_client_selection_changed(Evas_Object* o) 3768 3768 { 3769 3769 evas_object_smart_callback_call(o, "editorclient,selection,changed", 0); … … 3778 3778 * Emits signal: "editorclient,contents,changed" with no parameters. 3779 3779 */ 3780 void ewk_view_editor_client_contents_changed(Evas_Object *o)3780 void ewk_view_editor_client_contents_changed(Evas_Object* o) 3781 3781 { 3782 3782 evas_object_smart_callback_call(o, "editorclient,contents,changed", 0); -
trunk/Source/WebKit/efl/ewk/ewk_view_single.cpp
r94509 r95659 32 32 static Ewk_View_Smart_Class _parent_sc = EWK_VIEW_SMART_CLASS_INIT_NULL; 33 33 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;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; 37 37 evas_object_del(clip); 38 38 } 39 39 40 static void _ewk_view_single_smart_add(Evas_Object *o)41 { 42 Ewk_View_Smart_Data *sd;40 static void _ewk_view_single_smart_add(Evas_Object* o) 41 { 42 Ewk_View_Smart_Data* sd; 43 43 44 44 _parent_sc.sc.add(o); 45 45 46 sd = (Ewk_View_Smart_Data 46 sd = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o); 47 47 if (!sd) 48 48 return; 49 49 50 Evas_Object *clip = evas_object_rectangle_add(sd->base.evas);50 Evas_Object* clip = evas_object_rectangle_add(sd->base.evas); 51 51 evas_object_clip_set(sd->backing_store, clip); 52 52 evas_object_smart_member_add(clip, o); … … 57 57 } 58 58 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);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); 62 62 evas_object_image_alpha_set(bs, EINA_FALSE); 63 63 evas_object_image_smooth_scale_set(bs, sd->zoom_weak_smooth_scale); … … 66 66 } 67 67 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);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); 71 71 _parent_sc.sc.resize(o, w, h); 72 72 … … 77 77 evas_object_image_size_set(sd->backing_store, w, h); 78 78 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); 80 80 Evas_Coord x, y, cw, ch; 81 81 evas_object_image_fill_set(sd->backing_store, 0, 0, w, h); … … 91 91 } 92 92 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;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; 97 97 98 98 dst = image + x + y * rowsize; … … 104 104 } 105 105 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;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; 110 110 111 111 h -= rows; … … 117 117 } 118 118 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;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; 122 122 /* no memcpy() as it does not allow overlapping regions */ 123 123 /* no memmove() as it will copy to a temporary buffer */ … … 127 127 } 128 128 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;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; 132 132 /* no memcpy() as it does not allow overlapping regions */ 133 133 /* no memmove() as it will copy to a temporary buffer */ … … 137 137 } 138 138 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;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; 143 143 144 144 dst = image + x + y * rowsize; … … 150 150 } 151 151 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;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; 156 156 157 157 w -= cols; … … 164 164 165 165 /* 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;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; 170 170 171 171 if (dy < 0) { … … 204 204 } 205 205 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)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) 207 207 { 208 208 Evas_Coord sx, sy, sw, sh; … … 341 341 } 342 342 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;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; 347 347 Evas_Coord ow, oh; 348 348 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); 350 350 evas_object_image_size_get(sd->backing_store, &ow, &oh); 351 351 … … 360 360 } 361 361 362 static Eina_Bool _ewk_view_single_smart_repaints_process(Ewk_View_Smart_Data *sd)363 { 364 Ewk_View_Paint_Context *ctxt;362 static Eina_Bool _ewk_view_single_smart_repaints_process(Ewk_View_Smart_Data* sd) 363 { 364 Ewk_View_Paint_Context* ctxt; 365 365 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; 372 372 cairo_status_t status; 373 cairo_surface_t *surface;373 cairo_surface_t* surface; 374 374 cairo_format_t format; 375 cairo_t *cairo;375 cairo_t* cairo; 376 376 size_t count; 377 377 Eina_Bool ret = EINA_TRUE; 378 378 379 379 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); 381 381 Evas_Coord w, h, cw, ch; 382 382 // reset effects of zoom_weak_set() … … 401 401 402 402 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); 404 404 status = cairo_surface_status(surface); 405 405 if (status != CAIRO_STATUS_SUCCESS) { … … 483 483 } 484 484 485 static Eina_Bool _ewk_view_single_smart_zoom_weak_set(Ewk_View_Smart_Data *sd, float zoom, Evas_Coord cx, Evas_Coord cy)485 static Eina_Bool _ewk_view_single_smart_zoom_weak_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy) 486 486 { 487 487 // TODO: review … … 490 490 Evas_Coord h = sd->view.h * scale; 491 491 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); 493 493 494 494 ewk_frame_contents_size_get(sd->main_frame, &cw, &ch); … … 520 520 } 521 521 522 static void _ewk_view_single_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data *sd, Eina_Bool smooth_scale)522 static void _ewk_view_single_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data* sd, Eina_Bool smooth_scale) 523 523 { 524 524 evas_object_image_smooth_scale_set(sd->backing_store, smooth_scale); 525 525 } 526 526 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)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) 528 528 { 529 529 evas_object_image_alpha_set(sd->backing_store, a < 255); 530 530 } 531 531 532 Eina_Bool ewk_view_single_smart_set(Ewk_View_Smart_Class *api)532 Eina_Bool ewk_view_single_smart_set(Ewk_View_Smart_Class* api) 533 533 { 534 534 if (!ewk_view_base_smart_set(api)) … … 551 551 } 552 552 553 static inline Evas_Smart *_ewk_view_single_smart_class_new(void)553 static inline Evas_Smart* _ewk_view_single_smart_class_new(void) 554 554 { 555 555 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; 557 557 558 558 if (EINA_UNLIKELY(!smart)) { … … 564 564 } 565 565 566 Evas_Object *ewk_view_single_add(Evas *e)566 Evas_Object* ewk_view_single_add(Evas* e) 567 567 { 568 568 return evas_object_smart_add(e, _ewk_view_single_smart_class_new()); -
trunk/Source/WebKit/efl/ewk/ewk_view_tiled.cpp
r94509 r95659 31 31 static Ewk_View_Smart_Class _parent_sc = EWK_VIEW_SMART_CLASS_INIT_NULL; 32 32 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;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; 36 36 Eina_Rectangle r = {area->x + t->x, area->y + t->y, area->w, area->h}; 37 37 … … 39 39 } 40 40 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;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; 44 44 ewk_view_layout_if_needed_recursive(priv); 45 45 return 0; 46 46 } 47 47 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);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); 51 51 ewk_tiled_backing_store_render_cb_set 52 52 (bs, _ewk_view_tiled_render_cb, sd->_priv); … … 57 57 58 58 static 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; 63 63 64 64 ewk_tiled_backing_store_contents_resize … … 66 66 } 67 67 68 static void _ewk_view_tiled_smart_add(Evas_Object *o)69 { 70 Ewk_View_Smart_Data *sd;68 static void _ewk_view_tiled_smart_add(Evas_Object* o) 69 { 70 Ewk_View_Smart_Data* sd; 71 71 72 72 _parent_sc.sc.add(o); … … 82 82 } 83 83 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;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; 88 88 size_t count; 89 89 Evas_Coord vw, vh; … … 138 138 } 139 139 140 static Eina_Bool _ewk_view_tiled_smart_repaints_process(Ewk_View_Smart_Data *sd)141 { 142 const Eina_Rectangle *pr, *pr_end;140 static Eina_Bool _ewk_view_tiled_smart_repaints_process(Ewk_View_Smart_Data* sd) 141 { 142 const Eina_Rectangle* pr, * pr_end; 143 143 size_t count; 144 144 int sx, sy; … … 161 161 } 162 162 163 static Eina_Bool _ewk_view_tiled_smart_contents_resize(Ewk_View_Smart_Data *sd, int w, int h)163 static Eina_Bool _ewk_view_tiled_smart_contents_resize(Ewk_View_Smart_Data* sd, int w, int h) 164 164 { 165 165 ewk_tiled_backing_store_contents_resize(sd->backing_store, w, h); … … 167 167 } 168 168 169 static Eina_Bool _ewk_view_tiled_smart_zoom_set(Ewk_View_Smart_Data *sd, float zoom, Evas_Coord cx, Evas_Coord cy)169 static Eina_Bool _ewk_view_tiled_smart_zoom_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy) 170 170 { 171 171 Evas_Coord x, y, w, h; … … 187 187 } 188 188 189 static Eina_Bool _ewk_view_tiled_smart_zoom_weak_set(Ewk_View_Smart_Data *sd, float zoom, Evas_Coord cx, Evas_Coord cy)189 static Eina_Bool _ewk_view_tiled_smart_zoom_weak_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy) 190 190 { 191 191 return ewk_tiled_backing_store_zoom_weak_set(sd->backing_store, zoom, cx, cy); 192 192 } 193 193 194 static void _ewk_view_tiled_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data *sd, Eina_Bool smooth_scale)194 static void _ewk_view_tiled_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data* sd, Eina_Bool smooth_scale) 195 195 { 196 196 ewk_tiled_backing_store_zoom_weak_smooth_scale_set(sd->backing_store, smooth_scale); 197 197 } 198 198 199 static void _ewk_view_tiled_smart_flush(Ewk_View_Smart_Data *sd)199 static void _ewk_view_tiled_smart_flush(Ewk_View_Smart_Data* sd) 200 200 { 201 201 ewk_tiled_backing_store_flush(sd->backing_store); … … 203 203 } 204 204 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)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) 206 206 { 207 207 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 211 static Eina_Bool _ewk_view_tiled_smart_pre_render_relative_radius(Ewk_View_Smart_Data* sd, unsigned int n, float zoom) 212 212 { 213 213 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 217 static void _ewk_view_tiled_smart_pre_render_cancel(Ewk_View_Smart_Data* sd) 218 218 { 219 219 ewk_tiled_backing_store_pre_render_cancel(sd->backing_store); 220 220 } 221 221 222 static Eina_Bool _ewk_view_tiled_smart_disable_render(Ewk_View_Smart_Data *sd)222 static Eina_Bool _ewk_view_tiled_smart_disable_render(Ewk_View_Smart_Data* sd) 223 223 { 224 224 return ewk_tiled_backing_store_disable_render(sd->backing_store); 225 225 } 226 226 227 static Eina_Bool _ewk_view_tiled_smart_enable_render(Ewk_View_Smart_Data *sd)227 static Eina_Bool _ewk_view_tiled_smart_enable_render(Ewk_View_Smart_Data* sd) 228 228 { 229 229 return ewk_tiled_backing_store_enable_render(sd->backing_store); 230 230 } 231 231 232 Eina_Bool ewk_view_tiled_smart_set(Ewk_View_Smart_Class *api)232 Eina_Bool ewk_view_tiled_smart_set(Ewk_View_Smart_Class* api) 233 233 { 234 234 if (!ewk_view_base_smart_set(api)) … … 256 256 } 257 257 258 static inline Evas_Smart *_ewk_view_tiled_smart_class_new(void)258 static inline Evas_Smart* _ewk_view_tiled_smart_class_new(void) 259 259 { 260 260 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; 262 262 263 263 if (EINA_UNLIKELY(!smart)) { … … 269 269 } 270 270 271 Evas_Object *ewk_view_tiled_add(Evas *e)271 Evas_Object* ewk_view_tiled_add(Evas* e) 272 272 { 273 273 return evas_object_smart_add(e, _ewk_view_tiled_smart_class_new()); 274 274 } 275 275 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);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); 279 279 EINA_SAFETY_ON_NULL_RETURN_VAL(sd, 0); 280 280 return ewk_tiled_backing_store_tile_unused_cache_get(sd->backing_store); 281 281 } 282 282 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);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); 286 286 EINA_SAFETY_ON_NULL_RETURN(sd); 287 287 ewk_tiled_backing_store_tile_unused_cache_set(sd->backing_store, cache); -
trunk/Source/WebKit/efl/ewk/ewk_window_features.cpp
r95088 r95659 33 33 struct _Ewk_Window_Features { 34 34 unsigned int __ref; 35 WebCore::WindowFeatures *core;35 WebCore::WindowFeatures* core; 36 36 }; 37 37 38 void ewk_window_features_unref(Ewk_Window_Features *window_features)38 void ewk_window_features_unref(Ewk_Window_Features* window_features) 39 39 { 40 40 EINA_SAFETY_ON_NULL_RETURN(window_features); … … 49 49 } 50 50 51 void ewk_window_features_ref(Ewk_Window_Features *window_features)51 void ewk_window_features_ref(Ewk_Window_Features* window_features) 52 52 { 53 53 EINA_SAFETY_ON_NULL_RETURN(window_features); … … 55 55 } 56 56 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)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) 58 58 { 59 59 EINA_SAFETY_ON_NULL_RETURN(window_features); … … 79 79 } 80 80 81 void ewk_window_features_int_property_get(const Ewk_Window_Features *window_features, int *x, int *y, int *w, int *h)81 void ewk_window_features_int_property_get(const Ewk_Window_Features* window_features, int* x, int* y, int* w, int* h) 82 82 { 83 83 EINA_SAFETY_ON_NULL_RETURN(window_features); … … 108 108 * @return a new allocated the Ewk_Window_Features object on sucess or @c 0 on failure 109 109 */ 110 Ewk_Window_Features *ewk_window_features_new_from_core(const WebCore::WindowFeatures *core)110 Ewk_Window_Features* ewk_window_features_new_from_core(const WebCore::WindowFeatures* core) 111 111 { 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))); 113 113 if (!window_features) { 114 114 CRITICAL("Could not allocate Ewk_Window_Features.");
Note: See TracChangeset
for help on using the changeset viewer.