Changeset 128962 in webkit

Timestamp:

Sep 18, 2012 8:33:36 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Add log macros for EINA_LOG_DOM_XXX series
​https://bugs.webkit.org/show_bug.cgi?id=97061

Patch by Jinwoo Song <​jinwoo7.song@samsung.com> on 2012-09-18
Reviewed by Gyuyoung Kim.

EFL Webkit2 is using the EINA_LOG_DOM_XXX series in several places to log a message on the specified domain and format.
This patch adds log macros to simplify these logging codes.

• UIProcess/API/efl/ewk_main.cpp:

(ewk_init):

• UIProcess/API/efl/ewk_private.h:
• UIProcess/API/efl/ewk_view.cpp:

(ewk_view_webprocess_crashed):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/ewk_main.cpp (modified) (3 diffs)
• UIProcess/API/efl/ewk_private.h (modified) (1 diff)
• UIProcess/API/efl/ewk_view.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-18  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        [EFL][WK2] Add log macros for EINA_LOG_DOM_XXX series
+        https://bugs.webkit.org/show_bug.cgi?id=97061
+
+        Reviewed by Gyuyoung Kim.
+
+        EFL Webkit2 is using the EINA_LOG_DOM_XXX series in several places to log a message on the specified domain and format.
+        This patch adds log macros to simplify these logging codes.
+
+        * UIProcess/API/efl/ewk_main.cpp:
+        (ewk_init):
+        * UIProcess/API/efl/ewk_private.h:
+        * UIProcess/API/efl/ewk_view.cpp:
+        (ewk_view_webprocess_crashed):
+
 2012-09-17  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp

@@ -23 +23 @@
 #include "ewk_main.h"
 
+#include "ewk_private.h"
 #include <Ecore.h>
 #include <Ecore_Evas.h>
@@ -54 +55 @@
 
     if (!evas_init()) {
-        EINA_LOG_DOM_CRIT(_ewk_log_dom, "could not init evas.");
+        CRITICAL("could not init evas.");
         goto error_evas;
     }
 
     if (!ecore_init()) {
-        EINA_LOG_DOM_CRIT(_ewk_log_dom, "could not init ecore.");
+        CRITICAL("could not init ecore.");
         goto error_ecore;
     }
 
     if (!ecore_evas_init()) {
-        EINA_LOG_DOM_CRIT(_ewk_log_dom, "could not init ecore_evas.");
+        CRITICAL("could not init ecore_evas.");
         goto error_ecore_evas;
     }
@@ -71 +72 @@
 
     if (!ecore_main_loop_glib_integrate()) {
-        EINA_LOG_DOM_WARN(_ewk_log_dom, "Ecore was not compiled with GLib support, some plugins will not "
+        WRN("Ecore was not compiled with GLib support, some plugins will not "
             "work (ie: Adobe Flash)");
     }

trunk/Source/WebKit2/UIProcess/API/efl/ewk_private.h

@@ -34 +34 @@
 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_private_h

trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp

@@ -1644 +1644 @@
     if (!handled) {
         CString url = priv->pageProxy->urlAtProcessExit().utf8();
-        EINA_LOG_DOM_WARN(_ewk_log_dom, "WARNING: The web process experienced a crash on '%s'.\n", url.data());
+        WRN("WARNING: The web process experienced a crash on '%s'.\n", url.data());
 
         // Display an error page