Changeset 95417 in webkit


Ignore:
Timestamp:
Sep 19, 2011 9:22:01 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] Fix distcheck build
​https://bugs.webkit.org/show_bug.cgi?id=68346

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2011-09-19
Reviewed by Philippe Normand.

Source/JavaScriptCore:

  • GNUmakefile.list.am:

Source/WebKit/gtk:

  • tests/testmimehandling.c: Remove ogg tests, since the behavious

has changed in libsoup (​https://bugzilla.gnome.org/show_bug.cgi?id=648846#c8)
(server_callback):
(mime_type_policy_decision_requested_cb):
(main):

  • webkit/webkitwebplugin.cpp: Fix introspection annotation.
Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r95403 r95417  
     12011-09-19  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Fix distcheck build
     4        https://bugs.webkit.org/show_bug.cgi?id=68346
     5
     6        Reviewed by Philippe Normand.
     7
     8        * GNUmakefile.list.am:
     9
    1102011-09-19  Carlos Garcia Campos  <cgarcia@igalia.com>
    211

  • trunk/Source/JavaScriptCore/GNUmakefile.list.am

    r95403 r95417  
    105105        Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp \
    106106        Source/JavaScriptCore/bytecompiler/RegisterID.h \
    107         Source/JavaScriptCore/dfg/DFGAliasTracker.h \
    108107        Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp \
    109108        Source/JavaScriptCore/dfg/DFGByteCodeParser.h \
    … …  
    117116        Source/JavaScriptCore/dfg/DFGGraph.cpp \
    118117        Source/JavaScriptCore/dfg/DFGGraph.h \
     118        Source/JavaScriptCore/dfg/DFGIntrinsic.h \
    119119        Source/JavaScriptCore/dfg/DFGJITCodeGenerator.cpp \
    120120        Source/JavaScriptCore/dfg/DFGJITCodeGenerator.h \

  • trunk/Source/WebKit/gtk/ChangeLog

    r95387 r95417  
     12011-09-19  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Fix distcheck build
     4        https://bugs.webkit.org/show_bug.cgi?id=68346
     5
     6        Reviewed by Philippe Normand.
     7
     8        * tests/testmimehandling.c: Remove ogg tests, since the behavious
     9        has changed in libsoup (https://bugzilla.gnome.org/show_bug.cgi?id=648846#c8)
     10        (server_callback):
     11        (mime_type_policy_decision_requested_cb):
     12        (main):
     13        * webkit/webkitwebplugin.cpp: Fix introspection annotation.
     14
    1152011-09-17  Mihai Parparita  <mihaip@chromium.org>
    216

  • trunk/Source/WebKit/gtk/tests/testmimehandling.c

    r75928 r95417  
    7777
    7878        soup_message_body_append(msg->response_body, SOUP_MEMORY_TAKE, contents, length);
    79     } else if (g_str_equal(path, "/ogg")) {
    80         char* contents;
    81         gsize length;
    82         GError* error = NULL;
    83 
    84         g_file_get_contents("test.ogg", &contents, &length, &error);
    85         g_assert(!error);
    86 
    87         soup_message_body_append(msg->response_body, SOUP_MEMORY_TAKE, contents, length);
    8879    }
    8980
    … …  
    125116        g_assert_cmpstr(mime_type, ==, "text/plain");
    126117        g_assert(webkit_web_view_can_show_mime_type(view, mime_type));
    127     } else if (g_str_equal(type, "ogg")) {
    128         g_assert_cmpstr(mime_type, ==, "audio/x-vorbis+ogg");
    129         g_assert(webkit_web_view_can_show_mime_type(view, mime_type));
    130118    }
    131119
    … …  
    210198    g_test_add_data_func("/webkit/mime/remote-HTML", "html", testRemoteMimeType);
    211199    g_test_add_data_func("/webkit/mime/remote-TEXT", "text", testRemoteMimeType);
    212     g_test_add_data_func("/webkit/mime/remote-OGG", "ogg", testRemoteMimeType);
    213200    g_test_add_data_func("/webkit/mime/local-PDF", "pdf", testLocalMimeType);
    214201    g_test_add_data_func("/webkit/mime/local-HTML", "html", testLocalMimeType);
    215202    g_test_add_data_func("/webkit/mime/local-TEXT", "text", testLocalMimeType);
    216     g_test_add_data_func("/webkit/mime/local-OGG", "ogg", testLocalMimeType);
    217203
    218204    return g_test_run();

  • trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp

    r87830 r95417  
    220220 * at the moment.
    221221 *
    222  * Returns: (transfer none) (element-type WebKitWebPluginMIMEType): a #GSList of #WebKitWebPluginMIMEType
     222 * Returns: (transfer none) (element-type WebKit.WebKitWebPluginMIMEType): a #GSList of #WebKitWebPluginMIMEType
    223223 *
    224224 * Since: 1.3.8
Note: See TracChangeset for help on using the changeset viewer.