Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (129100 => 129101)
--- trunk/Source/WebKit/efl/ChangeLog 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-09-20 08:14:06 UTC (rev 129101)
@@ -1,3 +1,65 @@
+2012-09-20 Jinwoo Song <[email protected]>
+
+ [EFL] Change the log macro names to be more consistent with EINA LOG
+ https://bugs.webkit.org/show_bug.cgi?id=97158
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Some log macro names in WebKit1 are inconsistent with EINA LOG names
+ such as WRN/INF not WARN/INFO.
+
+ #define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
+ #define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
+
+ This patch changes the such names to be consistent with EINA LOG's names.
+
+ * ewk/ewk_frame.cpp:
+ (_ewk_frame_smart_resize):
+ (ewk_frame_source_get):
+ (ewk_frame_uri_changed):
+ * ewk/ewk_main.cpp:
+ (_ewk_init_body):
+ * ewk/ewk_private.h:
+ * ewk/ewk_tiled_backing_store.cpp:
+ (_ewk_tiled_backing_store_render):
+ (_ewk_tiled_backing_store_recalc_renderers):
+ (_ewk_tiled_backing_store_smart_calculate_offset_force):
+ (_ewk_tiled_backing_store_smart_calculate_offset):
+ (ewk_tiled_backing_store_pre_render_relative_radius):
+ * ewk/ewk_tiled_matrix.cpp:
+ (ewk_tile_matrix_free):
+ (ewk_tile_matrix_tile_exact_get):
+ (_ewk_tile_matrix_slicer_setup):
+ * ewk/ewk_view.cpp:
+ (_ewk_view_smart_add_console_message):
+ (_ewk_view_smart_run_javascript_alert):
+ (_ewk_view_smart_run_javascript_confirm):
+ (_ewk_view_smart_should_interrupt_javascript):
+ (_ewk_view_smart_run_javascript_prompt):
+ (_ewk_view_smart_pre_render_region):
+ (_ewk_view_smart_pre_render_relative_radius):
+ (_ewk_view_smart_pre_render_start):
+ (_ewk_view_smart_pre_render_cancel):
+ (_ewk_view_smart_disable_render):
+ (_ewk_view_smart_enable_render):
+ (ewk_view_bg_color_set):
+ (ewk_view_zoom_set):
+ (ewk_view_zoom_weak_set):
+ (ewk_view_zoom_animated_set):
+ (ewk_view_statusbar_text_set):
+ (ewk_view_exceeded_application_cache_quota):
+ (ewk_view_exceeded_database_quota):
+ (ewk_view_scroll):
+ (ewk_view_popup_new):
+ (ewk_view_popup_destroy):
+ (ewk_view_popup_selected_set):
+ (ewk_view_color_chooser_new):
+ (ewk_view_color_chooser_destroy):
+ (ewk_view_color_chooser_color_set):
+ (ewk_view_color_chooser_changed):
+ (ewk_view_zoom_range_set):
+ * ewk/ewk_view_private.h:
+
2012-09-19 Jinwoo Song <[email protected]>
Fix unused parameter compile warnings in WebKit/WebKit2
Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.cpp (129100 => 129101)
--- trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2012-09-20 08:14:06 UTC (rev 129101)
@@ -262,7 +262,7 @@
evas_object_resize(smartData->region, width, height);
Evas_Coord x, y;
evas_object_geometry_get(smartData->region, &x, &y, &width, &height);
- INF("region=%p, visible=%d, geo=%d,%d + %dx%d",
+ INFO("region=%p, visible=%d, geo=%d,%d + %dx%d",
smartData->region, evas_object_visible_get(smartData->region), x, y, width, height);
_ewk_frame_debug(ewkFrame);
#endif
@@ -1643,7 +1643,7 @@
if (!smartData->frame->document()->isHTMLDocument()) {
// FIXME: Support others documents.
- WRN("Only HTML documents are supported");
+ WARN("Only HTML documents are supported");
return -1;
}
@@ -1794,7 +1794,7 @@
EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, false);
WTF::CString uri(smartData->frame->document()->url().string().utf8());
- INF("uri=%s", uri.data());
+ INFO("uri=%s", uri.data());
if (!uri.data()) {
ERR("no uri");
return false;
Modified: trunk/Source/WebKit/efl/ewk/ewk_main.cpp (129100 => 129101)
--- trunk/Source/WebKit/efl/ewk/ewk_main.cpp 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit/efl/ewk/ewk_main.cpp 2012-09-20 08:14:06 UTC (rev 129101)
@@ -143,7 +143,7 @@
g_type_init();
if (!ecore_main_loop_glib_integrate())
- WRN("Ecore was not compiled with GLib support, some plugins will not "
+ WARN("Ecore was not compiled with GLib support, some plugins will not "
"work (ie: Adobe Flash)");
WebCore::ScriptController::initializeThreading();
Modified: trunk/Source/WebKit/efl/ewk/ewk_private.h (129100 => 129101)
--- trunk/Source/WebKit/efl/ewk/ewk_private.h 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit/efl/ewk/ewk_private.h 2012-09-20 08:14:06 UTC (rev 129101)
@@ -46,8 +46,8 @@
#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 WARN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
+#define INFO(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
#define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__)
#endif // ewk_private_h
Modified: trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp (129100 => 129101)
--- trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp 2012-09-20 08:14:06 UTC (rev 129101)
@@ -549,7 +549,7 @@
{
Ewk_Tiled_Backing_Store_Data* priv = static_cast<Ewk_Tiled_Backing_Store_Data*>(data);
- INF("TODO %p (visible? %d) [%lu,%lu] %d,%d + %dx%d",
+ INFO("TODO %p (visible? %d) [%lu,%lu] %d,%d + %dx%d",
tile, tile->visible, tile->column, tile->row, area->x, area->y, area->w, area->h);
if (!tile->visible)
@@ -774,12 +774,12 @@
static void _ewk_tiled_backing_store_recalc_renderers(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord width, Evas_Coord height, Evas_Coord tileWidth, Evas_Coord tileHeight)
{
- INF("ewkBackingStore=%p, new size: %dx%d", priv->self, width, height);
+ INFO("ewkBackingStore=%p, new size: %dx%d", priv->self, width, height);
unsigned long columns = 1 + static_cast<unsigned long>(ceil(width / static_cast<float>(tileWidth)));
unsigned long rows = 1 + static_cast<unsigned long>(ceil(height / static_cast<float>(tileHeight)));
- INF("ewkBackingStore=%p new grid size columns: %lu, rows: %lu, was %lu, %lu", priv->self, columns, rows, priv->view.columns, priv->view.rows);
+ INFO("ewkBackingStore=%p new grid size columns: %lu, rows: %lu, was %lu, %lu", priv->self, columns, rows, priv->view.columns, priv->view.rows);
if (priv->view.columns == columns && priv->view.rows == rows)
return;
@@ -1134,7 +1134,7 @@
Evas_Coord deltaX = priv->view.offset.current.x - priv->view.offset.old.x;
Evas_Coord deltaY = priv->view.offset.current.y - priv->view.offset.old.y;
- INF("ewkBackingStore=%p, offset: %+4d, %+4d (%+4d, %+4d)",
+ INFO("ewkBackingStore=%p, offset: %+4d, %+4d (%+4d, %+4d)",
priv->self, deltaX, deltaY, priv->view.offset.current.x, priv->view.offset.current.y);
Evas_Coord tileWidth = priv->view.tile.width;
@@ -1160,7 +1160,7 @@
Evas_Coord deltaX = priv->view.offset.current.x - priv->view.offset.old.x;
Evas_Coord deltaY = priv->view.offset.current.y - priv->view.offset.old.y;
- INF("ewkBackingStore=%p, offset: %+4d, %+4d (%+4d, %+4d)", priv->self, deltaX, deltaY, priv->view.offset.current.x, priv->view.offset.current.y);
+ INFO("ewkBackingStore=%p, offset: %+4d, %+4d (%+4d, %+4d)", priv->self, deltaX, deltaY, priv->view.offset.current.x, priv->view.offset.current.y);
if (!deltaX && !deltaY)
return;
@@ -1881,13 +1881,13 @@
{
PRIV_DATA_GET_OR_RETURN(ewkBackingStore, priv, false);
- INF("priv->model.base.row =%ld, n=%u priv->view.rows=%lu", priv->model.base.row, n, priv->view.rows);
+ INFO("priv->model.base.row =%ld, n=%u priv->view.rows=%lu", priv->model.base.row, n, priv->view.rows);
unsigned long startRow = priv->model.base.row - n;
unsigned long startCol = priv->model.base.column - n;
unsigned long endRow = std::min(priv->model.current.rows - 1, priv->model.base.row + priv->view.rows + n - 1);
unsigned long endCol = std::min(priv->model.current.columns - 1, priv->model.base.column + priv->view.columns + n - 1);
- INF("startRow=%lu, endRow=%lu, startCol=%lu, endCol=%lu", startRow, endRow, startCol, endCol);
+ INFO("startRow=%lu, endRow=%lu, startCol=%lu, endCol=%lu", startRow, endRow, startCol, endCol);
zoom = ROUNDED_ZOOM(priv->view.tile.width, zoom);
Modified: trunk/Source/WebKit/efl/ewk/ewk_tiled_matrix.cpp (129100 => 129101)
--- trunk/Source/WebKit/efl/ewk/ewk_tiled_matrix.cpp 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit/efl/ewk/ewk_tiled_matrix.cpp 2012-09-20 08:14:06 UTC (rev 129101)
@@ -321,14 +321,14 @@
tileMatrix->stats.tiles.allocated, tileMatrix->stats.tiles.freed, tiles,
tileMatrix->stats.bytes.allocated, tileMatrix->stats.bytes.freed, bytes);
else if (tiles_leaked || bytes_leaked)
- WRN("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
+ WARN("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
"bytes[+%" PRIu64 ",-%" PRIu64 "], but some other leaked "
"%" PRIu64 " tiles (%" PRIu64 " bytes)",
tileMatrix->stats.tiles.allocated, tileMatrix->stats.tiles.freed,
tileMatrix->stats.bytes.allocated, tileMatrix->stats.bytes.freed,
tiles_leaked, bytes_leaked);
else
- INF("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
+ INFO("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
"bytes[+%" PRIu64 ",-%" PRIu64 "]",
tileMatrix->stats.tiles.allocated, tileMatrix->stats.tiles.freed,
tileMatrix->stats.bytes.allocated, tileMatrix->stats.bytes.freed);
@@ -399,7 +399,7 @@
#ifndef NDEBUG
if (!tile->visible) {
if (!ewk_tile_unused_cache_tile_get(tileMatrix->tileUnusedCache, tile))
- WRN("Ewk_Tile was unused but not in cache? bug!");
+ WARN("Ewk_Tile was unused but not in cache? bug!");
}
#endif
@@ -521,7 +521,7 @@
{
UNUSED_PARAM(zoom);
if (area->w <= 0 || area->h <= 0) {
- WRN("invalid area region: %d,%d+%dx%d.", area->x, area->y, area->w, area->h);
+ WARN("invalid area region: %d,%d+%dx%d.", area->x, area->y, area->w, area->h);
return false;
}
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (129100 => 129101)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-09-20 08:14:06 UTC (rev 129101)
@@ -619,24 +619,24 @@
static void _ewk_view_smart_add_console_message(Ewk_View_Smart_Data*, const char* message, unsigned int lineNumber, const char* sourceID)
{
- INF("console message: %s @%d: %s\n", sourceID, lineNumber, message);
+ INFO("console message: %s @%d: %s\n", sourceID, lineNumber, message);
}
static void _ewk_view_smart_run_javascript_alert(Ewk_View_Smart_Data*, Evas_Object* /*frame*/, const char* message)
{
- INF("_javascript_ alert: %s\n", message);
+ INFO("_javascript_ alert: %s\n", message);
}
static Eina_Bool _ewk_view_smart_run_javascript_confirm(Ewk_View_Smart_Data*, Evas_Object* /*frame*/, const char* message)
{
- INF("_javascript_ confirm: %s", message);
- INF("_javascript_ confirm (HARD CODED)? YES");
+ INFO("_javascript_ confirm: %s", message);
+ INFO("_javascript_ confirm (HARD CODED)? YES");
return true;
}
static Eina_Bool _ewk_view_smart_should_interrupt_javascript(Ewk_View_Smart_Data*)
{
- INF("should interrupt _javascript_?\n"
+ INFO("should interrupt _javascript_?\n"
"\t(HARD CODED) NO");
return false;
}
@@ -645,7 +645,7 @@
{
*value = eina_stringshare_add("test");
Eina_Bool result = true;
- INF("_javascript_ prompt:\n"
+ INFO("_javascript_ prompt:\n"
"\t message: %s\n"
"\tdefault value: %s\n"
"\tgiving answer: %s\n"
@@ -1168,27 +1168,27 @@
static Eina_Bool _ewk_view_smart_pre_render_region(Ewk_View_Smart_Data* smartData, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height, float zoom)
{
- WRN("not supported by engine. smartData=%p area=%d,%d+%dx%d, zoom=%f",
+ WARN("not supported by engine. smartData=%p area=%d,%d+%dx%d, zoom=%f",
smartData, x, y, width, height, zoom);
return false;
}
static Eina_Bool _ewk_view_smart_pre_render_relative_radius(Ewk_View_Smart_Data* smartData, unsigned int number, float zoom)
{
- WRN("not supported by engine. smartData=%p, n=%u zoom=%f",
+ WARN("not supported by engine. smartData=%p, n=%u zoom=%f",
smartData, number, zoom);
return false;
}
static Eina_Bool _ewk_view_smart_pre_render_start(Ewk_View_Smart_Data* smartData)
{
- WRN("not supported by engine. smartData=%p", smartData);
+ WARN("not supported by engine. smartData=%p", smartData);
return false;
}
static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data* smartData)
{
- WRN("not supported by engine. smartData=%p", smartData);
+ WARN("not supported by engine. smartData=%p", smartData);
}
static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data* smartData)
@@ -1278,13 +1278,13 @@
static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data* smartData)
{
- WRN("not supported by engine. smartData=%p", smartData);
+ WARN("not supported by engine. smartData=%p", smartData);
return false;
}
static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data* smartData)
{
- WRN("not supported by engine. smartData=%p", smartData);
+ WARN("not supported by engine. smartData=%p", smartData);
return false;
}
@@ -1466,19 +1466,19 @@
EINA_SAFETY_ON_NULL_RETURN(smartData->api->bg_color_set);
if (alpha < 0) {
- WRN("Alpha less than zero (%d).", alpha);
+ WARN("Alpha less than zero (%d).", alpha);
alpha = 0;
} else if (alpha > 255) {
- WRN("Alpha is larger than 255 (%d).", alpha);
+ WARN("Alpha is larger than 255 (%d).", alpha);
alpha = 255;
}
#define CHECK_PREMUL_COLOR(color, alpha) \
if (color < 0) { \
- WRN("Color component " #color " is less than zero (%d).", color); \
+ WARN("Color component " #color " is less than zero (%d).", color); \
color = 0; \
} else if (color > alpha) { \
- WRN("Color component " #color " is greater than alpha (%d, alpha=%d).", \
+ WARN("Color component " #color " is greater than alpha (%d, alpha=%d).", \
color, alpha); \
color = alpha; \
}
@@ -1785,16 +1785,16 @@
EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->api->zoom_set, false);
if (!priv->settings.zoomRange.userScalable) {
- WRN("userScalable is false");
+ WARN("userScalable is false");
return false;
}
if (zoom < priv->settings.zoomRange.minScale) {
- WRN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
+ WARN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
return false;
}
if (zoom > priv->settings.zoomRange.maxScale) {
- WRN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
+ WARN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
return false;
}
@@ -1873,16 +1873,16 @@
EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->api->zoom_weak_set, false);
if (!priv->settings.zoomRange.userScalable) {
- WRN("userScalable is false");
+ WARN("userScalable is false");
return false;
}
if (zoom < priv->settings.zoomRange.minScale) {
- WRN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
+ WARN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
return false;
}
if (zoom > priv->settings.zoomRange.maxScale) {
- WRN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
+ WARN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
return false;
}
@@ -1929,16 +1929,16 @@
EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->api->zoom_weak_set, false);
if (!priv->settings.zoomRange.userScalable) {
- WRN("userScalable is false");
+ WARN("userScalable is false");
return false;
}
if (zoom < priv->settings.zoomRange.minScale) {
- WRN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
+ WARN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
return false;
}
if (zoom > priv->settings.zoomRange.maxScale) {
- WRN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
+ WARN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
return false;
}
@@ -3390,7 +3390,7 @@
void ewk_view_statusbar_text_set(Evas_Object* ewkView, const char* text)
{
DBG("ewkView=%p (text=%s)", ewkView, text);
- INF("status bar text set: %s", text);
+ INFO("status bar text set: %s", text);
evas_object_smart_callback_call(ewkView, "statusbar,text,set", (void*)text);
}
@@ -3601,7 +3601,7 @@
if (!smartData->api->exceeded_application_cache_quota)
return 0;
- INF("defaultOriginQuota=%" PRIu64 " totalSpaceNeeded=%" PRIu64, defaultOriginQuota, totalSpaceNeeded);
+ INFO("defaultOriginQuota=%" PRIu64 " totalSpaceNeeded=%" PRIu64, defaultOriginQuota, totalSpaceNeeded);
return smartData->api->exceeded_application_cache_quota(smartData, origin, defaultOriginQuota, totalSpaceNeeded);
}
@@ -3627,7 +3627,7 @@
if (!smartData->api->exceeded_database_quota)
return 0;
- INF("currentSize=%" PRIu64 " expectedSize=%" PRIu64, currentSize, expectedSize);
+ INFO("currentSize=%" PRIu64 " expectedSize=%" PRIu64, currentSize, expectedSize);
return smartData->api->exceeded_database_quota(smartData, frame, databaseName, currentSize, expectedSize);
}
@@ -3676,7 +3676,7 @@
ewkView, deltaX, deltaY, scrollX, scrollY, scrollWidth, scrollHeight, centerX, centerY, centerWidth, centerHeight);
if ((scrollX != centerX) || (scrollY != centerY) || (scrollWidth != centerWidth) || (scrollHeight != centerHeight))
- WRN("scroll region and clip are different! %d,%d+%dx%d and %d,%d+%dx%d",
+ WARN("scroll region and clip are different! %d,%d+%dx%d and %d,%d+%dx%d",
scrollX, scrollY, scrollWidth, scrollHeight, centerX, centerY, centerWidth, centerHeight);
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
@@ -3752,7 +3752,7 @@
*/
void ewk_view_popup_new(Evas_Object* ewkView, WebCore::PopupMenuClient* client, int /*selected*/, const WebCore::IntRect& rect)
{
- INF("ewkView=%p", ewkView);
+ INFO("ewkView=%p", ewkView);
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
@@ -3785,7 +3785,7 @@
Eina_Bool ewk_view_popup_destroy(Evas_Object* ewkView)
{
- INF("ewkView=%p", ewkView);
+ INFO("ewkView=%p", ewkView);
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
@@ -3808,7 +3808,7 @@
void ewk_view_popup_selected_set(Evas_Object* ewkView, int index)
{
- INF("ewkView=%p", ewkView);
+ INFO("ewkView=%p", ewkView);
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
EINA_SAFETY_ON_NULL_RETURN(priv->popup.menuClient);
@@ -3828,7 +3828,7 @@
*/
void ewk_view_color_chooser_new(Evas_Object* ewkView, WebCore::ColorChooserClient* client, const WebCore::Color& initialColor)
{
- INF("ewkView=%p", ewkView);
+ INFO("ewkView=%p", ewkView);
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
@@ -3848,7 +3848,7 @@
Eina_Bool ewk_view_color_chooser_destroy(Evas_Object* ewkView)
{
- INF("ewkView=%p", ewkView);
+ INFO("ewkView=%p", ewkView);
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
@@ -3865,7 +3865,7 @@
void ewk_view_color_chooser_color_set(Evas_Object *ewkView, int r, int g, int b)
{
- INF("ewkView=%p", ewkView);
+ INFO("ewkView=%p", ewkView);
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
EINA_SAFETY_ON_NULL_RETURN(priv->colorChooserClient);
@@ -3886,7 +3886,7 @@
*/
void ewk_view_color_chooser_changed(Evas_Object* ewkView, const WebCore::Color& newColor)
{
- INF("ewkView=%p", ewkView);
+ INFO("ewkView=%p", ewkView);
Ewk_Color color;
color.r = newColor.red();
@@ -3973,7 +3973,7 @@
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
if (maxScale < minScale) {
- WRN("minScale is larger than maxScale");
+ WARN("minScale is larger than maxScale");
return false;
}
Modified: trunk/Source/WebKit/efl/ewk/ewk_view_private.h (129100 => 129101)
--- trunk/Source/WebKit/efl/ewk/ewk_view_private.h 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit/efl/ewk/ewk_view_private.h 2012-09-20 08:14:06 UTC (rev 129101)
@@ -45,7 +45,7 @@
// 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); \
+ INFO("ewkView isn't an instance of %s", viewName); \
return __VA_ARGS__; \
}
Modified: trunk/Source/WebKit2/ChangeLog (129100 => 129101)
--- trunk/Source/WebKit2/ChangeLog 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-20 08:14:06 UTC (rev 129101)
@@ -1,3 +1,24 @@
+2012-09-20 Jinwoo Song <[email protected]>
+
+ [EFL] Change the log macro names to be more consistent with EINA LOG
+ https://bugs.webkit.org/show_bug.cgi?id=97158
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Some log macro names in WebKit2 are inconsistent with EINA LOG names
+ such as WRN/INF not WARN/INFO.
+
+ #define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
+ #define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
+
+ This patch changes the such names to be consistent with EINA LOG's names.
+
+ * 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-20 Christophe Dumez <[email protected]>
[EFL][WK2] Same page navigation does not update view URI
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp (129100 => 129101)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2012-09-20 08:14:06 UTC (rev 129101)
@@ -71,7 +71,7 @@
g_type_init();
if (!ecore_main_loop_glib_integrate()) {
- WRN("Ecore was not compiled with GLib support, some plugins will not "
+ WARN("Ecore was not compiled with GLib support, some plugins will not "
"work (ie: Adobe Flash)");
}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_private.h (129100 => 129101)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_private.h 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_private.h 2012-09-20 08:14:06 UTC (rev 129101)
@@ -35,8 +35,8 @@
#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 WARN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
+#define INFO(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
#define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__)
#endif // ewk_private_h
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (129100 => 129101)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-09-20 08:01:34 UTC (rev 129100)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-09-20 08:14:06 UTC (rev 129101)
@@ -1646,7 +1646,7 @@
if (!handled) {
CString url = ""
- WRN("WARNING: The web process experienced a crash on '%s'.\n", url.data());
+ WARN("WARNING: The web process experienced a crash on '%s'.\n", url.data());
// Display an error page
ewk_view_html_string_load(ewkView, "The web process has crashed.", 0, url.data());
