Changeset 129101 in webkit


Ignore:
Timestamp:
Sep 20, 2012 1:14:06 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Change the log macro names to be more consistent with EINA LOG
​https://bugs.webkit.org/show_bug.cgi?id=97158

Patch by Jinwoo Song <​jinwoo7.song@samsung.com> on 2012-09-20
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit/efl:

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:

Source/WebKit2:

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):

Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/efl/ChangeLog

    r129096 r129101  
     12012-09-20  Jinwoo Song  <jinwoo7.song@samsung.com>
     2
     3        [EFL] Change the log macro names to be more consistent with EINA LOG
     4        https://bugs.webkit.org/show_bug.cgi?id=97158
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Some log macro names in WebKit1 are inconsistent with EINA LOG names
     9        such as WRN/INF not WARN/INFO.
     10
     11          #define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
     12          #define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
     13
     14        This patch changes the such names to be consistent with EINA LOG's names.
     15
     16        * ewk/ewk_frame.cpp:
     17        (_ewk_frame_smart_resize):
     18        (ewk_frame_source_get):
     19        (ewk_frame_uri_changed):
     20        * ewk/ewk_main.cpp:
     21        (_ewk_init_body):
     22        * ewk/ewk_private.h:
     23        * ewk/ewk_tiled_backing_store.cpp:
     24        (_ewk_tiled_backing_store_render):
     25        (_ewk_tiled_backing_store_recalc_renderers):
     26        (_ewk_tiled_backing_store_smart_calculate_offset_force):
     27        (_ewk_tiled_backing_store_smart_calculate_offset):
     28        (ewk_tiled_backing_store_pre_render_relative_radius):
     29        * ewk/ewk_tiled_matrix.cpp:
     30        (ewk_tile_matrix_free):
     31        (ewk_tile_matrix_tile_exact_get):
     32        (_ewk_tile_matrix_slicer_setup):
     33        * ewk/ewk_view.cpp:
     34        (_ewk_view_smart_add_console_message):
     35        (_ewk_view_smart_run_javascript_alert):
     36        (_ewk_view_smart_run_javascript_confirm):
     37        (_ewk_view_smart_should_interrupt_javascript):
     38        (_ewk_view_smart_run_javascript_prompt):
     39        (_ewk_view_smart_pre_render_region):
     40        (_ewk_view_smart_pre_render_relative_radius):
     41        (_ewk_view_smart_pre_render_start):
     42        (_ewk_view_smart_pre_render_cancel):
     43        (_ewk_view_smart_disable_render):
     44        (_ewk_view_smart_enable_render):
     45        (ewk_view_bg_color_set):
     46        (ewk_view_zoom_set):
     47        (ewk_view_zoom_weak_set):
     48        (ewk_view_zoom_animated_set):
     49        (ewk_view_statusbar_text_set):
     50        (ewk_view_exceeded_application_cache_quota):
     51        (ewk_view_exceeded_database_quota):
     52        (ewk_view_scroll):
     53        (ewk_view_popup_new):
     54        (ewk_view_popup_destroy):
     55        (ewk_view_popup_selected_set):
     56        (ewk_view_color_chooser_new):
     57        (ewk_view_color_chooser_destroy):
     58        (ewk_view_color_chooser_color_set):
     59        (ewk_view_color_chooser_changed):
     60        (ewk_view_zoom_range_set):
     61        * ewk/ewk_view_private.h:
     62
    1632012-09-19  Jinwoo Song  <jinwoo7.song@samsung.com>
    264

  • trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

    r129096 r129101  
    263263    Evas_Coord x, y;
    264264    evas_object_geometry_get(smartData->region, &x, &y, &width, &height);
    265     INF("region=%p, visible=%d, geo=%d,%d + %dx%d",
     265    INFO("region=%p, visible=%d, geo=%d,%d + %dx%d",
    266266        smartData->region, evas_object_visible_get(smartData->region), x, y, width, height);
    267267    _ewk_frame_debug(ewkFrame);
    … …  
    16441644    if (!smartData->frame->document()->isHTMLDocument()) {
    16451645        // FIXME: Support others documents.
    1646         WRN("Only HTML documents are supported");
     1646        WARN("Only HTML documents are supported");
    16471647        return -1;
    16481648    }
    … …  
    17951795    WTF::CString uri(smartData->frame->document()->url().string().utf8());
    17961796
    1797     INF("uri=%s", uri.data());
     1797    INFO("uri=%s", uri.data());
    17981798    if (!uri.data()) {
    17991799        ERR("no uri");

  • trunk/Source/WebKit/efl/ewk/ewk_main.cpp

    r125258 r129101  
    144144
    145145    if (!ecore_main_loop_glib_integrate())
    146         WRN("Ecore was not compiled with GLib support, some plugins will not "
     146        WARN("Ecore was not compiled with GLib support, some plugins will not "
    147147            "work (ie: Adobe Flash)");
    148148

  • trunk/Source/WebKit/efl/ewk/ewk_private.h

    r117046 r129101  
    4747#define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_log_dom, __VA_ARGS__)
    4848#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__)
     49#define WARN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
     50#define INFO(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
    5151#define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__)
    5252

  • trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp

    r128464 r129101  
    550550    Ewk_Tiled_Backing_Store_Data* priv = static_cast<Ewk_Tiled_Backing_Store_Data*>(data);
    551551
    552     INF("TODO %p (visible? %d) [%lu,%lu] %d,%d + %dx%d",
     552    INFO("TODO %p (visible? %d) [%lu,%lu] %d,%d + %dx%d",
    553553        tile, tile->visible, tile->column, tile->row, area->x, area->y, area->w, area->h);
    554554
    … …  
    775775static 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)
    776776{
    777     INF("ewkBackingStore=%p, new size: %dx%d", priv->self, width, height);
     777    INFO("ewkBackingStore=%p, new size: %dx%d", priv->self, width, height);
    778778
    779779    unsigned long columns = 1 + static_cast<unsigned long>(ceil(width / static_cast<float>(tileWidth)));
    780780    unsigned long rows = 1 + static_cast<unsigned long>(ceil(height / static_cast<float>(tileHeight)));
    781781
    782     INF("ewkBackingStore=%p new grid size columns: %lu, rows: %lu, was %lu, %lu", priv->self, columns, rows, priv->view.columns, priv->view.rows);
     782    INFO("ewkBackingStore=%p new grid size columns: %lu, rows: %lu, was %lu, %lu", priv->self, columns, rows, priv->view.columns, priv->view.rows);
    783783
    784784    if (priv->view.columns == columns && priv->view.rows == rows)
    … …  
    11351135    Evas_Coord deltaY = priv->view.offset.current.y - priv->view.offset.old.y;
    11361136
    1137     INF("ewkBackingStore=%p, offset: %+4d, %+4d (%+4d, %+4d)",
     1137    INFO("ewkBackingStore=%p, offset: %+4d, %+4d (%+4d, %+4d)",
    11381138        priv->self, deltaX, deltaY, priv->view.offset.current.x, priv->view.offset.current.y);
    11391139
    … …  
    11611161    Evas_Coord deltaY = priv->view.offset.current.y - priv->view.offset.old.y;
    11621162
    1163     INF("ewkBackingStore=%p, offset: %+4d, %+4d (%+4d, %+4d)", priv->self, deltaX, deltaY, priv->view.offset.current.x, priv->view.offset.current.y);
     1163    INFO("ewkBackingStore=%p, offset: %+4d, %+4d (%+4d, %+4d)", priv->self, deltaX, deltaY, priv->view.offset.current.x, priv->view.offset.current.y);
    11641164
    11651165    if (!deltaX && !deltaY)
    … …  
    18821882    PRIV_DATA_GET_OR_RETURN(ewkBackingStore, priv, false);
    18831883
    1884     INF("priv->model.base.row =%ld, n=%u priv->view.rows=%lu", priv->model.base.row, n, priv->view.rows);
     1884    INFO("priv->model.base.row =%ld, n=%u priv->view.rows=%lu", priv->model.base.row, n, priv->view.rows);
    18851885    unsigned long startRow = priv->model.base.row - n;
    18861886    unsigned long startCol = priv->model.base.column - n;
    … …  
    18881888    unsigned long endCol = std::min(priv->model.current.columns - 1, priv->model.base.column + priv->view.columns + n - 1);
    18891889
    1890     INF("startRow=%lu, endRow=%lu, startCol=%lu, endCol=%lu", startRow, endRow, startCol, endCol);
     1890    INFO("startRow=%lu, endRow=%lu, startCol=%lu, endCol=%lu", startRow, endRow, startCol, endCol);
    18911891
    18921892    zoom = ROUNDED_ZOOM(priv->view.tile.width, zoom);

  • trunk/Source/WebKit/efl/ewk/ewk_tiled_matrix.cpp

    r128560 r129101  
    322322            tileMatrix->stats.bytes.allocated, tileMatrix->stats.bytes.freed, bytes);
    323323    else if (tiles_leaked || bytes_leaked)
    324         WRN("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
     324        WARN("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
    325325            "bytes[+%" PRIu64 ",-%" PRIu64 "], but some other leaked "
    326326            "%" PRIu64 " tiles (%" PRIu64 " bytes)",
    … …  
    329329            tiles_leaked, bytes_leaked);
    330330    else
    331         INF("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
     331        INFO("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
    332332            "bytes[+%" PRIu64 ",-%" PRIu64 "]",
    333333            tileMatrix->stats.tiles.allocated, tileMatrix->stats.tiles.freed,
    … …  
    400400    if (!tile->visible) {
    401401        if (!ewk_tile_unused_cache_tile_get(tileMatrix->tileUnusedCache, tile))
    402             WRN("Ewk_Tile was unused but not in cache? bug!");
     402            WARN("Ewk_Tile was unused but not in cache? bug!");
    403403    }
    404404#endif
    … …  
    522522    UNUSED_PARAM(zoom);
    523523    if (area->w <= 0 || area->h <= 0) {
    524         WRN("invalid area region: %d,%d+%dx%d.", area->x, area->y, area->w, area->h);
     524        WARN("invalid area region: %d,%d+%dx%d.", area->x, area->y, area->w, area->h);
    525525        return false;
    526526    }

  • trunk/Source/WebKit/efl/ewk/ewk_view.cpp

    r129096 r129101  
    620620static void _ewk_view_smart_add_console_message(Ewk_View_Smart_Data*, const char* message, unsigned int lineNumber, const char* sourceID)
    621621{
    622     INF("console message: %s @%d: %s\n", sourceID, lineNumber, message);
     622    INFO("console message: %s @%d: %s\n", sourceID, lineNumber, message);
    623623}
    624624
    625625static void _ewk_view_smart_run_javascript_alert(Ewk_View_Smart_Data*, Evas_Object* /*frame*/, const char* message)
    626626{
    627     INF("javascript alert: %s\n", message);
     627    INFO("javascript alert: %s\n", message);
    628628}
    629629
    630630static Eina_Bool _ewk_view_smart_run_javascript_confirm(Ewk_View_Smart_Data*, Evas_Object* /*frame*/, const char* message)
    631631{
    632     INF("javascript confirm: %s", message);
    633     INF("javascript confirm (HARD CODED)? YES");
     632    INFO("javascript confirm: %s", message);
     633    INFO("javascript confirm (HARD CODED)? YES");
    634634    return true;
    635635}
    … …  
    637637static Eina_Bool _ewk_view_smart_should_interrupt_javascript(Ewk_View_Smart_Data*)
    638638{
    639     INF("should interrupt javascript?\n"
     639    INFO("should interrupt javascript?\n"
    640640        "\t(HARD CODED) NO");
    641641    return false;
    … …  
    646646    *value = eina_stringshare_add("test");
    647647    Eina_Bool result = true;
    648     INF("javascript prompt:\n"
     648    INFO("javascript prompt:\n"
    649649        "\t      message: %s\n"
    650650        "\tdefault value: %s\n"
    … …  
    11691169static 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)
    11701170{
    1171     WRN("not supported by engine. smartData=%p area=%d,%d+%dx%d, zoom=%f",
     1171    WARN("not supported by engine. smartData=%p area=%d,%d+%dx%d, zoom=%f",
    11721172        smartData, x, y, width, height, zoom);
    11731173    return false;
    … …  
    11761176static Eina_Bool _ewk_view_smart_pre_render_relative_radius(Ewk_View_Smart_Data* smartData, unsigned int number, float zoom)
    11771177{
    1178     WRN("not supported by engine. smartData=%p, n=%u zoom=%f",
     1178    WARN("not supported by engine. smartData=%p, n=%u zoom=%f",
    11791179        smartData, number, zoom);
    11801180    return false;
    … …  
    11831183static Eina_Bool _ewk_view_smart_pre_render_start(Ewk_View_Smart_Data* smartData)
    11841184{
    1185     WRN("not supported by engine. smartData=%p", smartData);
     1185    WARN("not supported by engine. smartData=%p", smartData);
    11861186    return false;
    11871187}
    … …  
    11891189static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data* smartData)
    11901190{
    1191     WRN("not supported by engine. smartData=%p", smartData);
     1191    WARN("not supported by engine. smartData=%p", smartData);
    11921192}
    11931193
    … …  
    12791279static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data* smartData)
    12801280{
    1281     WRN("not supported by engine. smartData=%p", smartData);
     1281    WARN("not supported by engine. smartData=%p", smartData);
    12821282    return false;
    12831283}
    … …  
    12851285static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data* smartData)
    12861286{
    1287     WRN("not supported by engine. smartData=%p", smartData);
     1287    WARN("not supported by engine. smartData=%p", smartData);
    12881288    return false;
    12891289}
    … …  
    14671467
    14681468    if (alpha < 0) {
    1469         WRN("Alpha less than zero (%d).", alpha);
     1469        WARN("Alpha less than zero (%d).", alpha);
    14701470        alpha = 0;
    14711471    } else if (alpha > 255) {
    1472         WRN("Alpha is larger than 255 (%d).", alpha);
     1472        WARN("Alpha is larger than 255 (%d).", alpha);
    14731473        alpha = 255;
    14741474    }
    … …  
    14761476#define CHECK_PREMUL_COLOR(color, alpha)                                        \
    14771477    if (color < 0) {                                                        \
    1478         WRN("Color component " #color " is less than zero (%d).", color);         \
     1478        WARN("Color component " #color " is less than zero (%d).", color);         \
    14791479        color = 0;                                                          \
    14801480    } else if (color > alpha) {                                                 \
    1481         WRN("Color component " #color " is greater than alpha (%d, alpha=%d).", \
     1481        WARN("Color component " #color " is greater than alpha (%d, alpha=%d).", \
    14821482            color, alpha);                                                      \
    14831483        color = alpha;                                                          \
    … …  
    17861786
    17871787    if (!priv->settings.zoomRange.userScalable) {
    1788         WRN("userScalable is false");
     1788        WARN("userScalable is false");
    17891789        return false;
    17901790    }
    17911791
    17921792    if (zoom < priv->settings.zoomRange.minScale) {
    1793         WRN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
     1793        WARN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
    17941794        return false;
    17951795    }
    17961796    if (zoom > priv->settings.zoomRange.maxScale) {
    1797         WRN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
     1797        WARN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
    17981798        return false;
    17991799    }
    … …  
    18741874
    18751875    if (!priv->settings.zoomRange.userScalable) {
    1876         WRN("userScalable is false");
     1876        WARN("userScalable is false");
    18771877        return false;
    18781878    }
    18791879
    18801880    if (zoom < priv->settings.zoomRange.minScale) {
    1881         WRN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
     1881        WARN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
    18821882        return false;
    18831883    }
    18841884    if (zoom > priv->settings.zoomRange.maxScale) {
    1885         WRN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
     1885        WARN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
    18861886        return false;
    18871887    }
    … …  
    19301930
    19311931    if (!priv->settings.zoomRange.userScalable) {
    1932         WRN("userScalable is false");
     1932        WARN("userScalable is false");
    19331933        return false;
    19341934    }
    19351935
    19361936    if (zoom < priv->settings.zoomRange.minScale) {
    1937         WRN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
     1937        WARN("zoom level is < %f : %f", priv->settings.zoomRange.minScale, zoom);
    19381938        return false;
    19391939    }
    19401940    if (zoom > priv->settings.zoomRange.maxScale) {
    1941         WRN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
     1941        WARN("zoom level is > %f : %f", priv->settings.zoomRange.maxScale, zoom);
    19421942        return false;
    19431943    }
    … …  
    33913391{
    33923392    DBG("ewkView=%p (text=%s)", ewkView, text);
    3393     INF("status bar text set: %s", text);
     3393    INFO("status bar text set: %s", text);
    33943394    evas_object_smart_callback_call(ewkView, "statusbar,text,set", (void*)text);
    33953395}
    … …  
    36023602        return 0;
    36033603
    3604     INF("defaultOriginQuota=%" PRIu64 " totalSpaceNeeded=%" PRIu64, defaultOriginQuota, totalSpaceNeeded);
     3604    INFO("defaultOriginQuota=%" PRIu64 " totalSpaceNeeded=%" PRIu64, defaultOriginQuota, totalSpaceNeeded);
    36053605    return smartData->api->exceeded_application_cache_quota(smartData, origin, defaultOriginQuota, totalSpaceNeeded);
    36063606}
    … …  
    36283628        return 0;
    36293629
    3630     INF("currentSize=%" PRIu64 " expectedSize=%" PRIu64, currentSize, expectedSize);
     3630    INFO("currentSize=%" PRIu64 " expectedSize=%" PRIu64, currentSize, expectedSize);
    36313631    return smartData->api->exceeded_database_quota(smartData, frame, databaseName, currentSize, expectedSize);
    36323632}
    … …  
    36773677
    36783678    if ((scrollX != centerX) || (scrollY != centerY) || (scrollWidth != centerWidth) || (scrollHeight != centerHeight))
    3679         WRN("scroll region and clip are different! %d,%d+%dx%d and %d,%d+%dx%d",
     3679        WARN("scroll region and clip are different! %d,%d+%dx%d and %d,%d+%dx%d",
    36803680            scrollX, scrollY, scrollWidth, scrollHeight, centerX, centerY, centerWidth, centerHeight);
    36813681
    … …  
    37533753void ewk_view_popup_new(Evas_Object* ewkView, WebCore::PopupMenuClient* client, int /*selected*/, const WebCore::IntRect& rect)
    37543754{
    3755     INF("ewkView=%p", ewkView);
     3755    INFO("ewkView=%p", ewkView);
    37563756    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
    37573757    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
    … …  
    37863786Eina_Bool ewk_view_popup_destroy(Evas_Object* ewkView)
    37873787{
    3788     INF("ewkView=%p", ewkView);
     3788    INFO("ewkView=%p", ewkView);
    37893789    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
    37903790    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
    … …  
    38093809void ewk_view_popup_selected_set(Evas_Object* ewkView, int index)
    38103810{
    3811     INF("ewkView=%p", ewkView);
     3811    INFO("ewkView=%p", ewkView);
    38123812    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
    38133813    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
    … …  
    38293829void ewk_view_color_chooser_new(Evas_Object* ewkView, WebCore::ColorChooserClient* client, const WebCore::Color& initialColor)
    38303830{
    3831     INF("ewkView=%p", ewkView);
     3831    INFO("ewkView=%p", ewkView);
    38323832    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
    38333833    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
    … …  
    38493849Eina_Bool ewk_view_color_chooser_destroy(Evas_Object* ewkView)
    38503850{
    3851     INF("ewkView=%p", ewkView);
     3851    INFO("ewkView=%p", ewkView);
    38523852    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
    38533853    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
    … …  
    38663866void ewk_view_color_chooser_color_set(Evas_Object *ewkView, int r, int g, int b)
    38673867{
    3868     INF("ewkView=%p", ewkView);
     3868    INFO("ewkView=%p", ewkView);
    38693869    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
    38703870    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
    … …  
    38873887void ewk_view_color_chooser_changed(Evas_Object* ewkView, const WebCore::Color& newColor)
    38883888{
    3889     INF("ewkView=%p", ewkView);
     3889    INFO("ewkView=%p", ewkView);
    38903890
    38913891    Ewk_Color color;
    … …  
    39743974
    39753975    if (maxScale < minScale) {
    3976         WRN("minScale is larger than maxScale");
     3976        WARN("minScale is larger than maxScale");
    39773977        return false;
    39783978    }

  • trunk/Source/WebKit/efl/ewk/ewk_view_private.h

    r127848 r129101  
    4646#define EWK_VIEW_TYPE_CHECK_OR_RETURN(ewkView, viewName, ...) \
    4747    if (!evas_object_smart_type_check(ewkView, viewName)) { \
    48         INF("ewkView isn't an instance of %s", viewName); \
     48        INFO("ewkView isn't an instance of %s", viewName); \
    4949        return __VA_ARGS__; \
    5050    }

  • trunk/Source/WebKit2/ChangeLog

    r129099 r129101  
     12012-09-20  Jinwoo Song  <jinwoo7.song@samsung.com>
     2
     3        [EFL] Change the log macro names to be more consistent with EINA LOG
     4        https://bugs.webkit.org/show_bug.cgi?id=97158
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Some log macro names in WebKit2 are inconsistent with EINA LOG names
     9        such as WRN/INF not WARN/INFO.
     10
     11          #define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
     12          #define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
     13
     14        This patch changes the such names to be consistent with EINA LOG's names.
     15
     16        * UIProcess/API/efl/ewk_main.cpp:
     17        (ewk_init):
     18        * UIProcess/API/efl/ewk_private.h:
     19        * UIProcess/API/efl/ewk_view.cpp:
     20        (ewk_view_webprocess_crashed):
     21
    1222012-09-20  Christophe Dumez  <christophe.dumez@intel.com>
    223

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

    r128962 r129101  
    7272
    7373    if (!ecore_main_loop_glib_integrate()) {
    74         WRN("Ecore was not compiled with GLib support, some plugins will not "
     74        WARN("Ecore was not compiled with GLib support, some plugins will not "
    7575            "work (ie: Adobe Flash)");
    7676    }

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

    r128962 r129101  
    3636#define CRITICAL(...) EINA_LOG_DOM_CRIT(_ewk_log_dom, __VA_ARGS__)
    3737#define ERR(...) EINA_LOG_DOM_ERR(_ewk_log_dom, __VA_ARGS__)
    38 #define WRN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
    39 #define INF(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
     38#define WARN(...) EINA_LOG_DOM_WARN(_ewk_log_dom, __VA_ARGS__)
     39#define INFO(...) EINA_LOG_DOM_INFO(_ewk_log_dom, __VA_ARGS__)
    4040#define DBG(...) EINA_LOG_DOM_DBG(_ewk_log_dom, __VA_ARGS__)
    4141

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

    r129096 r129101  
    16471647    if (!handled) {
    16481648        CString url = priv->pageProxy->urlAtProcessExit().utf8();
    1649         WRN("WARNING: The web process experienced a crash on '%s'.\n", url.data());
     1649        WARN("WARNING: The web process experienced a crash on '%s'.\n", url.data());
    16501650
    16511651        // Display an error page
Note: See TracChangeset for help on using the changeset viewer.