2011-02-05 Robert Hogan <robert@webkit.org>

        Reviewed by Antonio Gomes.

        [Qt] Style widgets not rendering
        https://bugs.webkit.org/show_bug.cgi?id=53849

        * platform/qt/Skipped: Unskip plugins/application-plugins-plugins-disabled.html
2011-02-05  Robert Hogan  <robert@webkit.org>

        Reviewed by Antonio Gomes.

        [Qt] Style widgets not rendering
        https://bugs.webkit.org/show_bug.cgi?id=53849

        * html/HTMLObjectElement.cpp:
        (WebCore::HTMLObjectElement::hasValidClassId): x-qt-styled-widget is a valid class id too

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e41315b3ec0c925f9965598a18b91bb74359e144..778b1a5c3289c31c27b3cb3325c1cc507b19aa98 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-05  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Style widgets not rendering
+        https://bugs.webkit.org/show_bug.cgi?id=53849
+
+        * platform/qt/Skipped: Unskip plugins/application-plugins-plugins-disabled.html
+
 2011-02-04  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         Not reviewed.

diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index f736a4a28f6ba0aca4fb4e40c3c9666532437252..148a60e3eb28a49b7d8e38180f5252c4daaf2863 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -372,8 +372,6 @@ fast/dom/object-embed-plugin-scripting.html
 plugins/plugin-initiate-popup-window.html
 # ---- to be reviewed
 http/tests/plugins/plugin-document-has-focus.html
-# ---- Bug: Qt Style Widgets should render when plugins are disabled
-plugins/application-plugin-plugins-disabled.html
 
 # [Qt] plugins/keyboard-events.html fails after r72717 
 # https://bugs.webkit.org/show_bug.cgi?id=50050 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 678d4218b448c39e2adbe3c5f5746e5a291a6046..eac42da473a3f60910ef20c0606170ad13cd2bce 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-05  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Style widgets not rendering
+        https://bugs.webkit.org/show_bug.cgi?id=53849
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::hasValidClassId): x-qt-styled-widget is a valid class id too
+
 2011-02-05  Jochen Eisinger  <jochen@chromium.org>
 
         Reviewed by Adam Barth.

diff --git a/Source/WebCore/html/HTMLObjectElement.cpp b/Source/WebCore/html/HTMLObjectElement.cpp
index da1bea9234f6da1dfbcc70eaab53ec70bfbe2c65..c117ba1ff39fd211154e5aa5a466ab10e3e46e8b 100644 (file)
--- a/Source/WebCore/html/HTMLObjectElement.cpp
+++ b/Source/WebCore/html/HTMLObjectElement.cpp
@@ -243,7 +243,7 @@ inline bool HTMLObjectElement::hasValidClassId()
     // WebKit supports no classids, with the exception of Qt plug-ins, which use
     // classid to specify which QObject to load.
 #if PLATFORM(QT)
-    return classId().isEmpty() || equalIgnoringCase(serviceType(), "application/x-qt-plugin");
+    return classId().isEmpty() || equalIgnoringCase(serviceType(), "application/x-qt-plugin") || equalIgnoringCase(serviceType(), "application/x-qt-styled-widget");
 #else
     return classId().isEmpty();
 #endif