Source/WebKit: [EFL] Split ewk_private.h file to multiple private files.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 May 2012 09:49:23 +0000 (09:49 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 May 2012 09:49:23 +0000 (09:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=84572

Patch by Tomasz Morawski <t.morawski@samsung.com> on 2012-05-15
Reviewed by Antonio Gomes.

* PlatformEfl.cmake: Removed ewk_logging.h file from EWebKit_HEADERS.

Source/WebKit/efl: [EFL] Split ewk_private.h file to multiple private files.
https://bugs.webkit.org/show_bug.cgi?id=84572

Patch by Tomasz Morawski <t.morawski@samsung.com> on 2012-05-15
Reviewed by Antonio Gomes.

Split ewk_private file to multiple private files.
Delete ewk_logging.h and ewk_tiled_private.h files and removed tiled_backing_store logging domain.

* WebCoreSupport/ChromeClientEfl.cpp:
* WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
* WebCoreSupport/EditorClientEfl.cpp:
* WebCoreSupport/FrameLoaderClientEfl.cpp:
* ewk/ewk_auth.cpp:
* ewk/ewk_auth_soup.cpp:
(detach):
* ewk/ewk_auth_soup_private.h: Renamed from Source/WebKit/efl/ewk/ewk_auth_soup.h.
* ewk/ewk_contextmenu_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
(WebCore):
* ewk/ewk_frame.cpp:
* ewk/ewk_frame_private.h: Added.
(WebCore):
(EWKPrivate):
* ewk/ewk_history.cpp:
* ewk/ewk_history_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
(WebCore):
(EWKPrivate):
* ewk/ewk_js.cpp:
* ewk/ewk_js_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
(_Ewk_JS_Object):
* ewk/ewk_main.cpp:
* ewk/ewk_network.cpp:
* ewk/ewk_private.h:
(WebCore):
* ewk/ewk_security_origin_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
(WebCore):
* ewk/ewk_settings.cpp:
* ewk/ewk_settings_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
* ewk/ewk_tiled_backing_store.cpp:
(_Ewk_Tiled_Backing_Store_Item):
(ewk_tiled_backing_store_add):
* ewk/ewk_tiled_backing_store_private.h: Renamed from Source/WebKit/efl/ewk/ewk_tiled_backing_store.h.
(_Ewk_Tile_Stats):
(_Ewk_Tile):
* ewk/ewk_tiled_matrix.cpp:
* ewk/ewk_tiled_matrix_private.h: Renamed from Source/WebKit/efl/ewk/ewk_tiled_matrix.h.
* ewk/ewk_tiled_model.cpp:
(tile_account):
* ewk/ewk_tiled_model_private.h: Renamed from Source/WebKit/efl/ewk/ewk_tiled_model.h.
* ewk/ewk_util.cpp:
* ewk/ewk_util_private.h: Renamed from Source/WebKit/efl/ewk/ewk_util.h.
* ewk/ewk_view.cpp:
(_Ewk_View_Private_Data):
* ewk/ewk_view_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
(WebCore):
(EWKPrivate):
* ewk/ewk_view_single.cpp:
* ewk/ewk_view_tiled.cpp:
* ewk/ewk_window_features.cpp:
* ewk/ewk_window_features_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.

Tools: [EFL][DRT] Split ewk_private.h file to multiple private files.
https://bugs.webkit.org/show_bug.cgi?id=84572

Patch by Tomasz Morawski <t.morawski@samsung.com> on 2012-05-15
Reviewed by Antonio Gomes.

* DumpRenderTree/efl/DumpRenderTreeChrome.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@117046 268f45cc-cd09-0410-ab3c-d52691b4dbfc

39 files changed:
Source/WebKit/ChangeLog
Source/WebKit/PlatformEfl.cmake
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
Source/WebKit/efl/ewk/ewk_auth.cpp
Source/WebKit/efl/ewk/ewk_auth_soup.cpp
Source/WebKit/efl/ewk/ewk_auth_soup_private.h [moved from Source/WebKit/efl/ewk/ewk_auth_soup.h with 87% similarity]
Source/WebKit/efl/ewk/ewk_contextmenu_private.h [new file with mode: 0644]
Source/WebKit/efl/ewk/ewk_frame.cpp
Source/WebKit/efl/ewk/ewk_frame_private.h [new file with mode: 0644]
Source/WebKit/efl/ewk/ewk_history.cpp
Source/WebKit/efl/ewk/ewk_history_private.h [new file with mode: 0644]
Source/WebKit/efl/ewk/ewk_js.cpp
Source/WebKit/efl/ewk/ewk_js_private.h [new file with mode: 0644]
Source/WebKit/efl/ewk/ewk_main.cpp
Source/WebKit/efl/ewk/ewk_network.cpp
Source/WebKit/efl/ewk/ewk_private.h
Source/WebKit/efl/ewk/ewk_security_origin_private.h [moved from Source/WebKit/efl/ewk/ewk_tiled_private.h with 61% similarity]
Source/WebKit/efl/ewk/ewk_settings.cpp
Source/WebKit/efl/ewk/ewk_settings_private.h [moved from Source/WebKit/efl/ewk/ewk_logging.h with 61% similarity]
Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp
Source/WebKit/efl/ewk/ewk_tiled_backing_store_private.h [moved from Source/WebKit/efl/ewk/ewk_tiled_backing_store.h with 97% similarity]
Source/WebKit/efl/ewk/ewk_tiled_matrix.cpp
Source/WebKit/efl/ewk/ewk_tiled_matrix_private.h [moved from Source/WebKit/efl/ewk/ewk_tiled_matrix.h with 94% similarity]
Source/WebKit/efl/ewk/ewk_tiled_model.cpp
Source/WebKit/efl/ewk/ewk_tiled_model_private.h [moved from Source/WebKit/efl/ewk/ewk_tiled_model.h with 94% similarity]
Source/WebKit/efl/ewk/ewk_util.cpp
Source/WebKit/efl/ewk/ewk_util_private.h [moved from Source/WebKit/efl/ewk/ewk_util.h with 88% similarity]
Source/WebKit/efl/ewk/ewk_view.cpp
Source/WebKit/efl/ewk/ewk_view_private.h [new file with mode: 0644]
Source/WebKit/efl/ewk/ewk_view_single.cpp
Source/WebKit/efl/ewk/ewk_view_tiled.cpp
Source/WebKit/efl/ewk/ewk_window_features.cpp
Source/WebKit/efl/ewk/ewk_window_features_private.h [new file with mode: 0644]
Tools/ChangeLog
Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp

index 020355f..991e996 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-15  Tomasz Morawski  <t.morawski@samsung.com>
+
+        [EFL] Split ewk_private.h file to multiple private files.
+        https://bugs.webkit.org/show_bug.cgi?id=84572
+
+        Reviewed by Antonio Gomes.
+
+        * PlatformEfl.cmake: Removed ewk_logging.h file from EWebKit_HEADERS.
+
 2012-05-10  Sam D  <dsam2912@gmail.com>
 
         Web Inspector: rename InspectorBackendStub.js to InspectorBackendCommands.js
index fc43b46..dd228cb 100644 (file)
@@ -256,7 +256,6 @@ SET(EWebKit_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_frame.h
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_history.h
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_js.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_logging.h
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_main.h
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_network.h
     ${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_security_origin.h
index 1e75051..01c6887 100644 (file)
@@ -1,3 +1,65 @@
+2012-05-15  Tomasz Morawski  <t.morawski@samsung.com>
+
+        [EFL] Split ewk_private.h file to multiple private files.
+        https://bugs.webkit.org/show_bug.cgi?id=84572
+
+        Reviewed by Antonio Gomes.
+
+        Split ewk_private file to multiple private files.
+        Delete ewk_logging.h and ewk_tiled_private.h files and removed tiled_backing_store logging domain.
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+        * WebCoreSupport/EditorClientEfl.cpp:
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        * ewk/ewk_auth.cpp:
+        * ewk/ewk_auth_soup.cpp:
+        (detach):
+        * ewk/ewk_auth_soup_private.h: Renamed from Source/WebKit/efl/ewk/ewk_auth_soup.h.
+        * ewk/ewk_contextmenu_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
+        (WebCore):
+        * ewk/ewk_frame.cpp:
+        * ewk/ewk_frame_private.h: Added.
+        (WebCore):
+        (EWKPrivate):
+        * ewk/ewk_history.cpp:
+        * ewk/ewk_history_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
+        (WebCore):
+        (EWKPrivate):
+        * ewk/ewk_js.cpp:
+        * ewk/ewk_js_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
+        (_Ewk_JS_Object):
+        * ewk/ewk_main.cpp:
+        * ewk/ewk_network.cpp:
+        * ewk/ewk_private.h:
+        (WebCore):
+        * ewk/ewk_security_origin_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
+        (WebCore):
+        * ewk/ewk_settings.cpp:
+        * ewk/ewk_settings_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
+        * ewk/ewk_tiled_backing_store.cpp:
+        (_Ewk_Tiled_Backing_Store_Item):
+        (ewk_tiled_backing_store_add):
+        * ewk/ewk_tiled_backing_store_private.h: Renamed from Source/WebKit/efl/ewk/ewk_tiled_backing_store.h.
+        (_Ewk_Tile_Stats):
+        (_Ewk_Tile):
+        * ewk/ewk_tiled_matrix.cpp:
+        * ewk/ewk_tiled_matrix_private.h: Renamed from Source/WebKit/efl/ewk/ewk_tiled_matrix.h.
+        * ewk/ewk_tiled_model.cpp:
+        (tile_account):
+        * ewk/ewk_tiled_model_private.h: Renamed from Source/WebKit/efl/ewk/ewk_tiled_model.h.
+        * ewk/ewk_util.cpp:
+        * ewk/ewk_util_private.h: Renamed from Source/WebKit/efl/ewk/ewk_util.h.
+        * ewk/ewk_view.cpp:
+        (_Ewk_View_Private_Data):
+        * ewk/ewk_view_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
+        (WebCore):
+        (EWKPrivate):
+        * ewk/ewk_view_single.cpp:
+        * ewk/ewk_view_tiled.cpp:
+        * ewk/ewk_window_features.cpp:
+        * ewk/ewk_window_features_private.h: Copied from Source/WebKit/efl/ewk/ewk_private.h.
+
 2012-05-14  Raphael Kubo da Costa  <rakuco@webkit.org>
 
         [EFL] Remove ewk_view_core_page_get().
index 4ed4f93..2d42ae2 100644 (file)
@@ -37,6 +37,7 @@
 #include "FileChooser.h"
 #include "FileIconLoader.h"
 #include "FloatRect.h"
+#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClientEfl.h"
 #include "HitTestResult.h"
@@ -50,7 +51,9 @@
 #include "SecurityOrigin.h"
 #include "ViewportArguments.h"
 #include "WindowFeatures.h"
+#include "ewk_frame_private.h"
 #include "ewk_private.h"
+#include "ewk_view_private.h"
 #include <Ecore_Evas.h>
 #include <Evas.h>
 #include <wtf/text/CString.h>
index 1486cbc..8cdbd28 100644 (file)
 #include "DumpRenderTreeSupportEfl.h"
 
 #include "FrameLoaderClientEfl.h"
+#include "ewk_frame_private.h"
+#include "ewk_history_private.h"
 #include "ewk_private.h"
+#include "ewk_view_private.h"
 
 #include <AnimationController.h>
 #include <CSSComputedStyleDeclaration.h>
index 9217cc1..2e9c504 100644 (file)
@@ -35,7 +35,9 @@
 #include "Settings.h"
 #include "UndoStep.h"
 #include "WindowsKeyboardCodes.h"
+#include "ewk_frame_private.h"
 #include "ewk_private.h"
+#include "ewk_view_private.h"
 
 using namespace WebCore;
 
index 5185d1e..d78f021 100644 (file)
 #include "ResourceResponse.h"
 #include "Settings.h"
 #include "WebKitVersion.h"
-#include "ewk_logging.h"
+#include "ewk_frame_private.h"
 #include "ewk_private.h"
+#include "ewk_settings_private.h"
+#include "ewk_view_private.h"
 #include <Ecore_Evas.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
index af2172a..150b8b6 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ewk_auth.h"
 
-#include "ewk_auth_soup.h"
+#include "ewk_auth_soup_private.h"
 
 void ewk_auth_show_dialog_callback_set(Ewk_Auth_Show_Dialog_Callback callback)
 {
index d85427d..f54fb0e 100644 (file)
 */
 
 #include "config.h"
-#include "ewk_auth_soup.h"
+#include "ewk_auth_soup_private.h"
 
 #include "ewk_auth.h"
-#include "ewk_logging.h"
 #include <glib-object.h>
 #include <glib.h>
 #include <libsoup/soup.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * #Ewk_Soup_Auth_Dialog is a #SoupSessionFeature that you can attach to your
  * #SoupSession to provide a simple authentication dialog while
@@ -68,11 +63,23 @@ static void ewk_auth_soup_dialog_session_feature_init(SoupSessionFeatureInterfac
     featureInterface->detach = detach;
 }
 
+/**
+ * @internal
+ *  Sets callback to be called when authentication is required.
+ */
 void ewk_auth_soup_show_dialog_callback_set(Ewk_Auth_Show_Dialog_Callback callback)
 {
     ewk_auth_show_dialog_callback = callback;
 }
 
+/**
+ * @internal
+ *  Method for setting credentials
+ *
+ *  @param username username
+ *  @param password password
+ *  @param data soup authentication data
+ */
 void ewk_auth_soup_credentials_set(const char* username, const char* password, void* data)
 {
     if (!data)
@@ -128,7 +135,3 @@ static void detach(SoupSessionFeature* manager, SoupSession* session)
 {
     g_signal_handlers_disconnect_by_func(session, (void*)session_authenticate, manager);
 }
-
-#ifdef __cplusplus
-}
-#endif
similarity index 87%
rename from Source/WebKit/efl/ewk/ewk_auth_soup.h
rename to Source/WebKit/efl/ewk/ewk_auth_soup_private.h
index bd26b04..c364f61 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef ewk_auth_soup_h
-#define ewk_auth_soup_h
+#ifndef ewk_auth_soup_private_h
+#define ewk_auth_soup_private_h
 
 #include "ewk_auth.h"
 #include <glib-object.h>
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define EWK_TYPE_SOUP_AUTH_DIALOG            (ewk_auth_soup_dialog_get_type())
 #define EWK_SOUP_AUTH_DIALOG(object)         (G_TYPE_CHECK_INSTANCE_CAST((object), EWK_TYPE_SOUP_AUTH_DIALOG, Ewk_Soup_Auth_Dialog))
 #define EWK_SOUP_AUTH_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), EWK_TYPE_SOUP_AUTH_DIALOG, Ewk_Soup_Auth_Dialog))
@@ -51,17 +47,6 @@ GType ewk_auth_soup_dialog_get_type(void);
  */
 void ewk_auth_soup_show_dialog_callback_set(Ewk_Auth_Show_Dialog_Callback callback);
 
-/**
- *  Method for setting credentials
- *
- *  @param username username
- *  @param password password
- *  @param data soup authentication data
- */
 void ewk_auth_soup_credentials_set(const char *username, const char *password, void *data);
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif // ewk_auth_soup_h
+#endif // ewk_auth_soup_private_h
diff --git a/Source/WebKit/efl/ewk/ewk_contextmenu_private.h b/Source/WebKit/efl/ewk/ewk_contextmenu_private.h
new file mode 100644 (file)
index 0000000..ce1f3a8
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2012 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ewk_contextmenu_private_h
+#define ewk_contextmenu_private_h
+
+// forward declarations
+namespace WebCore {
+struct ContextMenu;
+struct ContextMenuItem;
+}
+
+#if ENABLE(CONTEXT_MENUS)
+Ewk_Context_Menu* ewk_context_menu_new(Evas_Object* view, WebCore::ContextMenuController* controller);
+bool ewk_context_menu_free(Ewk_Context_Menu* menu);
+void ewk_context_menu_item_append(Ewk_Context_Menu* menu, WebCore::ContextMenuItem& core);
+Ewk_Context_Menu* ewk_context_menu_customize(Ewk_Context_Menu* menu);
+void ewk_context_menu_show(Ewk_Context_Menu* menu);
+#endif
+
+#endif // ewk_context_manu_private_h
index 964b692..87a93ff 100644 (file)
 #include "SharedBuffer.h"
 #include "SubstituteData.h"
 #include "WindowsKeyboardCodes.h"
-#include "ewk_logging.h"
+#include "ewk_frame_private.h"
 #include "ewk_private.h"
+#include "ewk_security_origin_private.h"
+#include "ewk_view_private.h"
 #include <Eina.h>
 #include <Evas.h>
 #include <eina_safety_checks.h>
 #include <wtf/Assertions.h>
+#include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
+#include <wtf/Vector.h>
 #include <wtf/text/CString.h>
 
 static const char EWK_FRAME_TYPE_STR[] = "EWK_Frame";
diff --git a/Source/WebKit/efl/ewk/ewk_frame_private.h b/Source/WebKit/efl/ewk/ewk_frame_private.h
new file mode 100644 (file)
index 0000000..bd087de
--- /dev/null
@@ -0,0 +1,86 @@
+/*
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2012 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ewk_frame_private_h
+#define ewk_frame_private_h
+
+#include "ewk_frame.h"
+#include <Evas.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/Vector.h>
+
+namespace WebCore {
+class Widget;
+class Frame;
+}
+
+Evas_Object* ewk_frame_add(Evas* canvas);
+bool ewk_frame_init(Evas_Object* ewkFrame, Evas_Object* view, WebCore::Frame* frame);
+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);
+void ewk_frame_view_set(Evas_Object* ewkFrame, Evas_Object* newParent);
+
+void ewk_frame_core_gone(Evas_Object* ewkFrame);
+
+void ewk_frame_load_committed(Evas_Object* ewkFrame);
+void ewk_frame_load_started(Evas_Object* ewkFrame);
+void ewk_frame_load_provisional(Evas_Object* ewkFrame);
+void ewk_frame_load_firstlayout_finished(Evas_Object* ewkFrame);
+void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* ewkFrame);
+void ewk_frame_load_document_finished(Evas_Object* ewkFrame);
+void ewk_frame_load_finished(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, bool isCancellation, const char* errorDescription, const char* failingUrl);
+void ewk_frame_load_resource_finished(Evas_Object* ewkFrame, unsigned long identifier);
+void ewk_frame_load_resource_failed(Evas_Object* ewkFrame, Ewk_Frame_Load_Error* error);
+void ewk_frame_load_error(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, bool isCancellation, const char* errorDescription, const char* failingUrl);
+void ewk_frame_load_progress_changed(Evas_Object* ewkFrame);
+
+void ewk_frame_redirect_cancelled(Evas_Object* ewkFrame);
+void ewk_frame_redirect_provisional_load(Evas_Object* ewkFrame);
+void ewk_frame_redirect_requested(Evas_Object* ewkFrame, const char* url);
+void ewk_frame_request_will_send(Evas_Object* ewkFrame, Ewk_Frame_Resource_Messages* messages);
+void ewk_frame_request_assign_identifier(Evas_Object* ewkFrame, const Ewk_Frame_Resource_Request* request);
+void ewk_frame_response_received(Evas_Object* ewkFrame, Ewk_Frame_Resource_Response* response);
+void ewk_frame_view_state_save(Evas_Object* ewkFrame, WebCore::HistoryItem* item);
+
+void ewk_frame_did_perform_first_navigation(Evas_Object* ewkFrame);
+
+void ewk_frame_contents_size_changed(Evas_Object* ewkFrame, Evas_Coord width, Evas_Coord height);
+void ewk_frame_title_set(Evas_Object* ewkFrame, const char* title);
+
+void ewk_frame_view_create_for_view(Evas_Object* ewkFrame, Evas_Object* view);
+bool ewk_frame_uri_changed(Evas_Object* ewkFrame);
+void ewk_frame_force_layout(Evas_Object* ewkFrame);
+void ewk_frame_icon_changed(Evas_Object* ewkFrame);
+
+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);
+
+void ewk_frame_editor_client_contents_changed(Evas_Object* ewkFrame);
+void ewk_frame_editor_client_selection_changed(Evas_Object* ewkFrame);
+
+void ewk_frame_mixed_content_displayed_set(Evas_Object* ewkFrame, bool hasDisplayed);
+void ewk_frame_mixed_content_run_set(Evas_Object* ewkFrame, bool hasRun);
+
+void ewk_frame_xss_detected(Evas_Object* ewkFrame, const Ewk_Frame_Xss_Notification* xssInfo);
+
+namespace EWKPrivate {
+WebCore::Frame *coreFrame(const Evas_Object *ewkFrame);
+Evas_Object* kitFrame(const WebCore::Frame* coreFrame);
+} // namespace EWKPrivate
+
+#endif // ewk_frame_private_h
index 1a4e9b7..3dc8811 100644 (file)
@@ -28,9 +28,9 @@
 #include "IntSize.h"
 #include "Page.h"
 #include "PageGroup.h"
-#include "ewk_logging.h"
+#include "ewk_history_private.h"
 #include "ewk_private.h"
-#include "ewk_util.h"
+#include "ewk_util_private.h"
 #include <Eina.h>
 #include <eina_safety_checks.h>
 #include <wtf/text/CString.h>
diff --git a/Source/WebKit/efl/ewk/ewk_history_private.h b/Source/WebKit/efl/ewk/ewk_history_private.h
new file mode 100644 (file)
index 0000000..44547be
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2012 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ewk_history_private_h
+#define ewk_history_private_h
+
+#include "BackForwardListImpl.h"
+
+namespace WebCore {
+class HistoryItem;
+class BackForwardListImpl;
+}
+
+Ewk_History_Item *ewk_history_item_new_from_core(WebCore::HistoryItem *core);
+Ewk_History* ewk_history_new(WebCore::BackForwardListImpl* history);
+void ewk_history_free(Ewk_History* history);
+
+namespace EWKPrivate {
+WebCore::HistoryItem *coreHistoryItem(const Ewk_History_Item *ewkHistoryItem);
+} // namespace EWKPrivate
+
+#endif // ewk_history_private_h
index a8b206e..f08f98e 100644 (file)
@@ -23,7 +23,7 @@
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
 #include "NP_jsobject.h"
-#include "ewk_logging.h"
+#include "ewk_js_private.h"
 #include "ewk_private.h"
 #include "npruntime.h"
 #include "npruntime_impl.h"
diff --git a/Source/WebKit/efl/ewk/ewk_js_private.h b/Source/WebKit/efl/ewk/ewk_js_private.h
new file mode 100644 (file)
index 0000000..0b32f99
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2012 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ewk_js_private_h
+#define ewk_js_private_h
+
+#include "NP_jsobject.h"
+#include "ewk_js.h"
+
+#if ENABLE(NETSCAPE_PLUGIN_API)
+#define EWK_JS_OBJECT_MAGIC 0x696969
+
+typedef struct _Ewk_JS_Class Ewk_JS_Class;
+struct _Ewk_JS_Object {
+    JavaScriptObject base;
+    const char* name;
+    const Ewk_JS_Class* cls;
+    Eina_Hash* properties;
+    Evas_Object* view; // ewk_view: check if this object has already been added to another ewk_view
+    Ewk_JS_Object_Type type;
+    EINA_MAGIC;
+};
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
+#endif // ewk_js_private_h
index 7621d37..d9be587 100644 (file)
@@ -30,8 +30,7 @@
 #include "Settings.h"
 #include "StorageTracker.h"
 #include "StorageTrackerClientEfl.h"
-#include "ewk_auth_soup.h"
-#include "ewk_logging.h"
+#include "ewk_auth_soup_private.h"
 #include "ewk_network.h"
 #include "ewk_private.h"
 #include "ewk_settings.h"
index 541ccdd..8ad3c49 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "NetworkStateNotifier.h"
 #include "ResourceHandle.h"
-#include "ewk_logging.h"
+#include "ewk_private.h"
 #include <Eina.h>
 #include <libsoup/soup.h>
 #include <wtf/text/CString.h>
index ea39ce4..e09483a 100644 (file)
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2009-2010 ProFUSION embedded systems
-    Copyright (C) 2009-2010 Samsung Electronics
+    Copyright (C) 2009-2012 Samsung Electronics
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     Boston, MA 02110-1301, USA.
 */
 
-/**
- * @file    ewk_private.h
- * @brief   Private methods of WebKit-EFL.
- */
-
 #ifndef ewk_private_h
 #define ewk_private_h
 
 #include "APICast.h"
-#include "BackForwardListImpl.h"
-#include "Frame.h"
-#include "NP_jsobject.h"
-#include "Page.h"
-#include "Widget.h"
-#include "ewk_history.h"
-#include "ewk_js.h"
-#include "ewk_view.h"
 #include <Evas.h>
-#if USE(ACCELERATED_COMPOSITING)
-#include <Evas_GL.h>
-#endif
-#include <wtf/PassRefPtr.h>
-#include <wtf/Vector.h>
 
 // If defined, ewk will do type checking to ensure objects are of correct type
 #define EWK_TYPE_CHECK 1
 #define EWK_ARGB_BYTES_SIZE 4
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-#define EWK_JS_OBJECT_MAGIC 0x696969
-
-typedef struct _Ewk_JS_Class Ewk_JS_Class;
-struct _Ewk_JS_Object {
-    JavaScriptObject base;
-    const char* name;
-    const Ewk_JS_Class* cls;
-    Eina_Hash* properties;
-    Evas_Object* view; // ewk_view: check if this object has already been added to another ewk_view
-    Ewk_JS_Object_Type type;
-    EINA_MAGIC;
-};
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
-// Defines the names for initializing ewk_view_smart_class
-const char ewkViewTiledName[] = "Ewk_View_Tiled";
-const char ewkViewSingleName[] = "Ewk_View_Single";
-
-// Define to prevent an application using different view type from calling the function.
-#define EWK_VIEW_TYPE_CHECK_OR_RETURN(ewkView, viewName, ...) \
-    if (!evas_object_smart_type_check(ewkView, viewName)) { \
-        INF("ewkView isn't an instance of %s", viewName); \
-        return __VA_ARGS__; \
-    }
-
 // forward declarations
 namespace WebCore {
-struct PopupMenuClient;
-struct ContextMenu;
-struct ContextMenuItem;
-#if ENABLE(INPUT_TYPE_COLOR)
-struct Color;
-struct ColorChooserClient;
-#endif
 #if USE(ACCELERATED_COMPOSITING)
 class GraphicsContext3D;
 class GraphicsLayer;
 #endif
-class SecurityOrigin;
 }
 
 struct Ewk_Window_Object_Cleared_Event {
@@ -94,178 +42,12 @@ struct Ewk_Window_Object_Cleared_Event {
     Evas_Object* frame;
 };
 
-namespace EWKPrivate {
-
-WebCore::Frame *coreFrame(const Evas_Object *ewkFrame);
-WebCore::Page *corePage(const Evas_Object *ewkView);
-WebCore::HistoryItem *coreHistoryItem(const Ewk_History_Item *ewkHistoryItem);
-PlatformPageClient corePageClient(Evas_Object* ewkView);
-
-Evas_Object* kitFrame(const WebCore::Frame* coreFrame);
-
-} // namespace EWKPrivate
-
-void ewk_view_ready(Evas_Object* ewkView);
-void ewk_view_input_method_state_set(Evas_Object* ewkView, bool active);
-void ewk_view_title_set(Evas_Object* ewkView, const char* title);
-void ewk_view_uri_changed(Evas_Object* ewkView);
-void ewk_view_load_document_finished(Evas_Object* ewkView, Evas_Object* frame);
-void ewk_view_load_started(Evas_Object* ewkView, Evas_Object* ewkFrame);
-void ewk_view_load_provisional(Evas_Object* ewkView);
-void ewk_view_frame_main_load_started(Evas_Object* ewkView);
-void ewk_view_frame_main_cleared(Evas_Object* ewkView);
-void ewk_view_frame_main_icon_received(Evas_Object* ewkView);
-void ewk_view_load_finished(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error);
-void ewk_view_load_error(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error);
-void ewk_view_load_progress_changed(Evas_Object* ewkView);
-void ewk_view_load_show(Evas_Object* ewkView);
-void ewk_view_onload_event(Evas_Object* ewkView, Evas_Object* frame);
-void ewk_view_restore_state(Evas_Object* ewkView, Evas_Object* frame);
-Evas_Object* ewk_view_window_create(Evas_Object* ewkView, bool javascript, const WebCore::WindowFeatures* coreFeatures);
-void ewk_view_window_close(Evas_Object* ewkView);
-
-void ewk_view_mouse_link_hover_in(Evas_Object* ewkView, void* data);
-void ewk_view_mouse_link_hover_out(Evas_Object* ewkView);
-
-void ewk_view_toolbars_visible_set(Evas_Object* ewkView, bool visible);
-void ewk_view_toolbars_visible_get(Evas_Object* ewkView, bool* visible);
-
-void ewk_view_statusbar_visible_set(Evas_Object* ewkView, bool visible);
-void ewk_view_statusbar_visible_get(Evas_Object* ewkView, bool* visible);
-void ewk_view_statusbar_text_set(Evas_Object* ewkView, const char* text);
-
-void ewk_view_scrollbars_visible_set(Evas_Object* ewkView, bool visible);
-void ewk_view_scrollbars_visible_get(Evas_Object* ewkView, bool* visible);
-
-void ewk_view_menubar_visible_set(Evas_Object* ewkView, bool visible);
-void ewk_view_menubar_visible_get(Evas_Object* ewkView, bool* visible);
-
-void ewk_view_tooltip_text_set(Evas_Object* ewkView, const char* text);
-
-void ewk_view_add_console_message(Evas_Object* ewkView, const char* message, unsigned int lineNumber, const char* sourceID);
-
-void ewk_view_run_javascript_alert(Evas_Object* ewkView, Evas_Object* frame, const char* message);
-bool ewk_view_run_javascript_confirm(Evas_Object* ewkView, Evas_Object* frame, const char* message);
-bool ewk_view_run_javascript_prompt(Evas_Object* ewkView, Evas_Object* frame, const char* message, const char* defaultValue, char** value);
-bool ewk_view_should_interrupt_javascript(Evas_Object* ewkView);
-uint64_t ewk_view_exceeded_database_quota(Evas_Object* ewkView, Evas_Object* frame, const char* databaseName, uint64_t currentSize, uint64_t expectedSize);
-
-bool ewk_view_run_open_panel(Evas_Object* ewkView, Evas_Object* frame, bool allowsMultipleFiles, const Vector<String>& acceptMIMETypes, Eina_List** selectedFilenames);
-
-void ewk_view_repaint(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height);
-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);
-
-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);
-
-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);
-
-#if ENABLE(INPUT_TYPE_COLOR)
-void ewk_view_color_chooser_new(Evas_Object* ewkView, WebCore::ColorChooserClient* client, const WebCore::Color& initialColor);
-void ewk_view_color_chooser_changed(Evas_Object* ewkView, const WebCore::Color& newColor);
-#endif
-
-void ewk_view_popup_new(Evas_Object* ewkView, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect);
-void ewk_view_viewport_attributes_set(Evas_Object* ewkView, const WebCore::ViewportArguments& arguments);
-
-void ewk_view_download_request(Evas_Object* ewkView, Ewk_Download* download);
-
-void ewk_view_editor_client_contents_changed(Evas_Object* ewkView);
-void ewk_view_editor_client_selection_changed(Evas_Object* ewkView);
+extern int _ewk_log_dom;
 
-bool ewk_view_focus_can_cycle(Evas_Object* ewkView, Ewk_Focus_Direction direction);
-void ewk_view_frame_view_creation_notify(Evas_Object* ewkView);
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-void ewk_view_js_window_object_clear(Evas_Object* ewkView, Evas_Object* frame);
-#endif
-
-#if ENABLE(TOUCH_EVENTS)
-void ewk_view_need_touch_events_set(Evas_Object*, bool needed);
-bool ewk_view_need_touch_events_get(const Evas_Object*);
-#endif
-
-Ewk_History_Item *ewk_history_item_new_from_core(WebCore::HistoryItem *core);
-Ewk_History* ewk_history_new(WebCore::BackForwardListImpl* history);
-void ewk_history_free(Ewk_History* history);
-
-#if ENABLE(CONTEXT_MENUS)
-Ewk_Context_Menu* ewk_context_menu_new(Evas_Object* view, WebCore::ContextMenuController* controller);
-bool ewk_context_menu_free(Ewk_Context_Menu* menu);
-void ewk_context_menu_item_append(Ewk_Context_Menu* menu, WebCore::ContextMenuItem& core);
-Ewk_Context_Menu* ewk_context_menu_customize(Ewk_Context_Menu* menu);
-void ewk_context_menu_show(Ewk_Context_Menu* menu);
-#endif
-
-const Eina_Rectangle* ewk_view_repaints_pop(Ewk_View_Private_Data* priv, size_t* count);
-const Ewk_Scroll_Request* ewk_view_scroll_requests_get(const Ewk_View_Private_Data* priv, size_t* count);
-
-void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height);
-
-void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data* priv);
-
-Ewk_Window_Features* ewk_window_features_new_from_core(const WebCore::WindowFeatures* core);
-
-Evas_Object* ewk_frame_add(Evas* canvas);
-bool ewk_frame_init(Evas_Object* ewkFrame, Evas_Object* view, WebCore::Frame* frame);
-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);
-void ewk_frame_view_set(Evas_Object* ewkFrame, Evas_Object* newParent);
-
-void ewk_frame_core_gone(Evas_Object* ewkFrame);
-
-void ewk_frame_load_committed(Evas_Object* ewkFrame);
-void ewk_frame_load_started(Evas_Object* ewkFrame);
-void ewk_frame_load_provisional(Evas_Object* ewkFrame);
-void ewk_frame_load_firstlayout_finished(Evas_Object* ewkFrame);
-void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* ewkFrame);
-void ewk_frame_load_document_finished(Evas_Object* ewkFrame);
-void ewk_frame_load_finished(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, bool isCancellation, const char* errorDescription, const char* failingUrl);
-void ewk_frame_load_resource_finished(Evas_Object* ewkFrame, unsigned long identifier);
-void ewk_frame_load_resource_failed(Evas_Object* ewkFrame, Ewk_Frame_Load_Error* error);
-void ewk_frame_load_error(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, bool isCancellation, const char* errorDescription, const char* failingUrl);
-void ewk_frame_load_progress_changed(Evas_Object* ewkFrame);
-
-void ewk_frame_redirect_cancelled(Evas_Object* ewkFrame);
-void ewk_frame_redirect_provisional_load(Evas_Object* ewkFrame);
-void ewk_frame_redirect_requested(Evas_Object* ewkFrame, const char* url);
-void ewk_frame_request_will_send(Evas_Object* ewkFrame, Ewk_Frame_Resource_Messages* messages);
-void ewk_frame_request_assign_identifier(Evas_Object* ewkFrame, const Ewk_Frame_Resource_Request* request);
-void ewk_frame_response_received(Evas_Object* ewkFrame, Ewk_Frame_Resource_Response* response);
-void ewk_frame_view_state_save(Evas_Object* ewkFrame, WebCore::HistoryItem* item);
-
-void ewk_frame_did_perform_first_navigation(Evas_Object* ewkFrame);
-
-void ewk_frame_contents_size_changed(Evas_Object* ewkFrame, Evas_Coord width, Evas_Coord height);
-void ewk_frame_title_set(Evas_Object* ewkFrame, const char* title);
-
-void ewk_frame_view_create_for_view(Evas_Object* ewkFrame, Evas_Object* view);
-bool ewk_frame_uri_changed(Evas_Object* ewkFrame);
-void ewk_frame_force_layout(Evas_Object* ewkFrame);
-void ewk_frame_icon_changed(Evas_Object* ewkFrame);
-
-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);
-
-bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request);
-
-void ewk_view_contents_size_changed(Evas_Object* ewkView, Evas_Coord width, Evas_Coord height);
-
-WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* ewkView);
-
-const char* ewk_settings_default_user_agent_get();
-
-void ewk_frame_editor_client_contents_changed(Evas_Object* ewkFrame);
-void ewk_frame_editor_client_selection_changed(Evas_Object* ewkFrame);
-
-void ewk_frame_mixed_content_displayed_set(Evas_Object* ewkFrame, bool hasDisplayed);
-void ewk_frame_mixed_content_run_set(Evas_Object* ewkFrame, bool hasRun);
-void ewk_view_mixed_content_displayed_set(Evas_Object* ewkView, bool hasDisplayed);
-void ewk_view_mixed_content_run_set(Evas_Object* ewkView, bool hasRun);
-void ewk_frame_xss_detected(Evas_Object* ewkFrame, const Ewk_Frame_Xss_Notification* xssInfo);
-
-Ewk_Security_Origin* ewk_security_origin_new(WebCore::SecurityOrigin* origin);
-
-#if USE(ACCELERATED_COMPOSITING)
-bool ewk_view_accelerated_compositing_object_create(Evas_Object* ewkView, Evas_Native_Surface* nativeSurface, const WebCore::IntRect& rect);
-WebCore::GraphicsContext3D* ewk_view_accelerated_compositing_context_get(Evas_Object* ewkView);
-#endif
+#define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_log_dom, __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR(_ewk_log_dom, __VA_ARGS__)
+#define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
+#define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
+#define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__)
 
 #endif // ewk_private_h
