[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aestes at apple.com
aestes at apple.com
Wed Dec 22 15:08:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 78a1de3bd682e90776fa9fb7c765b2d0f6800f07
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 28 08:33:16 2010 +0000
One more Qt fix due to r70754.
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::hasValidClassId):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70759 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d464b9b..8cda2a1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-28 Andy Estes <aestes at apple.com>
+
+ One more Qt fix due to r70754.
+
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::hasValidClassId):
+
2010-10-28 Pascal Massimino <pascal.massimino at gmail.com>
Reviewed by Adam Barth.
diff --git a/WebCore/html/HTMLObjectElement.cpp b/WebCore/html/HTMLObjectElement.cpp
index f6ff443..7020517 100644
--- a/WebCore/html/HTMLObjectElement.cpp
+++ b/WebCore/html/HTMLObjectElement.cpp
@@ -225,7 +225,7 @@ 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 equalIgnoringCase(serviceType(), "application/x-qt-plugin");
+ return classId().isEmpty() || equalIgnoringCase(serviceType(), "application/x-qt-plugin");
#else
return classId().isEmpty();
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list