Changeset 102892 in webkit
- Timestamp:
- Dec 14, 2011 10:36:25 PM (12 years ago)
- Location:
- trunk/Source/WebKit/efl
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/efl/ChangeLog
r102874 r102892 1 2011-12-14 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 3 [EFL] Change efl style variable name with WebKit style for internal functions. 4 https://bugs.webkit.org/show_bug.cgi?id=74474 5 6 Reviewed by Ryosuke Niwa. 7 8 In order to be more compliant with WebKit coding style, variable names of internal functions 9 should be changed with WebKit coding style. 10 11 * ewk/ewk_private.h: 12 * ewk/ewk_view.cpp: 13 (ewk_view_scroll): 14 1 15 2011-12-14 Jing Zhao <jingzhao@chromium.org> 2 16 -
trunk/Source/WebKit/efl/ewk/ewk_private.h
r102600 r102892 85 85 } // namespace EWKPrivate 86 86 87 void ewk_view_ready(Evas_Object* o);88 void ewk_view_input_method_state_set(Evas_Object* o, bool active);89 void ewk_view_title_set(Evas_Object* o, const char* title);90 void ewk_view_uri_changed(Evas_Object* o);91 void ewk_view_load_document_finished(Evas_Object* o, Evas_Object* frame);92 void ewk_view_load_started(Evas_Object* o);93 void ewk_view_load_provisional(Evas_Object* o);94 void ewk_view_frame_main_load_started(Evas_Object* o);95 void ewk_view_frame_main_cleared(Evas_Object* o);96 void ewk_view_frame_main_icon_received(Evas_Object* o);97 void ewk_view_load_finished(Evas_Object* o, const Ewk_Frame_Load_Error* error);98 void ewk_view_load_error(Evas_Object* o, const Ewk_Frame_Load_Error* error);99 void ewk_view_load_progress_changed(Evas_Object* o);100 void ewk_view_load_show(Evas_Object* o);101 void ewk_view_restore_state(Evas_Object* o, Evas_Object* frame);102 Evas_Object* ewk_view_window_create(Evas_Object* o, bool javascript, const WebCore::WindowFeatures* coreFeatures);103 void ewk_view_window_close(Evas_Object* o);104 105 void ewk_view_mouse_link_hover_in(Evas_Object* o, void* data);106 void ewk_view_mouse_link_hover_out(Evas_Object* o);107 108 void ewk_view_toolbars_visible_set(Evas_Object* o, bool visible);109 void ewk_view_toolbars_visible_get(Evas_Object* o, bool* visible);110 111 void ewk_view_statusbar_visible_set(Evas_Object* o, bool visible);112 void ewk_view_statusbar_visible_get(Evas_Object* o, bool* visible);113 void ewk_view_statusbar_text_set(Evas_Object* o, const char* text);114 115 void ewk_view_scrollbars_visible_set(Evas_Object* o, bool visible);116 void ewk_view_scrollbars_visible_get(Evas_Object* o, bool* visible);117 118 void ewk_view_menubar_visible_set(Evas_Object* o, bool visible);119 void ewk_view_menubar_visible_get(Evas_Object* o, bool* visible);120 121 void ewk_view_tooltip_text_set(Evas_Object* o, const char* text);122 123 void ewk_view_add_console_message(Evas_Object* o, const char* message, unsigned int lineNumber, const char* sourceID);124 125 void ewk_view_run_javascript_alert(Evas_Object* o, Evas_Object* frame, const char* message);126 bool ewk_view_run_javascript_confirm(Evas_Object* o, Evas_Object* frame, const char* message);127 bool ewk_view_run_javascript_prompt(Evas_Object* o, Evas_Object* frame, const char* message, const char* defaultValue, char** value);128 bool ewk_view_should_interrupt_javascript(Evas_Object* o);129 uint64_t ewk_view_exceeded_database_quota(Evas_Object* o, Evas_Object* frame, const char* databaseName, uint64_t current_size, uint64_t expected_size);87 void ewk_view_ready(Evas_Object* ewkView); 88 void ewk_view_input_method_state_set(Evas_Object* ewkView, bool active); 89 void ewk_view_title_set(Evas_Object* ewkView, const char* title); 90 void ewk_view_uri_changed(Evas_Object* ewkView); 91 void ewk_view_load_document_finished(Evas_Object* ewkView, Evas_Object* frame); 92 void ewk_view_load_started(Evas_Object* ewkView); 93 void ewk_view_load_provisional(Evas_Object* ewkView); 94 void ewk_view_frame_main_load_started(Evas_Object* ewkView); 95 void ewk_view_frame_main_cleared(Evas_Object* ewkView); 96 void ewk_view_frame_main_icon_received(Evas_Object* ewkView); 97 void ewk_view_load_finished(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error); 98 void ewk_view_load_error(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error); 99 void ewk_view_load_progress_changed(Evas_Object* ewkView); 100 void ewk_view_load_show(Evas_Object* ewkView); 101 void ewk_view_restore_state(Evas_Object* ewkView, Evas_Object* frame); 102 Evas_Object* ewk_view_window_create(Evas_Object* ewkView, bool javascript, const WebCore::WindowFeatures* coreFeatures); 103 void ewk_view_window_close(Evas_Object* ewkView); 104 105 void ewk_view_mouse_link_hover_in(Evas_Object* ewkView, void* data); 106 void ewk_view_mouse_link_hover_out(Evas_Object* ewkView); 107 108 void ewk_view_toolbars_visible_set(Evas_Object* ewkView, bool visible); 109 void ewk_view_toolbars_visible_get(Evas_Object* ewkView, bool* visible); 110 111 void ewk_view_statusbar_visible_set(Evas_Object* ewkView, bool visible); 112 void ewk_view_statusbar_visible_get(Evas_Object* ewkView, bool* visible); 113 void ewk_view_statusbar_text_set(Evas_Object* ewkView, const char* text); 114 115 void ewk_view_scrollbars_visible_set(Evas_Object* ewkView, bool visible); 116 void ewk_view_scrollbars_visible_get(Evas_Object* ewkView, bool* visible); 117 118 void ewk_view_menubar_visible_set(Evas_Object* ewkView, bool visible); 119 void ewk_view_menubar_visible_get(Evas_Object* ewkView, bool* visible); 120 121 void ewk_view_tooltip_text_set(Evas_Object* ewkView, const char* text); 122 123 void ewk_view_add_console_message(Evas_Object* ewkView, const char* message, unsigned int lineNumber, const char* sourceID); 124 125 void ewk_view_run_javascript_alert(Evas_Object* ewkView, Evas_Object* frame, const char* message); 126 bool ewk_view_run_javascript_confirm(Evas_Object* ewkView, Evas_Object* frame, const char* message); 127 bool ewk_view_run_javascript_prompt(Evas_Object* ewkView, Evas_Object* frame, const char* message, const char* defaultValue, char** value); 128 bool ewk_view_should_interrupt_javascript(Evas_Object* ewkView); 129 uint64_t ewk_view_exceeded_database_quota(Evas_Object* ewkView, Evas_Object* frame, const char* databaseName, uint64_t currentSize, uint64_t expectedSize); 130 130 131 131 bool ewk_view_run_open_panel(Evas_Object* ewkView, Evas_Object* frame, bool allowsMultipleFiles, const Vector<String>& acceptMIMETypes, Eina_List** selectedFilenames); 132 132 133 void ewk_view_repaint(Evas_Object* o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);134 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, bool main_frame);135 WebCore::Page* ewk_view_core_page_get(const Evas_Object* o);136 137 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);138 139 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);140 141 void ewk_view_popup_new(Evas_Object* o, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect);142 void ewk_view_viewport_attributes_set(Evas_Object* o, const WebCore::ViewportArguments& arguments);143 144 void ewk_view_download_request(Evas_Object* o, Ewk_Download* download);145 146 void ewk_view_editor_client_contents_changed(Evas_Object* o);147 void ewk_view_editor_client_selection_changed(Evas_Object* o);148 149 bool ewk_view_focus_can_cycle(Evas_Object *o, Ewk_Focus_Direction direction);133 void ewk_view_repaint(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height); 134 void ewk_view_scroll(Evas_Object* ewkView, Evas_Coord deltaX, Evas_Coord deltaY, Evas_Coord scrollX, Evas_Coord scrollY, Evas_Coord scrollWidth, Evas_Coord scrollHeight, Evas_Coord centerX, Evas_Coord centerY, Evas_Coord centerW, Evas_Coord centerHeight, bool mainFrame); 135 WebCore::Page* ewk_view_core_page_get(const Evas_Object* ewkView); 136 137 WTF::PassRefPtr<WebCore::Frame> ewk_view_frame_create(Evas_Object* ewkView, Evas_Object* frame, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, const WebCore::KURL& url, const WTF::String& referrer); 138 139 WTF::PassRefPtr<WebCore::Widget> ewk_view_plugin_create(Evas_Object* ewkView, 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); 140 141 void ewk_view_popup_new(Evas_Object* ewkView, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect); 142 void ewk_view_viewport_attributes_set(Evas_Object* ewkView, const WebCore::ViewportArguments& arguments); 143 144 void ewk_view_download_request(Evas_Object* ewkView, Ewk_Download* download); 145 146 void ewk_view_editor_client_contents_changed(Evas_Object* ewkView); 147 void ewk_view_editor_client_selection_changed(Evas_Object* ewkView); 148 149 bool ewk_view_focus_can_cycle(Evas_Object* ewkView, Ewk_Focus_Direction direction); 150 150 151 151 #if ENABLE(NETSCAPE_PLUGIN_API) 152 void ewk_view_js_window_object_clear(Evas_Object* o, Evas_Object* frame);152 void ewk_view_js_window_object_clear(Evas_Object* ewkView, Evas_Object* frame); 153 153 #endif 154 154 … … 166 166 #if ENABLE(CONTEXT_MENUS) 167 167 Ewk_Context_Menu* ewk_context_menu_new(Evas_Object* view, WebCore::ContextMenuController* controller); 168 bool ewk_context_menu_free(Ewk_Context_Menu* o);169 void ewk_context_menu_item_append(Ewk_Context_Menu* o, WebCore::ContextMenuItem& core);170 Ewk_Context_Menu* ewk_context_menu_customize(Ewk_Context_Menu* o);171 void ewk_context_menu_show(Ewk_Context_Menu* o);168 bool ewk_context_menu_free(Ewk_Context_Menu* menu); 169 void ewk_context_menu_item_append(Ewk_Context_Menu* menu, WebCore::ContextMenuItem& core); 170 Ewk_Context_Menu* ewk_context_menu_customize(Ewk_Context_Menu* menu); 171 void ewk_context_menu_show(Ewk_Context_Menu* menu); 172 172 #endif 173 173 … … 175 175 const Ewk_Scroll_Request* ewk_view_scroll_requests_get(const Ewk_View_Private_Data* priv, size_t* count); 176 176 177 void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord w , Evas_Coord h);177 void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height); 178 178 179 179 void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data* priv); … … 181 181 Ewk_Window_Features* ewk_window_features_new_from_core(const WebCore::WindowFeatures* core); 182 182 183 Evas_Object* ewk_frame_add(Evas* e);184 bool ewk_frame_init(Evas_Object* o, Evas_Object* view, WebCore::Frame* frame);185 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);186 void ewk_frame_view_set(Evas_Object* o, Evas_Object* newParent);187 188 void ewk_frame_core_gone(Evas_Object* o);189 190 void ewk_frame_load_started(Evas_Object* o);191 void ewk_frame_load_provisional(Evas_Object* o);192 void ewk_frame_load_firstlayout_finished(Evas_Object* o);193 void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* o);194 void ewk_frame_load_document_finished(Evas_Object* o);195 void ewk_frame_load_finished(Evas_Object* o, const char* error_domain, int error_code, bool is_cancellation, const char* error_description, const char* failing_url);196 void ewk_frame_load_error(Evas_Object* o, const char* error_domain, int error_code, bool is_cancellation, const char* error_description, const char* failing_url);197 void ewk_frame_load_progress_changed(Evas_Object* o);198 199 void ewk_frame_request_will_send(Evas_Object* o, Ewk_Frame_Resource_Request* request);200 void ewk_frame_request_assign_identifier(Evas_Object* o, const Ewk_Frame_Resource_Request* request);201 void ewk_frame_view_state_save(Evas_Object* o, WebCore::HistoryItem* item);202 203 void ewk_frame_did_perform_first_navigation(Evas_Object* o);204 205 void ewk_frame_contents_size_changed(Evas_Object* o, Evas_Coord w, Evas_Coord h);206 void ewk_frame_title_set(Evas_Object* o, const char* title);207 208 void ewk_frame_view_create_for_view(Evas_Object* o, Evas_Object* view);209 bool ewk_frame_uri_changed(Evas_Object* o);210 void ewk_frame_force_layout(Evas_Object* o);211 212 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);213 214 bool ewk_view_navigation_policy_decision(Evas_Object* o, Ewk_Frame_Resource_Request* request);215 216 void ewk_view_contents_size_changed(Evas_Object* o, Evas_Coord w, Evas_Coord h);217 218 WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* o);183 Evas_Object* ewk_frame_add(Evas* canvas); 184 bool ewk_frame_init(Evas_Object* ewkFrame, Evas_Object* view, WebCore::Frame* frame); 185 bool ewk_frame_child_add(Evas_Object* ewkFrame, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String& name, const WebCore::KURL& url, const WTF::String& referrer); 186 void ewk_frame_view_set(Evas_Object* ewkFrame, Evas_Object* newParent); 187 188 void ewk_frame_core_gone(Evas_Object* ewkFrame); 189 190 void ewk_frame_load_started(Evas_Object* ewkFrame); 191 void ewk_frame_load_provisional(Evas_Object* ewkFrame); 192 void ewk_frame_load_firstlayout_finished(Evas_Object* ewkFrame); 193 void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* ewkFrame); 194 void ewk_frame_load_document_finished(Evas_Object* ewkFrame); 195 void ewk_frame_load_finished(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, bool isCancellation, const char* errorDescription, const char* failingUrl); 196 void ewk_frame_load_error(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, bool isCancellation, const char* errorDescription, const char* failingUrl); 197 void ewk_frame_load_progress_changed(Evas_Object* ewkFrame); 198 199 void ewk_frame_request_will_send(Evas_Object* ewkFrame, Ewk_Frame_Resource_Request* request); 200 void ewk_frame_request_assign_identifier(Evas_Object* ewkFrame, const Ewk_Frame_Resource_Request* request); 201 void ewk_frame_view_state_save(Evas_Object* ewkFrame, WebCore::HistoryItem* item); 202 203 void ewk_frame_did_perform_first_navigation(Evas_Object* ewkFrame); 204 205 void ewk_frame_contents_size_changed(Evas_Object* ewkFrame, Evas_Coord width, Evas_Coord height); 206 void ewk_frame_title_set(Evas_Object* ewkFrame, const char* title); 207 208 void ewk_frame_view_create_for_view(Evas_Object* ewkFrame, Evas_Object* view); 209 bool ewk_frame_uri_changed(Evas_Object* ewkFrame); 210 void ewk_frame_force_layout(Evas_Object* ewkFrame); 211 212 WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* ewkFrame, 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); 213 214 bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request); 215 216 void ewk_view_contents_size_changed(Evas_Object* ewkView, Evas_Coord width, Evas_Coord height); 217 218 WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* ewkView); 219 219 220 220 const char* ewk_settings_default_user_agent_get(); 221 221 222 void ewk_frame_editor_client_contents_changed(Evas_Object* o);223 void ewk_frame_editor_client_selection_changed(Evas_Object* o);222 void ewk_frame_editor_client_contents_changed(Evas_Object* ewkFrame); 223 void ewk_frame_editor_client_selection_changed(Evas_Object* ewkFrame); 224 224 225 225 void ewk_frame_mixed_content_displayed_set(Evas_Object* ewkFrame, bool hasDisplayed); -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r102600 r102892 3336 3336 } 3337 3337 3338 void ewk_view_scroll(Evas_Object* ewkView, Evas_Coord d x, Evas_Coord dy, Evas_Coord scrollX, Evas_Coord scrollY, Evas_Coord scrollWidth, Evas_Coord scrollHeight, Evas_Coord centerX, Evas_Coord centerY, Evas_Coord centerWidth, Evas_Coord centerHeight, bool mainFrame)3338 void ewk_view_scroll(Evas_Object* ewkView, Evas_Coord deltaX, Evas_Coord deltaY, Evas_Coord scrollX, Evas_Coord scrollY, Evas_Coord scrollWidth, Evas_Coord scrollHeight, Evas_Coord centerX, Evas_Coord centerY, Evas_Coord centerWidth, Evas_Coord centerHeight, bool mainFrame) 3339 3339 { 3340 3340 DBG("ewkView=%p, delta: %d,%d, scroll: %d,%d+%dx%d, clip: %d,%d+%dx%d", 3341 ewkView, d x, dy, scrollX, scrollY, scrollWidth, scrollHeight, centerX, centerY, centerWidth, centerHeight);3341 ewkView, deltaX, deltaY, scrollX, scrollY, scrollWidth, scrollHeight, centerX, centerY, centerWidth, centerHeight); 3342 3342 3343 3343 if ((scrollX != centerX) || (scrollY != centerY) || (scrollWidth != centerWidth) || (scrollHeight != centerHeight)) … … 3347 3347 EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData); 3348 3348 EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv); 3349 EINA_SAFETY_ON_TRUE_RETURN(!d x && !dy);3350 3351 _ewk_view_scroll_add(priv, d x, dy, scrollX, scrollY, scrollWidth, scrollHeight, mainFrame);3349 EINA_SAFETY_ON_TRUE_RETURN(!deltaX && !deltaY); 3350 3351 _ewk_view_scroll_add(priv, deltaX, deltaY, scrollX, scrollY, scrollWidth, scrollHeight, mainFrame); 3352 3352 3353 3353 _ewk_view_smart_changed(smartData);
Note: See TracChangeset
for help on using the changeset viewer.