@@ -1,6 +1,6 @@
 /*
-    Copyright (C) 2009-2010 Samsung Electronics
     Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2012 Samsung Electronics
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef ewk_tiled_private_h
-#define ewk_tiled_private_h
+#ifndef ewk_security_origin_private_h
+#define ewk_security_origin_private_h
 
-/* logging */
-extern int _ewk_tiled_log_dom;
+// forward declarations
+namespace WebCore {
+class SecurityOrigin;
+}
 
-#define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_tiled_log_dom, __VA_ARGS__)
-#define ERR(...) EINA_LOG_DOM_ERR(_ewk_tiled_log_dom, __VA_ARGS__)
-#define WRN(...) EINA_LOG_DOM_WARN(_ewk_tiled_log_dom, __VA_ARGS__)
-#define INF(...) EINA_LOG_DOM_INFO(_ewk_tiled_log_dom, __VA_ARGS__)
-#define DBG(...) EINA_LOG_DOM_DBG(_ewk_tiled_log_dom, __VA_ARGS__)
-#endif // ewk_tiled_private_h
+Ewk_Security_Origin* ewk_security_origin_new(WebCore::SecurityOrigin* origin);
+
+#endif // ewk_security_origin_private_h
index 842930a..3bac6b1 100644 (file)
@@ -34,9 +34,8 @@
 #include "MemoryCache.h"
 #include "PageCache.h"
 #include "Settings.h"
