[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

cblu cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:36:43 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit b9f4b90865a1134839a6cd5896052c48d87ba09d
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Apr 12 22:18:56 2003 +0000

    	Fixed: 3188070 - 6I32 EMBED tag with no SRC attribute doesn't load the plugin
    
            Reviewed by dave.
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::requestObject): allow URL-less parts
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 19f8d94..f5cf8c0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-04-12  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3188070 - 6I32 EMBED tag with no SRC attribute doesn't load the plugin
+
+        Reviewed by dave.
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::requestObject): allow URL-less parts
+
 2003-04-11  Trey Matteson  <trey at apple.com>
 
 	3148002 - printing shouldn't depend on the size of the window
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 19f8d94..f5cf8c0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-04-12  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3188070 - 6I32 EMBED tag with no SRC attribute doesn't load the plugin
+
+        Reviewed by dave.
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::requestObject): allow URL-less parts
+
 2003-04-11  Trey Matteson  <trey at apple.com>
 
 	3148002 - printing shouldn't depend on the size of the window
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 59d30dc..116eda3 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2806,8 +2806,10 @@ QString KHTMLPart::requestFrameName()
 bool KHTMLPart::requestObject( khtml::RenderPart *frame, const QString &url, const QString &serviceType,
                                const QStringList &params )
 {
+#if !APPLE_CHANGES
   if (url.isEmpty())
     return false;
+#endif
   khtml::ChildFrame child;
   QValueList<khtml::ChildFrame>::Iterator it = d->m_objects.append( child );
   (*it).m_frame = frame;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list