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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 01eaf84f52f9f46fa21221ecc36e3c2af7b999b6
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 28 00:07:52 2002 +0000

            Added an APPLE_CHANGES to fix 2894742. The attributes of an EMBED tag
            must override the attributes of PARAM tags.
    
            * khtml/rendering/render_frames.cpp:
            (RenderPartObject::updateWidget):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d13843f..2539c57 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-06-27  Chris Blumenberg  <cblu at apple.com>
+
+	Added an APPLE_CHANGES to fix 2894742. The attributes of an EMBED tag
+	must override the attributes of PARAM tags.
+
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::updateWidget):
+
 2002-06-27  Darin Adler  <darin at apple.com>
 
 	- fixed 2973342 -- copied text seems to have an extra blank line between paragraphs
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d13843f..2539c57 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-06-27  Chris Blumenberg  <cblu at apple.com>
+
+	Added an APPLE_CHANGES to fix 2894742. The attributes of an EMBED tag
+	must override the attributes of PARAM tags.
+
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::updateWidget):
+
 2002-06-27  Darin Adler  <darin at apple.com>
 
 	- fixed 2973342 -- copied text seems to have an extra blank line between paragraphs
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d13843f..2539c57 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-06-27  Chris Blumenberg  <cblu at apple.com>
+
+	Added an APPLE_CHANGES to fix 2894742. The attributes of an EMBED tag
+	must override the attributes of PARAM tags.
+
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::updateWidget):
+
 2002-06-27  Darin Adler  <darin at apple.com>
 
 	- fixed 2973342 -- copied text seems to have an extra blank line between paragraphs
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 5dba103..ef73e43 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -46,7 +46,7 @@
 #include <qcursor.h>
 
 #include <assert.h>
-
+#include <iostream.h>
 using namespace khtml;
 using namespace DOM;
 
@@ -698,6 +698,21 @@ void RenderPartObject::updateWidget()
 #endif
               return;
           }
+#ifdef APPLE_CHANGES
+          // Fix for 2894742
+          // The EMBED attributes must override the PARAM attributes.
+          // This mimics IE's behavior.
+          NamedAttrMapImpl* attributes = embed->attributes();
+          for (unsigned long index = 0; index < attributes->length(); ++index) {
+              AttributeImpl* attribute = attributes->attributeItem(index);
+              for (unsigned long n = 0; n < params.count(); ++n) {
+                  if(params[n].lower().startsWith(embed->getDocument()->attrName(attribute->id()).string().lower())){
+                      params.remove(params[n]);
+                  }
+              }
+              params.append(embed->getDocument()->attrName(attribute->id()).string() + "=\"" + attribute->value().string() + "\"");
+          }
+#endif
           part->requestObject( this, url, serviceType, params );
       }
   }

-- 
WebKit Debian packaging