-#include "ewk_logging.h"
 #include "ewk_private.h"
-#include "ewk_util.h"
+#include "ewk_util_private.h"
 #include <Eina.h>
 #include <eina_safety_checks.h>
 #include <errno.h>
similarity index 61%
rename from Source/WebKit/efl/ewk/ewk_logging.h
rename to Source/WebKit/efl/ewk/ewk_settings_private.h
index f8a7f41..4d7ee58 100644 (file)
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2009-2010 ProFUSION embedded systems
-    Copyright (C) 2009-2010 Samsung Electronics
+    Copyright (C) 2009-2012 Samsung Electronics
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     Boston, MA 02110-1301, USA.
 */
 
-/**
- * @file    ewk_logging.h
- * @brief   Provides macros for logging.
- */
+#ifndef ewk_settings_private_h
+#define ewk_settings_private_h
 
-#ifndef ewk_logging_h
-#define ewk_logging_h
+const char* ewk_settings_default_user_agent_get();
 
-extern int _ewk_log_dom;
-#define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_log_dom, __VA_ARGS__)
-#define ERR(...) EINA_LOG_DOM_ERR(_ewk_log_dom, __VA_ARGS__)
-#define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
-#define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
-#define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__)
-
-#endif // ewk_logging_h
+#endif // ewk_settings_private_h
index 7cd43ed..903498f 100644 (file)
 */
 
 #include "config.h"
