Modified: trunk/Source/_javascript_Core/ChangeLog (95416 => 95417)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-19 16:07:22 UTC (rev 95416)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 16:22:01 UTC (rev 95417)
@@ -1,6 +1,15 @@
2011-09-19 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Fix distcheck build
+ https://bugs.webkit.org/show_bug.cgi?id=68346
+
+ Reviewed by Philippe Normand.
+
+ * GNUmakefile.list.am:
+
+2011-09-19 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Fix distcheck build
https://bugs.webkit.org/show_bug.cgi?id=68241
Reviewed by Martin Robinson.
Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (95416 => 95417)
--- trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-19 16:07:22 UTC (rev 95416)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am 2011-09-19 16:22:01 UTC (rev 95417)
@@ -104,7 +104,6 @@
Source/_javascript_Core/bytecompiler/LabelScope.h \
Source/_javascript_Core/bytecompiler/NodesCodegen.cpp \
Source/_javascript_Core/bytecompiler/RegisterID.h \
- Source/_javascript_Core/dfg/DFGAliasTracker.h \
Source/_javascript_Core/dfg/DFGByteCodeParser.cpp \
Source/_javascript_Core/dfg/DFGByteCodeParser.h \
Source/_javascript_Core/dfg/DFGCapabilities.cpp \
@@ -116,6 +115,7 @@
Source/_javascript_Core/dfg/DFGGPRInfo.h \
Source/_javascript_Core/dfg/DFGGraph.cpp \
Source/_javascript_Core/dfg/DFGGraph.h \
+ Source/_javascript_Core/dfg/DFGIntrinsic.h \
Source/_javascript_Core/dfg/DFGJITCodeGenerator.cpp \
Source/_javascript_Core/dfg/DFGJITCodeGenerator.h \
Source/_javascript_Core/dfg/DFGJITCompiler.cpp \
Modified: trunk/Source/WebKit/gtk/ChangeLog (95416 => 95417)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-09-19 16:07:22 UTC (rev 95416)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-09-19 16:22:01 UTC (rev 95417)
@@ -1,3 +1,17 @@
+2011-09-19 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Fix distcheck build
+ https://bugs.webkit.org/show_bug.cgi?id=68346
+
+ Reviewed by Philippe Normand.
+
+ * 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.
+
2011-09-17 Mihai Parparita <mih...@chromium.org>
FrameLoaderClient BackForwardList-related methods are unsued
Modified: trunk/Source/WebKit/gtk/tests/testmimehandling.c (95416 => 95417)
--- trunk/Source/WebKit/gtk/tests/testmimehandling.c 2011-09-19 16:07:22 UTC (rev 95416)
+++ trunk/Source/WebKit/gtk/tests/testmimehandling.c 2011-09-19 16:22:01 UTC (rev 95417)
@@ -76,15 +76,6 @@
g_assert(!error);
soup_message_body_append(msg->response_body, SOUP_MEMORY_TAKE, contents, length);
- } else if (g_str_equal(path, "/ogg")) {
- char* contents;
- gsize length;
- GError* error = NULL;
-
- g_file_get_contents("test.ogg", &contents, &length, &error);
- g_assert(!error);
-
- soup_message_body_append(msg->response_body, SOUP_MEMORY_TAKE, contents, length);
}
soup_message_body_complete(msg->response_body);
@@ -124,9 +115,6 @@
g_assert_cmpstr(mime_type, ==, "text/plain");
g_assert(webkit_web_view_can_show_mime_type(view, mime_type));
- } else if (g_str_equal(type, "ogg")) {
- g_assert_cmpstr(mime_type, ==, "audio/x-vorbis+ogg");
- g_assert(webkit_web_view_can_show_mime_type(view, mime_type));
}
g_free(type);
@@ -209,11 +197,9 @@
g_test_add_data_func("/webkit/mime/remote-PDF", "pdf", testRemoteMimeType);
g_test_add_data_func("/webkit/mime/remote-HTML", "html", testRemoteMimeType);
g_test_add_data_func("/webkit/mime/remote-TEXT", "text", testRemoteMimeType);
- g_test_add_data_func("/webkit/mime/remote-OGG", "ogg", testRemoteMimeType);
g_test_add_data_func("/webkit/mime/local-PDF", "pdf", testLocalMimeType);
g_test_add_data_func("/webkit/mime/local-HTML", "html", testLocalMimeType);
g_test_add_data_func("/webkit/mime/local-TEXT", "text", testLocalMimeType);
- g_test_add_data_func("/webkit/mime/local-OGG", "ogg", testLocalMimeType);
return g_test_run();
}
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp (95416 => 95417)
--- trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp 2011-09-19 16:07:22 UTC (rev 95416)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp 2011-09-19 16:22:01 UTC (rev 95417)
@@ -219,7 +219,7 @@
* Returns all the #WebKitWebPluginMIMEType that @plugin is handling
* at the moment.
*
- * Returns: (transfer none) (element-type WebKitWebPluginMIMEType): a #GSList of #WebKitWebPluginMIMEType
+ * Returns: (transfer none) (element-type WebKit.WebKitWebPluginMIMEType): a #GSList of #WebKitWebPluginMIMEType
*
* Since: 1.3.8
*/
