[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 40696e378de595e602272afede2b1f4a3892b09e
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 14 20:54:28 2002 +0000

            Put #ifndef APPLE_CHANGES around one line that
            was causing EMBED and OBJECT tags to not have render objects.
    
            * khtml/html/html_objectimpl.cpp:
            (HTMLObjectElementImpl::attach):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8d03378..9ac1e9a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-06-14  Chris Blumenberg  <cblu at apple.com>
 
+	Put #ifndef APPLE_CHANGES around one line that
+	was causing EMBED and OBJECT tags to not have render objects.
+
+	* khtml/html/html_objectimpl.cpp:
+	(HTMLObjectElementImpl::attach):
+
+2002-06-14  Chris Blumenberg  <cblu at apple.com>
+
 	Committing Richard's changes to KWQPainter
 
 2002-06-13  Richard Williamson  <rjw at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8d03378..9ac1e9a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-06-14  Chris Blumenberg  <cblu at apple.com>
 
+	Put #ifndef APPLE_CHANGES around one line that
+	was causing EMBED and OBJECT tags to not have render objects.
+
+	* khtml/html/html_objectimpl.cpp:
+	(HTMLObjectElementImpl::attach):
+
+2002-06-14  Chris Blumenberg  <cblu at apple.com>
+
 	Committing Richard's changes to KWQPainter
 
 2002-06-13  Richard Williamson  <rjw at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8d03378..9ac1e9a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-06-14  Chris Blumenberg  <cblu at apple.com>
 
+	Put #ifndef APPLE_CHANGES around one line that
+	was causing EMBED and OBJECT tags to not have render objects.
+
+	* khtml/html/html_objectimpl.cpp:
+	(HTMLObjectElementImpl::attach):
+
+2002-06-14  Chris Blumenberg  <cblu at apple.com>
+
 	Committing Richard's changes to KWQPainter
 
 2002-06-13  Richard Williamson  <rjw at apple.com>
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index 720931f..2e6127c 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -337,7 +337,9 @@ void HTMLObjectElementImpl::attach()
     KURL u = getDocument()->completeURL(url);
     for (KHTMLPart* part = w->part(); part; part = part->parentPart())
         if (part->url() == u) {
+#ifndef APPLE_CHANGES
             loadplugin = false;
+#endif
             break;
         }
 

-- 
WebKit Debian packaging