-#include "ewk_tiled_backing_store.h"
 
 #include "ewk_private.h"
-#include "ewk_tiled_matrix.h"
-#include "ewk_tiled_private.h"
+#include "ewk_tiled_backing_store_private.h"
+#include "ewk_tiled_matrix_private.h"
+#include "ewk_tiled_model_private.h"
 #include <Ecore.h>
 #include <Eina.h>
 #include <algorithm>
@@ -116,7 +116,6 @@ struct _Ewk_Tiled_Backing_Store_Data {
 };
 
 static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL;
-int _ewk_tiled_log_dom = -1;
 
 #define PRIV_DATA_GET_OR_RETURN(obj, ptr, ...) \
     Ewk_Tiled_Backing_Store_Data* ptr = static_cast<Ewk_Tiled_Backing_Store_Data*>(evas_object_smart_data_get(obj)); \
@@ -1387,9 +1386,6 @@ Evas_Object* ewk_tiled_backing_store_add(Evas* canvas)
 {
     static Evas_Smart* smart = 0;
 
-    if (_ewk_tiled_log_dom < 0)
-        _ewk_tiled_log_dom = eina_log_domain_register("Ewk_Tiled_Backing_Store", 0);
-
     if (!smart) {
         static Evas_Smart_Class sc =
             EVAS_SMART_CLASS_INIT_NAME_VERSION("Ewk_Tiled_Backing_Store");
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef ewk_tiled_backing_store_h
-#define ewk_tiled_backing_store_h
+#ifndef ewk_tiled_backing_store_private_h
+#define ewk_tiled_backing_store_private_h
 
 #include "EWebKit.h"
+#include <Evas.h>
+#include <cairo.h>
 
 /* Enable accounting of render time in tile statistics */
 // #define TILE_STATS_ACCOUNT_RENDER_TIME
 
-
 /* If define ewk will do more accounting to check for memory leaks
  * try "kill -USR1 $PID" to get instantaneous debug
  * try "kill -USR2 $PID" to get instantaneous debug and force flush of cache
@@ -42,9 +43,6 @@ const float zoomStepMinimum = 0.01;
 #define TILE_ZOOM_AT_SIZE(SIZE, ORIG_TILE) ((float)(SIZE) / (float)(ORIG_TILE))
 #define ROUNDED_ZOOM(SIZE, ZOOM) ((float)(SIZE) / (float)(((int)roundf((SIZE) / (ZOOM)))))
 
-#include <Evas.h>
-#include <cairo.h>
-
 typedef struct _Ewk_Tile                     Ewk_Tile;
 typedef struct _Ewk_Tile_Stats               Ewk_Tile_Stats;
 typedef struct _Ewk_Tile_Matrix              Ewk_Tile_Matrix;
@@ -79,9 +77,6 @@ struct _Ewk_Tile {
     Evas_Object *image;           /**< Evas Image, the tile to be rendered */
 };
 
-#include "ewk_tiled_matrix.h"
-#include "ewk_tiled_model.h"
-
 /* view */
 Evas_Object *ewk_tiled_backing_store_add(Evas *e);
 
@@ -116,4 +111,5 @@ void ewk_tiled_backing_store_pre_render_cancel(Evas_Object *o);
 
 Eina_Bool ewk_tiled_backing_store_disable_render(Evas_Object *o);
 Eina_Bool ewk_tiled_backing_store_enable_render(Evas_Object *o);
+
 #endif // ewk_tiled_backing_store_h
index 151681f..9551a64 100644 (file)
 
 #define __STDC_FORMAT_MACROS
 #include "config.h"
-#include "ewk_tiled_matrix.h"
 
-#include "ewk_tiled_backing_store.h"
-#include "ewk_tiled_private.h"
+#include "ewk_private.h"
+#include "ewk_tiled_backing_store_private.h"
+#include "ewk_tiled_matrix_private.h"
+#include "ewk_tiled_model_private.h"
 #include <Eina.h>
 #include <errno.h>
 #include <inttypes.h>
similarity index 94%
rename from Source/WebKit/efl/ewk/ewk_tiled_matrix.h
rename to Source/WebKit/efl/ewk/ewk_tiled_matrix_private.h
index 03ed14c..b3793b5 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef ewk_tiled_matrix_h
-#define ewk_tiled_matrix_h
+#ifndef ewk_tiled_matrix_private_h
+#define ewk_tiled_matrix_private_h
 
-#include "ewk_tiled_backing_store.h"
+#include "ewk_tiled_backing_store_private.h"
+#include "ewk_tiled_matrix_private.h"
 
 #include <Evas.h>
 
@@ -58,4 +59,4 @@ void ewk_tile_matrix_dbg(const Ewk_Tile_Matrix *tm);
 void ewk_tile_unused_cache_dbg(const Ewk_Tile_Unused_Cache *tuc);
 void ewk_tile_accounting_dbg();
 
-#endif // ewk_tiled_matrix_h
+#endif // ewk_tiled_matrix_private_h
index c0e7020..25b2686 100644 (file)
 
 #define __STDC_FORMAT_MACROS
 #include "config.h"
-#include "ewk_tiled_model.h"
 
-#include "ewk_tiled_backing_store.h"
-#include "ewk_tiled_private.h"
+#include "ewk_private.h"
+#include "ewk_tiled_backing_store_private.h"
+#include "ewk_tiled_model_private.h"
 #include <Ecore_Evas.h>
 #include <Eina.h>
 #include <eina_safety_checks.h>
similarity index 94%
rename from Source/WebKit/efl/ewk/ewk_tiled_model.h
rename to Source/WebKit/efl/ewk/ewk_tiled_model_private.h
index daaf213..c5f6d72 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef ewk_tiled_model_h
-#define ewk_tiled_model_h
+#ifndef ewk_tiled_model_private_h
+#define ewk_tiled_model_private_h
 
-#include "ewk_tiled_backing_store.h"
+#include "ewk_tiled_backing_store_private.h"
 
 #include <Evas.h>
 
@@ -53,4 +53,4 @@ void ewk_tile_unused_cache_thaw(Ewk_Tile_Unused_Cache *tuc);
 Eina_Bool ewk_tile_unused_cache_tile_get(Ewk_Tile_Unused_Cache *tuc, Ewk_Tile *t);
 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);
 
