Changeset 137296 in webkit


Ignore:
Timestamp:
Dec 11, 2012 5:12:57 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Remove unused GErrors
​https://bugs.webkit.org/show_bug.cgi?id=104657

Patch by Alberto Garcia <​agarcia@igalia.com> on 2012-12-11
Reviewed by Martin Robinson.

Replace unused GErrors with null pointers.

  • DumpRenderTree/gtk/DumpRenderTree.cpp:

(initializeFonts):

  • DumpRenderTree/gtk/EditingCallbacks.cpp:

(dumpRange):

  • WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:

(WTR::inititializeFontConfigSetting):

Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r137286 r137296  
     12012-12-11  Alberto Garcia  <agarcia@igalia.com>
     2
     3        Remove unused GErrors
     4        https://bugs.webkit.org/show_bug.cgi?id=104657
     5
     6        Reviewed by Martin Robinson.
     7
     8        Replace unused GErrors with null pointers.
     9
     10        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     11        (initializeFonts):
     12        * DumpRenderTree/gtk/EditingCallbacks.cpp:
     13        (dumpRange):
     14        * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
     15        (WTR::inititializeFontConfigSetting):
     16
    1172012-12-11  Martin Robinson  <mrobinson@igalia.com>
    218

  • trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r137198 r137296  
    244244        g_error("Could not locate test fonts at %s. Is WEBKIT_TOP_LEVEL set?", fontsPath.data());
    245245
    246     GOwnPtr<GError> error;
    247     GOwnPtr<GDir> fontsDirectory(g_dir_open(fontsPath.data(), 0, &error.outPtr()));
     246    GOwnPtr<GDir> fontsDirectory(g_dir_open(fontsPath.data(), 0, 0));
    248247    while (const char* directoryEntry = g_dir_read_name(fontsDirectory.get())) {
    249248        if (!g_str_has_suffix(directoryEntry, ".ttf") && !g_str_has_suffix(directoryEntry, ".otf"))

  • trunk/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp

    r125516 r137296  
    6060        return "(null)";
    6161
    62     GOwnPtr<GError> error1;
    63     GOwnPtr<GError> error2;
    64     GOwnPtr<GError> error3;
    65     GOwnPtr<GError> error4;
    6662    GOwnPtr<gchar> dump(g_strdup_printf("range from %li of %s to %li of %s",
    67         webkit_dom_range_get_start_offset(range, &error1.outPtr()),
    68         dumpNodePath(webkit_dom_range_get_start_container(range, &error2.outPtr())).data(),
    69         webkit_dom_range_get_end_offset(range, &error3.outPtr()),
    70         dumpNodePath(webkit_dom_range_get_end_container(range, &error4.outPtr())).data()));
     63        webkit_dom_range_get_start_offset(range, 0),
     64        dumpNodePath(webkit_dom_range_get_start_container(range, 0)).data(),
     65        webkit_dom_range_get_end_offset(range, 0),
     66        dumpNodePath(webkit_dom_range_get_end_container(range, 0)).data()));
     67
    7168    return dump.get();
    7269}

  • trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp

    r121684 r137296  
    117117        g_error("Could not locate test fonts at %s. Is WEBKIT_TOP_LEVEL set?", fontsPath.data());
    118118
    119     GOwnPtr<GError> error;
    120     GOwnPtr<GDir> fontsDirectory(g_dir_open(fontsPath.data(), 0, &error.outPtr()));
     119    GOwnPtr<GDir> fontsDirectory(g_dir_open(fontsPath.data(), 0, 0));
    121120    while (const char* directoryEntry = g_dir_read_name(fontsDirectory.get())) {
    122121        if (!g_str_has_suffix(directoryEntry, ".ttf") && !g_str_has_suffix(directoryEntry, ".otf"))
Note: See TracChangeset for help on using the changeset viewer.