[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d93e08178deb0ec07a17e55ccddeb3e2105d49ff
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 08:36:58 2009 +0000

    2009-11-11  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Xan Lopez.
    
            https://bugs.webkit.org/show_bug.cgi?id=30221
            [GTK] fails to load media embedded in iframe element
    
            * platform/gtk/Skipped: Unskip fixed tests.
    2009-11-11  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Xan Lopez.
    
            https://bugs.webkit.org/show_bug.cgi?id=30221
            [GTK] fails to load media embedded in iframe element
    
            The FrameLoader can show Media if the audio/video support is
            enabled at compile time.
    
            * WebCoreSupport/FrameLoaderClientGtk.cpp:
            (WebKit::FrameLoaderClient::canShowMIMEType):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 26ea157..a8da06e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-11  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30221
+        [GTK] fails to load media embedded in iframe element
+
+        * platform/gtk/Skipped: Unskip fixed tests.
+
 2009-11-10  Roland Steiner  <rolandsteiner at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 087a024..226d6b5 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3578,9 +3578,6 @@ http/tests/webarchive/test-preload-resources.html
 media/video-controls-transformed.html
 media/video-controls-zoomed.html
 media/video-size-intrinsic-scale.html
-# See https://bugs.webkit.org/show_bug.cgi?id=30221
-media/video-document-types.html
-media/video-click-dblckick-standalone.html
 # Missing API from https://bugs.webkit.org/show_bug.cgi?id=24001
 media/restore-from-page-cache.html
 # https://bugs.webkit.org/show_bug.cgi?id=30198
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 68c1cd2..1a70636 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-11  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30221
+        [GTK] fails to load media embedded in iframe element
+
+        The FrameLoader can show Media if the audio/video support is
+        enabled at compile time.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::canShowMIMEType):
+
 2009-11-10  Martin Robinson  <martin.james.robinson at gmail.com>
 
         Reviewed by Jan Alonzo.
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index d53df88..f76729d 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -769,8 +769,10 @@ bool FrameLoaderClient::canHandleRequest(const ResourceRequest&) const
 
 bool FrameLoaderClient::canShowMIMEType(const String& type) const
 {
-    return MIMETypeRegistry::isSupportedImageMIMEType(type) || MIMETypeRegistry::isSupportedNonImageMIMEType(type) ||
-        PluginDatabase::installedPlugins()->isMIMETypeRegistered(type);
+    return (MIMETypeRegistry::isSupportedImageMIMEType(type)
+            || MIMETypeRegistry::isSupportedNonImageMIMEType(type)
+            || MIMETypeRegistry::isSupportedMediaMIMEType(type)
+            || PluginDatabase::installedPlugins()->isMIMETypeRegistered(type));
 }
 
 bool FrameLoaderClient::representationExistsForURLScheme(const String&) const

-- 
WebKit Debian packaging