-#endif // ewk_tiled_model_h
+#endif // ewk_tiled_model_private_h
index 749b038..a1507cd 100644 (file)
 */
 
 #include "config.h"
-#include "ewk_util.h"
 
-#include "ewk_logging.h"
 #include "ewk_private.h"
+#include "ewk_util_private.h"
 #include <eina_safety_checks.h>
 
 /**
similarity index 88%
rename from Source/WebKit/efl/ewk/ewk_util.h
rename to Source/WebKit/efl/ewk/ewk_util_private.h
index 3b32d9c..bee2d0e 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-/**
- * @file    ewk_util.h
- * @brief   Helpfull methods for WebKit-EFL.
- */
-
-#ifndef ewk_util_h
-#define ewk_util_h
+#ifndef ewk_util_private_h
+#define ewk_util_private_h
 
 #include <Evas.h>
 #include <cairo.h>
 
 Evas_Object *ewk_util_image_from_cairo_surface_add(Evas *canvas, cairo_surface_t *surface);
 
-#endif // ewk_util_h
+#endif // ewk_util_private_h
index c68fcf7..aeb9f13 100644 (file)
 #include "ResourceHandle.h"
 #include "Settings.h"
 #include "c_instance.h"
-#include "ewk_logging.h"
+#include "ewk_frame.h"
+#include "ewk_frame_private.h"
+#include "ewk_history_private.h"
+#include "ewk_js_private.h"
 #include "ewk_private.h"
