Changeset 117046 in webkit
- Timestamp:
- May 15, 2012 2:49:23 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 26 edited
- 4 copied
- 7 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r116641 r117046 1 2012-05-15 Tomasz Morawski <t.morawski@samsung.com> 2 3 [EFL] Split ewk_private.h file to multiple private files. 4 https://bugs.webkit.org/show_bug.cgi?id=84572 5 6 Reviewed by Antonio Gomes. 7 8 * PlatformEfl.cmake: Removed ewk_logging.h file from EWebKit_HEADERS. 9 1 10 2012-05-10 Sam D <dsam2912@gmail.com> 2 11 -
trunk/Source/WebKit/PlatformEfl.cmake
r116453 r117046 257 257 ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_history.h 258 258 ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_js.h 259 ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_logging.h260 259 ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_main.h 261 260 ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_network.h -
trunk/Source/WebKit/efl/ChangeLog
r116964 r117046 1 2012-05-15 Tomasz Morawski <t.morawski@samsung.com> 2 3 [EFL] Split ewk_private.h file to multiple private files. 4 https://bugs.webkit.org/show_bug.cgi?id=84572 5 6 Reviewed by Antonio Gomes. 7 8 Split ewk_private file to multiple private files. 9 Delete ewk_logging.h and ewk_tiled_private.h files and removed tiled_backing_store logging domain. 10 11 * WebCoreSupport/ChromeClientEfl.cpp: 12 * WebCoreSupport/DumpRenderTreeSupportEfl.cpp: 13 * WebCoreSupport/EditorClientEfl.cpp: 14 * WebCoreSupport/FrameLoaderClientEfl.cpp: 15 * ewk/ewk_auth.cpp: 16 * ewk/ewk_auth_soup.cpp: 17 (detach): 18 * ewk/ewk_auth_soup_private.h: Renamed from Source/WebKit/efl/ewk/ewk_auth_soup.h. 19 * ewk/ewk_contextmenu_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h. 20 (WebCore): 21 * ewk/ewk_frame.cpp: 22 * ewk/ewk_frame_private.h: Added. 23 (WebCore): 24 (EWKPrivate): 25 * ewk/ewk_history.cpp: 26 * ewk/ewk_history_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h. 27 (WebCore): 28 (EWKPrivate): 29 * ewk/ewk_js.cpp: 30 * ewk/ewk_js_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h. 31 (_Ewk_JS_Object): 32 * ewk/ewk_main.cpp: 33 * ewk/ewk_network.cpp: 34 * ewk/ewk_private.h: 35 (WebCore): 36 * ewk/ewk_security_origin_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h. 37 (WebCore): 38 * ewk/ewk_settings.cpp: 39 * ewk/ewk_settings_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h. 40 * ewk/ewk_tiled_backing_store.cpp: 41 (_Ewk_Tiled_Backing_Store_Item): 42 (ewk_tiled_backing_store_add): 43 * ewk/ewk_tiled_backing_store_private.h: Renamed from Source/WebKit/efl/ewk/ewk_tiled_backing_store.h. 44 (_Ewk_Tile_Stats): 45 (_Ewk_Tile): 46 * ewk/ewk_tiled_matrix.cpp: 47 * ewk/ewk_tiled_matrix_private.h: Renamed from Source/WebKit/efl/ewk/ewk_tiled_matrix.h. 48 * ewk/ewk_tiled_model.cpp: 49 (tile_account): 50 * ewk/ewk_tiled_model_private.h: Renamed from Source/WebKit/efl/ewk/ewk_tiled_model.h. 51 * ewk/ewk_util.cpp: 52 * ewk/ewk_util_private.h: Renamed from Source/WebKit/efl/ewk/ewk_util.h. 53 * ewk/ewk_view.cpp: 54 (_Ewk_View_Private_Data): 55 * ewk/ewk_view_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h. 56 (WebCore): 57 (EWKPrivate): 58 * ewk/ewk_view_single.cpp: 59 * ewk/ewk_view_tiled.cpp: 60 * ewk/ewk_window_features.cpp: 61 * ewk/ewk_window_features_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h. 62 1 63 2012-05-14 Raphael Kubo da Costa <rakuco@webkit.org> 2 64 -
trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
r116964 r117046 38 38 #include "FileIconLoader.h" 39 39 #include "FloatRect.h" 40 #include "Frame.h" 40 41 #include "FrameLoader.h" 41 42 #include "FrameLoaderClientEfl.h" … … 51 52 #include "ViewportArguments.h" 52 53 #include "WindowFeatures.h" 54 #include "ewk_frame_private.h" 53 55 #include "ewk_private.h" 56 #include "ewk_view_private.h" 54 57 #include <Ecore_Evas.h> 55 58 #include <Evas.h> -
trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
r116729 r117046 23 23 24 24 #include "FrameLoaderClientEfl.h" 25 #include "ewk_frame_private.h" 26 #include "ewk_history_private.h" 25 27 #include "ewk_private.h" 28 #include "ewk_view_private.h" 26 29 27 30 #include <AnimationController.h> -
trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
r116726 r117046 36 36 #include "UndoStep.h" 37 37 #include "WindowsKeyboardCodes.h" 38 #include "ewk_frame_private.h" 38 39 #include "ewk_private.h" 40 #include "ewk_view_private.h" 39 41 40 42 using namespace WebCore; -
trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
r116547 r117046 54 54 #include "Settings.h" 55 55 #include "WebKitVersion.h" 56 #include "ewk_ logging.h"56 #include "ewk_frame_private.h" 57 57 #include "ewk_private.h" 58 #include "ewk_settings_private.h" 59 #include "ewk_view_private.h" 58 60 #include <Ecore_Evas.h> 59 61 #include <wtf/text/CString.h> -
trunk/Source/WebKit/efl/ewk/ewk_auth.cpp
r107562 r117046 21 21 #include "ewk_auth.h" 22 22 23 #include "ewk_auth_soup .h"23 #include "ewk_auth_soup_private.h" 24 24 25 25 void ewk_auth_show_dialog_callback_set(Ewk_Auth_Show_Dialog_Callback callback) -
trunk/Source/WebKit/efl/ewk/ewk_auth_soup.cpp
r109205 r117046 20 20 21 21 #include "config.h" 22 #include "ewk_auth_soup .h"22 #include "ewk_auth_soup_private.h" 23 23 24 24 #include "ewk_auth.h" 25 #include "ewk_logging.h"26 25 #include <glib-object.h> 27 26 #include <glib.h> 28 27 #include <libsoup/soup.h> 29 30 #ifdef __cplusplus31 extern "C" {32 #endif33 28 34 29 /** … … 69 64 } 70 65 66 /** 67 * @internal 68 * Sets callback to be called when authentication is required. 69 */ 71 70 void ewk_auth_soup_show_dialog_callback_set(Ewk_Auth_Show_Dialog_Callback callback) 72 71 { … … 74 73 } 75 74 75 /** 76 * @internal 77 * Method for setting credentials 78 * 79 * @param username username 80 * @param password password 81 * @param data soup authentication data 82 */ 76 83 void ewk_auth_soup_credentials_set(const char* username, const char* password, void* data) 77 84 { … … 129 136 g_signal_handlers_disconnect_by_func(session, (void*)session_authenticate, manager); 130 137 } 131 132 #ifdef __cplusplus133 }134 #endif -
trunk/Source/WebKit/efl/ewk/ewk_auth_soup_private.h
r117045 r117046 19 19 */ 20 20 21 #ifndef ewk_auth_soup_ h22 #define ewk_auth_soup_ h21 #ifndef ewk_auth_soup_private_h 22 #define ewk_auth_soup_private_h 23 23 24 24 #include "ewk_auth.h" 25 25 #include <glib-object.h> 26 26 #include <glib.h> 27 28 #ifdef __cplusplus29 extern "C" {30 #endif31 27 32 28 #define EWK_TYPE_SOUP_AUTH_DIALOG (ewk_auth_soup_dialog_get_type()) … … 52 48 void ewk_auth_soup_show_dialog_callback_set(Ewk_Auth_Show_Dialog_Callback callback); 53 49 54 /**55 * Method for setting credentials56 *57 * @param username username58 * @param password password59 * @param data soup authentication data60 */61 50 void ewk_auth_soup_credentials_set(const char *username, const char *password, void *data); 62 51 63 #ifdef __cplusplus 64 } 65 #endif 66 67 #endif // ewk_auth_soup_h 52 #endif // ewk_auth_soup_private_h -
trunk/Source/WebKit/efl/ewk/ewk_contextmenu_private.h
r117045 r117046 1 1 /* 2 2 Copyright (C) 2009-2010 ProFUSION embedded systems 3 Copyright (C) 2009-201 0Samsung Electronics3 Copyright (C) 2009-2012 Samsung Electronics 4 4 5 5 This library is free software; you can redistribute it and/or … … 19 19 */ 20 20 21 /** 22 * @file ewk_logging.h 23 * @brief Provides macros for logging. 24 */ 21 #ifndef ewk_contextmenu_private_h 22 #define ewk_contextmenu_private_h 25 23 26 #ifndef ewk_logging_h 27 #define ewk_logging_h 24 // forward declarations 25 namespace WebCore { 26 struct ContextMenu; 27 struct ContextMenuItem; 28 } 28 29 29 extern int _ewk_log_dom; 30 #define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_log_dom, __VA_ARGS__) 31 #define ERR(...) EINA_LOG_DOM_ERR(_ewk_log_dom, __VA_ARGS__) 32 #define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__) 33 #define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__) 34 #define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__) 30 #if ENABLE(CONTEXT_MENUS) 31 Ewk_Context_Menu* ewk_context_menu_new(Evas_Object* view, WebCore::ContextMenuController* controller); 32 bool ewk_context_menu_free(Ewk_Context_Menu* menu); 33 void ewk_context_menu_item_append(Ewk_Context_Menu* menu, WebCore::ContextMenuItem& core); 34 Ewk_Context_Menu* ewk_context_menu_customize(Ewk_Context_Menu* menu); 35 void ewk_context_menu_show(Ewk_Context_Menu* menu); 36 #endif 35 37 36 #endif // ewk_ logging_h38 #endif // ewk_context_manu_private_h -
trunk/Source/WebKit/efl/ewk/ewk_frame.cpp
r116547 r117046 51 51 #include "SubstituteData.h" 52 52 #include "WindowsKeyboardCodes.h" 53 #include "ewk_ logging.h"53 #include "ewk_frame_private.h" 54 54 #include "ewk_private.h" 55 #include "ewk_security_origin_private.h" 56 #include "ewk_view_private.h" 55 57 #include <Eina.h> 56 58 #include <Evas.h> 57 59 #include <eina_safety_checks.h> 58 60 #include <wtf/Assertions.h> 61 #include <wtf/PassRefPtr.h> 59 62 #include <wtf/RefPtr.h> 63 #include <wtf/Vector.h> 60 64 #include <wtf/text/CString.h> 61 65 -
trunk/Source/WebKit/efl/ewk/ewk_history.cpp
r115385 r117046 29 29 #include "Page.h" 30 30 #include "PageGroup.h" 31 #include "ewk_ logging.h"31 #include "ewk_history_private.h" 32 32 #include "ewk_private.h" 33 #include "ewk_util .h"33 #include "ewk_util_private.h" 34 34 #include <Eina.h> 35 35 #include <eina_safety_checks.h> -
trunk/Source/WebKit/efl/ewk/ewk_history_private.h
r117045 r117046 1 1 /* 2 2 Copyright (C) 2009-2010 ProFUSION embedded systems 3 Copyright (C) 2009-201 0Samsung Electronics3 Copyright (C) 2009-2012 Samsung Electronics 4 4 5 5 This library is free software; you can redistribute it and/or … … 19 19 */ 20 20 21 /** 22 * @file ewk_util.h 23 * @brief Helpfull methods for WebKit-EFL. 24 */ 21 #ifndef ewk_history_private_h 22 #define ewk_history_private_h 25 23 26 #ifndef ewk_util_h 27 #define ewk_util_h 24 #include "BackForwardListImpl.h" 28 25 29 #include <Evas.h> 30 #include <cairo.h> 26 namespace WebCore { 27 class HistoryItem; 28 class BackForwardListImpl; 29 } 31 30 32 Evas_Object *ewk_util_image_from_cairo_surface_add(Evas *canvas, cairo_surface_t *surface); 31 Ewk_History_Item *ewk_history_item_new_from_core(WebCore::HistoryItem *core); 32 Ewk_History* ewk_history_new(WebCore::BackForwardListImpl* history); 33 void ewk_history_free(Ewk_History* history); 33 34 34 #endif // ewk_util_h 35 namespace EWKPrivate { 36 WebCore::HistoryItem *coreHistoryItem(const Ewk_History_Item *ewkHistoryItem); 37 } // namespace EWKPrivate 38 39 #endif // ewk_history_private_h -
trunk/Source/WebKit/efl/ewk/ewk_js.cpp
r104806 r117046 24 24 25 25 #include "NP_jsobject.h" 26 #include "ewk_ logging.h"26 #include "ewk_js_private.h" 27 27 #include "ewk_private.h" 28 28 #include "npruntime.h" -
trunk/Source/WebKit/efl/ewk/ewk_js_private.h
r117045 r117046 1 1 /* 2 2 Copyright (C) 2009-2010 ProFUSION embedded systems 3 Copyright (C) 2009-201 0Samsung Electronics3 Copyright (C) 2009-2012 Samsung Electronics 4 4 5 5 This library is free software; you can redistribute it and/or … … 19 19 */ 20 20 21 /** 22 * @file ewk_util.h 23 * @brief Helpfull methods for WebKit-EFL. 24 */ 21 #ifndef ewk_js_private_h 22 #define ewk_js_private_h 25 23 26 #i fndef ewk_util_h27 # define ewk_util_h24 #include "NP_jsobject.h" 25 #include "ewk_js.h" 28 26 29 #i nclude <Evas.h>30 # include <cairo.h>27 #if ENABLE(NETSCAPE_PLUGIN_API) 28 #define EWK_JS_OBJECT_MAGIC 0x696969 31 29 32 Evas_Object *ewk_util_image_from_cairo_surface_add(Evas *canvas, cairo_surface_t *surface); 30 typedef struct _Ewk_JS_Class Ewk_JS_Class; 31 struct _Ewk_JS_Object { 32 JavaScriptObject base; 33 const char* name; 34 const Ewk_JS_Class* cls; 35 Eina_Hash* properties; 36 Evas_Object* view; // ewk_view: check if this object has already been added to another ewk_view 37 Ewk_JS_Object_Type type; 38 EINA_MAGIC; 39 }; 40 #endif // ENABLE(NETSCAPE_PLUGIN_API) 33 41 34 #endif // ewk_ util_h42 #endif // ewk_js_private_h -
trunk/Source/WebKit/efl/ewk/ewk_main.cpp
r108070 r117046 31 31 #include "StorageTracker.h" 32 32 #include "StorageTrackerClientEfl.h" 33 #include "ewk_auth_soup.h" 34 #include "ewk_logging.h" 33 #include "ewk_auth_soup_private.h" 35 34 #include "ewk_network.h" 36 35 #include "ewk_private.h" -
trunk/Source/WebKit/efl/ewk/ewk_network.cpp
r107562 r117046 23 23 #include "NetworkStateNotifier.h" 24 24 #include "ResourceHandle.h" 25 #include "ewk_ logging.h"25 #include "ewk_private.h" 26 26 #include <Eina.h> 27 27 #include <libsoup/soup.h> -
trunk/Source/WebKit/efl/ewk/ewk_private.h
r116964 r117046 1 1 /* 2 2 Copyright (C) 2009-2010 ProFUSION embedded systems 3 Copyright (C) 2009-201 0Samsung Electronics3 Copyright (C) 2009-2012 Samsung Electronics 4 4 5 5 This library is free software; you can redistribute it and/or … … 19 19 */ 20 20 21 /**22 * @file ewk_private.h23 * @brief Private methods of WebKit-EFL.24 */25 26 21 #ifndef ewk_private_h 27 22 #define ewk_private_h 28 23 29 24 #include "APICast.h" 30 #include "BackForwardListImpl.h"31 #include "Frame.h"32 #include "NP_jsobject.h"33 #include "Page.h"34 #include "Widget.h"35 #include "ewk_history.h"36 #include "ewk_js.h"37 #include "ewk_view.h"38 25 #include <Evas.h> 39 #if USE(ACCELERATED_COMPOSITING)40 #include <Evas_GL.h>41 #endif42 #include <wtf/PassRefPtr.h>43 #include <wtf/Vector.h>44 26 45 27 // If defined, ewk will do type checking to ensure objects are of correct type … … 47 29 #define EWK_ARGB_BYTES_SIZE 4 48 30 49 #if ENABLE(NETSCAPE_PLUGIN_API)50 #define EWK_JS_OBJECT_MAGIC 0x69696951 52 typedef struct _Ewk_JS_Class Ewk_JS_Class;53 struct _Ewk_JS_Object {54 JavaScriptObject base;55 const char* name;56 const Ewk_JS_Class* cls;57 Eina_Hash* properties;58 Evas_Object* view; // ewk_view: check if this object has already been added to another ewk_view59 Ewk_JS_Object_Type type;60 EINA_MAGIC;61 };62 #endif // ENABLE(NETSCAPE_PLUGIN_API)63 64 // Defines the names for initializing ewk_view_smart_class65 const char ewkViewTiledName[] = "Ewk_View_Tiled";66 const char ewkViewSingleName[] = "Ewk_View_Single";67 68 // Define to prevent an application using different view type from calling the function.69 #define EWK_VIEW_TYPE_CHECK_OR_RETURN(ewkView, viewName, ...) \70 if (!evas_object_smart_type_check(ewkView, viewName)) { \71 INF("ewkView isn't an instance of %s", viewName); \72 return __VA_ARGS__; \73 }74 75 31 // forward declarations 76 32 namespace WebCore { 77 struct PopupMenuClient;78 struct ContextMenu;79 struct ContextMenuItem;80 #if ENABLE(INPUT_TYPE_COLOR)81 struct Color;82 struct ColorChooserClient;83 #endif84 33 #if USE(ACCELERATED_COMPOSITING) 85 34 class GraphicsContext3D; 86 35 class GraphicsLayer; 87 36 #endif 88 class SecurityOrigin;89 37 } 90 38 … … 95 43 }; 96 44 97 namespace EWKPrivate { 45 extern int _ewk_log_dom; 98 46 99 WebCore::Frame *coreFrame(const Evas_Object *ewkFrame); 100 WebCore::Page *corePage(const Evas_Object *ewkView); 101 WebCore::HistoryItem *coreHistoryItem(const Ewk_History_Item *ewkHistoryItem); 102 PlatformPageClient corePageClient(Evas_Object* ewkView); 103 104 Evas_Object* kitFrame(const WebCore::Frame* coreFrame); 105 106 } // namespace EWKPrivate 107 108 void ewk_view_ready(Evas_Object* ewkView); 109 void ewk_view_input_method_state_set(Evas_Object* ewkView, bool active); 110 void ewk_view_title_set(Evas_Object* ewkView, const char* title); 111 void ewk_view_uri_changed(Evas_Object* ewkView); 112 void ewk_view_load_document_finished(Evas_Object* ewkView, Evas_Object* frame); 113 void ewk_view_load_started(Evas_Object* ewkView, Evas_Object* ewkFrame); 114 void ewk_view_load_provisional(Evas_Object* ewkView); 115 void ewk_view_frame_main_load_started(Evas_Object* ewkView); 116 void ewk_view_frame_main_cleared(Evas_Object* ewkView); 117 void ewk_view_frame_main_icon_received(Evas_Object* ewkView); 118 void ewk_view_load_finished(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error); 119 void ewk_view_load_error(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error); 120 void ewk_view_load_progress_changed(Evas_Object* ewkView); 121 void ewk_view_load_show(Evas_Object* ewkView); 122 void ewk_view_onload_event(Evas_Object* ewkView, Evas_Object* frame); 123 void ewk_view_restore_state(Evas_Object* ewkView, Evas_Object* frame); 124 Evas_Object* ewk_view_window_create(Evas_Object* ewkView, bool javascript, const WebCore::WindowFeatures* coreFeatures); 125 void ewk_view_window_close(Evas_Object* ewkView); 126 127 void ewk_view_mouse_link_hover_in(Evas_Object* ewkView, void* data); 128 void ewk_view_mouse_link_hover_out(Evas_Object* ewkView); 129 130 void ewk_view_toolbars_visible_set(Evas_Object* ewkView, bool visible); 131 void ewk_view_toolbars_visible_get(Evas_Object* ewkView, bool* visible); 132 133 void ewk_view_statusbar_visible_set(Evas_Object* ewkView, bool visible); 134 void ewk_view_statusbar_visible_get(Evas_Object* ewkView, bool* visible); 135 void ewk_view_statusbar_text_set(Evas_Object* ewkView, const char* text); 136 137 void ewk_view_scrollbars_visible_set(Evas_Object* ewkView, bool visible); 138 void ewk_view_scrollbars_visible_get(Evas_Object* ewkView, bool* visible); 139 140 void ewk_view_menubar_visible_set(Evas_Object* ewkView, bool visible); 141 void ewk_view_menubar_visible_get(Evas_Object* ewkView, bool* visible); 142 143 void ewk_view_tooltip_text_set(Evas_Object* ewkView, const char* text); 144 145 void ewk_view_add_console_message(Evas_Object* ewkView, const char* message, unsigned int lineNumber, const char* sourceID); 146 147 void ewk_view_run_javascript_alert(Evas_Object* ewkView, Evas_Object* frame, const char* message); 148 bool ewk_view_run_javascript_confirm(Evas_Object* ewkView, Evas_Object* frame, const char* message); 149 bool ewk_view_run_javascript_prompt(Evas_Object* ewkView, Evas_Object* frame, const char* message, const char* defaultValue, char** value); 150 bool ewk_view_should_interrupt_javascript(Evas_Object* ewkView); 151 uint64_t ewk_view_exceeded_database_quota(Evas_Object* ewkView, Evas_Object* frame, const char* databaseName, uint64_t currentSize, uint64_t expectedSize); 152 153 bool ewk_view_run_open_panel(Evas_Object* ewkView, Evas_Object* frame, bool allowsMultipleFiles, const Vector<String>& acceptMIMETypes, Eina_List** selectedFilenames); 154 155 void ewk_view_repaint(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height); 156 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); 157 158 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); 159 160 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); 161 162 #if ENABLE(INPUT_TYPE_COLOR) 163 void ewk_view_color_chooser_new(Evas_Object* ewkView, WebCore::ColorChooserClient* client, const WebCore::Color& initialColor); 164 void ewk_view_color_chooser_changed(Evas_Object* ewkView, const WebCore::Color& newColor); 165 #endif 166 167 void ewk_view_popup_new(Evas_Object* ewkView, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect); 168 void ewk_view_viewport_attributes_set(Evas_Object* ewkView, const WebCore::ViewportArguments& arguments); 169 170 void ewk_view_download_request(Evas_Object* ewkView, Ewk_Download* download); 171 172 void ewk_view_editor_client_contents_changed(Evas_Object* ewkView); 173 void ewk_view_editor_client_selection_changed(Evas_Object* ewkView); 174 175 bool ewk_view_focus_can_cycle(Evas_Object* ewkView, Ewk_Focus_Direction direction); 176 void ewk_view_frame_view_creation_notify(Evas_Object* ewkView); 177 178 #if ENABLE(NETSCAPE_PLUGIN_API) 179 void ewk_view_js_window_object_clear(Evas_Object* ewkView, Evas_Object* frame); 180 #endif 181 182 #if ENABLE(TOUCH_EVENTS) 183 void ewk_view_need_touch_events_set(Evas_Object*, bool needed); 184 bool ewk_view_need_touch_events_get(const Evas_Object*); 185 #endif 186 187 Ewk_History_Item *ewk_history_item_new_from_core(WebCore::HistoryItem *core); 188 Ewk_History* ewk_history_new(WebCore::BackForwardListImpl* history); 189 void ewk_history_free(Ewk_History* history); 190 191 #if ENABLE(CONTEXT_MENUS) 192 Ewk_Context_Menu* ewk_context_menu_new(Evas_Object* view, WebCore::ContextMenuController* controller); 193 bool ewk_context_menu_free(Ewk_Context_Menu* menu); 194 void ewk_context_menu_item_append(Ewk_Context_Menu* menu, WebCore::ContextMenuItem& core); 195 Ewk_Context_Menu* ewk_context_menu_customize(Ewk_Context_Menu* menu); 196 void ewk_context_menu_show(Ewk_Context_Menu* menu); 197 #endif 198 199 const Eina_Rectangle* ewk_view_repaints_pop(Ewk_View_Private_Data* priv, size_t* count); 200 const Ewk_Scroll_Request* ewk_view_scroll_requests_get(const Ewk_View_Private_Data* priv, size_t* count); 201 202 void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height); 203 204 void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data* priv); 205 206 Ewk_Window_Features* ewk_window_features_new_from_core(const WebCore::WindowFeatures* core); 207 208 Evas_Object* ewk_frame_add(Evas* canvas); 209 bool ewk_frame_init(Evas_Object* ewkFrame, Evas_Object* view, WebCore::Frame* frame); 210 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); 211 void ewk_frame_view_set(Evas_Object* ewkFrame, Evas_Object* newParent); 212 213 void ewk_frame_core_gone(Evas_Object* ewkFrame); 214 215 void ewk_frame_load_committed(Evas_Object* ewkFrame); 216 void ewk_frame_load_started(Evas_Object* ewkFrame); 217 void ewk_frame_load_provisional(Evas_Object* ewkFrame); 218 void ewk_frame_load_firstlayout_finished(Evas_Object* ewkFrame); 219 void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* ewkFrame); 220 void ewk_frame_load_document_finished(Evas_Object* ewkFrame); 221 void ewk_frame_load_finished(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, bool isCancellation, const char* errorDescription, const char* failingUrl); 222 void ewk_frame_load_resource_finished(Evas_Object* ewkFrame, unsigned long identifier); 223 void ewk_frame_load_resource_failed(Evas_Object* ewkFrame, Ewk_Frame_Load_Error* error); 224 void ewk_frame_load_error(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, bool isCancellation, const char* errorDescription, const char* failingUrl); 225 void ewk_frame_load_progress_changed(Evas_Object* ewkFrame); 226 227 void ewk_frame_redirect_cancelled(Evas_Object* ewkFrame); 228 void ewk_frame_redirect_provisional_load(Evas_Object* ewkFrame); 229 void ewk_frame_redirect_requested(Evas_Object* ewkFrame, const char* url); 230 void ewk_frame_request_will_send(Evas_Object* ewkFrame, Ewk_Frame_Resource_Messages* messages); 231 void ewk_frame_request_assign_identifier(Evas_Object* ewkFrame, const Ewk_Frame_Resource_Request* request); 232 void ewk_frame_response_received(Evas_Object* ewkFrame, Ewk_Frame_Resource_Response* response); 233 void ewk_frame_view_state_save(Evas_Object* ewkFrame, WebCore::HistoryItem* item); 234 235 void ewk_frame_did_perform_first_navigation(Evas_Object* ewkFrame); 236 237 void ewk_frame_contents_size_changed(Evas_Object* ewkFrame, Evas_Coord width, Evas_Coord height); 238 void ewk_frame_title_set(Evas_Object* ewkFrame, const char* title); 239 240 void ewk_frame_view_create_for_view(Evas_Object* ewkFrame, Evas_Object* view); 241 bool ewk_frame_uri_changed(Evas_Object* ewkFrame); 242 void ewk_frame_force_layout(Evas_Object* ewkFrame); 243 void ewk_frame_icon_changed(Evas_Object* ewkFrame); 244 245 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); 246 247 bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request); 248 249 void ewk_view_contents_size_changed(Evas_Object* ewkView, Evas_Coord width, Evas_Coord height); 250 251 WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* ewkView); 252 253 const char* ewk_settings_default_user_agent_get(); 254 255 void ewk_frame_editor_client_contents_changed(Evas_Object* ewkFrame); 256 void ewk_frame_editor_client_selection_changed(Evas_Object* ewkFrame); 257 258 void ewk_frame_mixed_content_displayed_set(Evas_Object* ewkFrame, bool hasDisplayed); 259 void ewk_frame_mixed_content_run_set(Evas_Object* ewkFrame, bool hasRun); 260 void ewk_view_mixed_content_displayed_set(Evas_Object* ewkView, bool hasDisplayed); 261 void ewk_view_mixed_content_run_set(Evas_Object* ewkView, bool hasRun); 262 void ewk_frame_xss_detected(Evas_Object* ewkFrame, const Ewk_Frame_Xss_Notification* xssInfo); 263 264 Ewk_Security_Origin* ewk_security_origin_new(WebCore::SecurityOrigin* origin); 265 266 #if USE(ACCELERATED_COMPOSITING) 267 bool ewk_view_accelerated_compositing_object_create(Evas_Object* ewkView, Evas_Native_Surface* nativeSurface, const WebCore::IntRect& rect); 268 WebCore::GraphicsContext3D* ewk_view_accelerated_compositing_context_get(Evas_Object* ewkView); 269 #endif 47 #define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_log_dom, __VA_ARGS__) 48 #define ERR(...) EINA_LOG_DOM_ERR(_ewk_log_dom, __VA_ARGS__) 49 #define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__) 50 #define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__) 51 #define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__) 270 52 271 53 #endif // ewk_private_h -
trunk/Source/WebKit/efl/ewk/ewk_security_origin_private.h
r117045 r117046 1 1 /* 2 Copyright (C) 2009-2010 Samsung Electronics3 2 Copyright (C) 2009-2010 ProFUSION embedded systems 3 Copyright (C) 2009-2012 Samsung Electronics 4 4 5 5 This library is free software; you can redistribute it and/or … … 19 19 */ 20 20 21 #ifndef ewk_ tiled_private_h22 #define ewk_ tiled_private_h21 #ifndef ewk_security_origin_private_h 22 #define ewk_security_origin_private_h 23 23 24 /* logging */ 25 extern int _ewk_tiled_log_dom; 24 // forward declarations 25 namespace WebCore { 26 class SecurityOrigin; 27 } 26 28 27 #define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_tiled_log_dom, __VA_ARGS__) 28 #define ERR(...) EINA_LOG_DOM_ERR(_ewk_tiled_log_dom, __VA_ARGS__) 29 #define WRN(...) EINA_LOG_DOM_WARN(_ewk_tiled_log_dom, __VA_ARGS__) 30 #define INF(...) EINA_LOG_DOM_INFO(_ewk_tiled_log_dom, __VA_ARGS__) 31 #define DBG(...) EINA_LOG_DOM_DBG(_ewk_tiled_log_dom, __VA_ARGS__) 32 #endif // ewk_tiled_private_h 29 Ewk_Security_Origin* ewk_security_origin_new(WebCore::SecurityOrigin* origin); 30 31 #endif // ewk_security_origin_private_h -
trunk/Source/WebKit/efl/ewk/ewk_settings.cpp
r116302 r117046 35 35 #include "PageCache.h" 36 36 #include "Settings.h" 37 #include "ewk_logging.h"38 37 #include "ewk_private.h" 39 #include "ewk_util .h"38 #include "ewk_util_private.h" 40 39 #include <Eina.h> 41 40 #include <eina_safety_checks.h> -
trunk/Source/WebKit/efl/ewk/ewk_settings_private.h
r117045 r117046 1 1 /* 2 2 Copyright (C) 2009-2010 ProFUSION embedded systems 3 Copyright (C) 2009-201 0Samsung Electronics3 Copyright (C) 2009-2012 Samsung Electronics 4 4 5 5 This library is free software; you can redistribute it and/or … … 19 19 */ 20 20 21 /** 22 * @file ewk_logging.h 23 * @brief Provides macros for logging. 24 */ 21 #ifndef ewk_settings_private_h 22 #define ewk_settings_private_h 25 23 26 #ifndef ewk_logging_h 27 #define ewk_logging_h 24 const char* ewk_settings_default_user_agent_get(); 28 25 29 extern int _ewk_log_dom; 30 #define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_log_dom, __VA_ARGS__) 31 #define ERR(...) EINA_LOG_DOM_ERR(_ewk_log_dom, __VA_ARGS__) 32 #define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__) 33 #define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__) 34 #define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__) 35 36 #endif // ewk_logging_h 26 #endif // ewk_settings_private_h -
trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp
r112732 r117046 20 20 21 21 #include "config.h" 22 #include "ewk_tiled_backing_store.h"23 22 24 23 #include "ewk_private.h" 25 #include "ewk_tiled_matrix.h" 26 #include "ewk_tiled_private.h" 24 #include "ewk_tiled_backing_store_private.h" 25 #include "ewk_tiled_matrix_private.h" 26 #include "ewk_tiled_model_private.h" 27 27 #include <Ecore.h> 28 28 #include <Eina.h> … … 117 117 118 118 static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL; 119 int _ewk_tiled_log_dom = -1;120 119 121 120 #define PRIV_DATA_GET_OR_RETURN(obj, ptr, ...) \ … … 1387 1386 { 1388 1387 static Evas_Smart* smart = 0; 1389 1390 if (_ewk_tiled_log_dom < 0)1391 _ewk_tiled_log_dom = eina_log_domain_register("Ewk_Tiled_Backing_Store", 0);1392 1388 1393 1389 if (!smart) { -
trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store_private.h
r117045 r117046 19 19 */ 20 20 21 #ifndef ewk_tiled_backing_store_ h22 #define ewk_tiled_backing_store_ h21 #ifndef ewk_tiled_backing_store_private_h 22 #define ewk_tiled_backing_store_private_h 23 23 24 24 #include "EWebKit.h" 25 #include <Evas.h> 26 #include <cairo.h> 25 27 26 28 /* Enable accounting of render time in tile statistics */ 27 29 // #define TILE_STATS_ACCOUNT_RENDER_TIME 28 29 30 30 31 /* If define ewk will do more accounting to check for memory leaks … … 42 43 #define TILE_ZOOM_AT_SIZE(SIZE, ORIG_TILE) ((float)(SIZE) / (float)(ORIG_TILE)) 43 44 #define ROUNDED_ZOOM(SIZE, ZOOM) ((float)(SIZE) / (float)(((int)roundf((SIZE) / (ZOOM))))) 44 45 #include <Evas.h>46 #include <cairo.h>47 45 48 46 typedef struct _Ewk_Tile Ewk_Tile; … … 80 78 }; 81 79 82 #include "ewk_tiled_matrix.h"83 #include "ewk_tiled_model.h"84 85 80 /* view */ 86 81 Evas_Object *ewk_tiled_backing_store_add(Evas *e); … … 117 112 Eina_Bool ewk_tiled_backing_store_disable_render(Evas_Object *o); 118 113 Eina_Bool ewk_tiled_backing_store_enable_render(Evas_Object *o); 114 119 115 #endif // ewk_tiled_backing_store_h -
trunk/Source/WebKit/efl/ewk/ewk_tiled_matrix.cpp
r112732 r117046 21 21 #define __STDC_FORMAT_MACROS 22 22 #include "config.h" 23 #include "ewk_tiled_matrix.h" 24 25 #include "ewk_tiled_backing_store.h" 26 #include "ewk_tiled_private.h" 23 24 #include "ewk_private.h" 25 #include "ewk_tiled_backing_store_private.h" 26 #include "ewk_tiled_matrix_private.h" 27 #include "ewk_tiled_model_private.h" 27 28 #include <Eina.h> 28 29 #include <errno.h> -
trunk/Source/WebKit/efl/ewk/ewk_tiled_matrix_private.h
r117045 r117046 19 19 */ 20 20 21 #ifndef ewk_tiled_matrix_ h22 #define ewk_tiled_matrix_ h21 #ifndef ewk_tiled_matrix_private_h 22 #define ewk_tiled_matrix_private_h 23 23 24 #include "ewk_tiled_backing_store.h" 24 #include "ewk_tiled_backing_store_private.h" 25 #include "ewk_tiled_matrix_private.h" 25 26 26 27 #include <Evas.h> … … 59 60 void ewk_tile_accounting_dbg(); 60 61 61 #endif // ewk_tiled_matrix_ h62 #endif // ewk_tiled_matrix_private_h -
trunk/Source/WebKit/efl/ewk/ewk_tiled_model.cpp
r109205 r117046 21 21 #define __STDC_FORMAT_MACROS 22 22 #include "config.h" 23 #include "ewk_tiled_model.h" 24 25 #include "ewk_tiled_backing_store .h"26 #include "ewk_tiled_ private.h"23 24 #include "ewk_private.h" 25 #include "ewk_tiled_backing_store_private.h" 26 #include "ewk_tiled_model_private.h" 27 27 #include <Ecore_Evas.h> 28 28 #include <Eina.h> -
trunk/Source/WebKit/efl/ewk/ewk_tiled_model_private.h
r117045 r117046 19 19 */ 20 20 21 #ifndef ewk_tiled_model_ h22 #define ewk_tiled_model_ h21 #ifndef ewk_tiled_model_private_h 22 #define ewk_tiled_model_private_h 23 23 24 #include "ewk_tiled_backing_store .h"24 #include "ewk_tiled_backing_store_private.h" 25 25 26 26 #include <Evas.h> … … 54 54 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); 55 55 56 #endif // ewk_tiled_model_ h56 #endif // ewk_tiled_model_private_h -
trunk/Source/WebKit/efl/ewk/ewk_util.cpp
r103891 r117046 20 20 21 21 #include "config.h" 22 #include "ewk_util.h"23 22 24 #include "ewk_logging.h"25 23 #include "ewk_private.h" 24 #include "ewk_util_private.h" 26 25 #include <eina_safety_checks.h> 27 26 -
trunk/Source/WebKit/efl/ewk/ewk_util_private.h
r117045 r117046 19 19 */ 20 20 21 /** 22 * @file ewk_util.h 23 * @brief Helpfull methods for WebKit-EFL. 24 */ 25 26 #ifndef ewk_util_h 27 #define ewk_util_h 21 #ifndef ewk_util_private_h 22 #define ewk_util_private_h 28 23 29 24 #include <Evas.h> … … 32 27 Evas_Object *ewk_util_image_from_cairo_surface_add(Evas *canvas, cairo_surface_t *surface); 33 28 34 #endif // ewk_util_ h29 #endif // ewk_util_private_h -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r116964 r117046 56 56 #include "Settings.h" 57 57 #include "c_instance.h" 58 #include "ewk_logging.h" 58 #include "ewk_frame.h" 59 #include "ewk_frame_private.h" 60 #include "ewk_history_private.h" 61 #include "ewk_js_private.h" 59 62 #include "ewk_private.h" 63 #include "ewk_settings_private.h" 64 #include "ewk_view_private.h" 65 #include "ewk_window_features_private.h" 60 66 #include <Ecore.h> 61 67 #include <Eina.h> -
trunk/Source/WebKit/efl/ewk/ewk_view_single.cpp
r109544 r117046 23 23 24 24 #include "ewk_frame.h" 25 #include "ewk_logging.h"26 25 #include "ewk_private.h" 26 #include "ewk_view_private.h" 27 27 28 28 #include <Ecore_Evas.h> -
trunk/Source/WebKit/efl/ewk/ewk_view_tiled.cpp
r108991 r117046 22 22 #include "ewk_view.h" 23 23 24 #include "ewk_logging.h"25 24 #include "ewk_private.h" 26 25 #include "ewk_tiled_backing_store_private.h" 26 #include "ewk_view_private.h" 27 27 #include <Evas.h> 28 28 #include <RefPtrCairo.h> 29 29 #include <eina_safety_checks.h> 30 #include <ewk_tiled_backing_store.h>31 30 32 31 static Ewk_View_Smart_Class _parent_sc = EWK_VIEW_SMART_CLASS_INIT_NULL; -
trunk/Source/WebKit/efl/ewk/ewk_window_features.cpp
r109205 r117046 23 23 24 24 #include "WindowFeatures.h" 25 #include "ewk_logging.h"26 25 #include "ewk_private.h" 27 26 #include <Eina.h> -
trunk/Source/WebKit/efl/ewk/ewk_window_features_private.h
r117045 r117046 1 1 /* 2 2 Copyright (C) 2009-2010 ProFUSION embedded systems 3 Copyright (C) 2009-201 0Samsung Electronics3 Copyright (C) 2009-2012 Samsung Electronics 4 4 5 5 This library is free software; you can redistribute it and/or … … 19 19 */ 20 20 21 /** 22 * @file ewk_util.h 23 * @brief Helpfull methods for WebKit-EFL. 24 */ 21 #ifndef ewk_window_features_private_h 22 #define ewk_window_features_private_h 25 23 26 #ifndef ewk_util_h 27 #define ewk_util_h 24 Ewk_Window_Features* ewk_window_features_new_from_core(const WebCore::WindowFeatures* core); 28 25 29 #include <Evas.h> 30 #include <cairo.h> 31 32 Evas_Object *ewk_util_image_from_cairo_surface_add(Evas *canvas, cairo_surface_t *surface); 33 34 #endif // ewk_util_h 26 #endif // ewk_window_features_private_h -
trunk/Tools/ChangeLog
r117045 r117046 1 2012-05-15 Tomasz Morawski <t.morawski@samsung.com> 2 3 [EFL][DRT] Split ewk_private.h file to multiple private files. 4 https://bugs.webkit.org/show_bug.cgi?id=84572 5 6 Reviewed by Antonio Gomes. 7 8 * DumpRenderTree/efl/DumpRenderTreeChrome.cpp: 9 1 10 2012-05-15 Michael Brüning <michael.bruning@nokia.com> 2 11 -
trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
r116639 r117046 32 32 #include "EventSender.h" 33 33 #include "GCController.h" 34 #include "KURL.h" 34 35 #include "LayoutTestController.h" 35 36 #include "NotImplemented.h"
Note: See TracChangeset
for help on using the changeset viewer.