+#include "ewk_settings_private.h"
+#include "ewk_view_private.h"
+#include "ewk_window_features_private.h"
 #include <Ecore.h>
 #include <Eina.h>
 #include <Evas.h>
diff --git a/Source/WebKit/efl/ewk/ewk_view_private.h b/Source/WebKit/efl/ewk/ewk_view_private.h
new file mode 100644 (file)
index 0000000..60f6220
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2012 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ewk_view_private_h
+#define ewk_view_private_h
+
+#include "Frame.h"
+#include "Page.h"
+#include "Widget.h"
+#include "ewk_view.h"
+
+namespace WebCore {
+#if ENABLE(INPUT_TYPE_COLOR)
+class Color;
+class ColorChooserClient;
+#endif
+
+class PopupMenuClient;
+}
+
+// Defines the names for initializing ewk_view_smart_class
+const char ewkViewTiledName[] = "Ewk_View_Tiled";
+const char ewkViewSingleName[] = "Ewk_View_Single";
+
+// Define to prevent an application using different view type from calling the function.
+#define EWK_VIEW_TYPE_CHECK_OR_RETURN(ewkView, viewName, ...) \
+    if (!evas_object_smart_type_check(ewkView, viewName)) { \
+        INF("ewkView isn't an instance of %s", viewName); \
+        return __VA_ARGS__; \
+    }
+
+void ewk_view_ready(Evas_Object* ewkView);
+void ewk_view_input_method_state_set(Evas_Object* ewkView, bool active);
+void ewk_view_title_set(Evas_Object* ewkView, const char* title);
+void ewk_view_uri_changed(Evas_Object* ewkView);
+void ewk_view_load_document_finished(Evas_Object* ewkView, Evas_Object* frame);
+void ewk_view_load_started(Evas_Object* ewkView, Evas_Object* ewkFrame);
+void ewk_view_load_provisional(Evas_Object* ewkView);
+void ewk_view_frame_main_load_started(Evas_Object* ewkView);
+void ewk_view_frame_main_cleared(Evas_Object* ewkView);
+void ewk_view_frame_main_icon_received(Evas_Object* ewkView);
+void ewk_view_load_finished(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error);
+void ewk_view_load_error(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error);
+void ewk_view_load_progress_changed(Evas_Object* ewkView);
+void ewk_view_load_show(Evas_Object* ewkView);
+void ewk_view_onload_event(Evas_Object* ewkView, Evas_Object* frame);
+void ewk_view_restore_state(Evas_Object* ewkView, Evas_Object* frame);
+Evas_Object* ewk_view_window_create(Evas_Object* ewkView, bool javascript, const WebCore::WindowFeatures* coreFeatures);
+void ewk_view_window_close(Evas_Object* ewkView);
+
+void ewk_view_mouse_link_hover_in(Evas_Object* ewkView, void* data);
+void ewk_view_mouse_link_hover_out(Evas_Object* ewkView);
+
+void ewk_view_toolbars_visible_set(Evas_Object* ewkView, bool visible);
+void ewk_view_toolbars_visible_get(Evas_Object* ewkView, bool* visible);
+
+void ewk_view_statusbar_visible_set(Evas_Object* ewkView, bool visible);
+void ewk_view_statusbar_visible_get(Evas_Object* ewkView, bool* visible);
+void ewk_view_statusbar_text_set(Evas_Object* ewkView, const char* text);
+
+void ewk_view_scrollbars_visible_set(Evas_Object* ewkView, bool visible);
+void ewk_view_scrollbars_visible_get(Evas_Object* ewkView, bool* visible);
+
+void ewk_view_menubar_visible_set(Evas_Object* ewkView, bool visible);
+void ewk_view_menubar_visible_get(Evas_Object* ewkView, bool* visible);
+
+void ewk_view_tooltip_text_set(Evas_Object* ewkView, const char* text);
+
+void ewk_view_add_console_message(Evas_Object* ewkView, const char* message, unsigned int lineNumber, const char* sourceID);
+
+void ewk_view_run_javascript_alert(Evas_Object* ewkView, Evas_Object* frame, const char* message);
+bool ewk_view_run_javascript_confirm(Evas_Object* ewkView, Evas_Object* frame, const char* message);
+bool ewk_view_run_javascript_prompt(Evas_Object* ewkView, Evas_Object* frame, const char* message, const char* defaultValue, char** value);
+bool ewk_view_should_interrupt_javascript(Evas_Object* ewkView);
+uint64_t ewk_view_exceeded_database_quota(Evas_Object* ewkView, Evas_Object* frame, const char* databaseName, uint64_t currentSize, uint64_t expectedSize);
+
+bool ewk_view_run_open_panel(Evas_Object* ewkView, Evas_Object* frame, bool allowsMultipleFiles, const Vector<String>& acceptMIMETypes, Eina_List** selectedFilenames);
+
+void ewk_view_repaint(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height);
+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);
+WebCore::Page* ewk_view_core_page_get(const Evas_Object* ewkView);
+
+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);
+
+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);
+
+#if ENABLE(INPUT_TYPE_COLOR)
+void ewk_view_color_chooser_new(Evas_Object* ewkView, WebCore::ColorChooserClient* client, const WebCore::Color& initialColor);
+void ewk_view_color_chooser_changed(Evas_Object* ewkView, const WebCore::Color& newColor);
+#endif
+
+void ewk_view_popup_new(Evas_Object* ewkView, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect);
+void ewk_view_viewport_attributes_set(Evas_Object* ewkView, const WebCore::ViewportArguments& arguments);
+
+void ewk_view_download_request(Evas_Object* ewkView, Ewk_Download* download);
+
+void ewk_view_editor_client_contents_changed(Evas_Object* ewkView);
+void ewk_view_editor_client_selection_changed(Evas_Object* ewkView);
+
+bool ewk_view_focus_can_cycle(Evas_Object* ewkView, Ewk_Focus_Direction direction);
+void ewk_view_frame_view_creation_notify(Evas_Object* ewkView);
+
+#if ENABLE(NETSCAPE_PLUGIN_API)
+void ewk_view_js_window_object_clear(Evas_Object* ewkView, Evas_Object* frame);
+#endif
+
+#if ENABLE(TOUCH_EVENTS)
+void ewk_view_need_touch_events_set(Evas_Object*, bool needed);
+bool ewk_view_need_touch_events_get(const Evas_Object*);
+#endif
+
+const Eina_Rectangle* ewk_view_repaints_pop(Ewk_View_Private_Data* priv, size_t* count);
+const Ewk_Scroll_Request* ewk_view_scroll_requests_get(const Ewk_View_Private_Data* priv, size_t* count);
+
+void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height);
+
+void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data* priv);
+
+bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request);
+
+void ewk_view_contents_size_changed(Evas_Object* ewkView, Evas_Coord width, Evas_Coord height);
+
+WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* ewkView);
+
+void ewk_view_mixed_content_displayed_set(Evas_Object* ewkView, bool hasDisplayed);
+void ewk_view_mixed_content_run_set(Evas_Object* ewkView, bool hasRun);
+
+#if USE(ACCELERATED_COMPOSITING)
+bool ewk_view_accelerated_compositing_object_create(Evas_Object* ewkView, Evas_Native_Surface* nativeSurface, const WebCore::IntRect& rect);
+WebCore::GraphicsContext3D* ewk_view_accelerated_compositing_context_get(Evas_Object* ewkView);
+#endif
+
+namespace EWKPrivate {
+WebCore::Page *corePage(const Evas_Object *ewkView);
+PlatformPageClient corePageClient(Evas_Object* ewkView);
+} // namespace EWKPrivate
+
+#endif // ewk_view_private_h
index 1dece06..9c18936 100644 (file)
@@ -22,8 +22,8 @@
 #include "ewk_view.h"
 
 #include "ewk_frame.h"
-#include "ewk_logging.h"
 #include "ewk_private.h"
+#include "ewk_view_private.h"
 
 #include <Ecore_Evas.h>
 #include <Evas.h>
index 342cc4e..55a58e3 100644 (file)
 #include "config.h"
 #include "ewk_view.h"
 
-#include "ewk_logging.h"
 #include "ewk_private.h"
-
+#include "ewk_tiled_backing_store_private.h"
+#include "ewk_view_private.h"
 #include <Evas.h>
 #include <RefPtrCairo.h>
 #include <eina_safety_checks.h>
-#include <ewk_tiled_backing_store.h>
 
 static Ewk_View_Smart_Class _parent_sc = EWK_VIEW_SMART_CLASS_INIT_NULL;
 
index 6181bda..300028b 100644 (file)
@@ -22,7 +22,6 @@
 #include "ewk_window_features.h"
 
 #include "WindowFeatures.h"
-#include "ewk_logging.h"
 #include "ewk_private.h"
 #include <Eina.h>
 
diff --git a/Source/WebKit/efl/ewk/ewk_window_features_private.h b/Source/WebKit/efl/ewk/ewk_window_features_private.h
new file mode 100644 (file)
index 0000000..0658592
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+    Copyright (C) 2009-2010 ProFUSION embedded systems
+    Copyright (C) 2009-2012 Samsung Electronics
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ewk_window_features_private_h
+#define ewk_window_features_private_h
+
+Ewk_Window_Features* ewk_window_features_new_from_core(const WebCore::WindowFeatures* core);
+
+#endif // ewk_window_features_private_h
index 8b124d8..16d226d 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-15  Tomasz Morawski  <t.morawski@samsung.com>
+
+        [EFL][DRT] Split ewk_private.h file to multiple private files.
+        https://bugs.webkit.org/show_bug.cgi?id=84572
+
+        Reviewed by Antonio Gomes.
+
+        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+
 2012-05-15  Michael BrĂ¼ning  <michael.bruning@nokia.com>
 
         [Qt][WK2] http/tests/navigation/https-in-page-cache.html fails with timeout
index 9f74416..aaa54eb 100644 (file)
@@ -31,6 +31,7 @@
 #include "DumpRenderTreeView.h"
 #include "EventSender.h"
 #include "GCController.h"
+#include "KURL.h"
 #include "LayoutTestController.h"
 #include "NotImplemented.h"
 #include "TextInputController.h"