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

[darin]

The following commit has been merged in the debian/unstable branch:
commit b850de25f986482c984bb72b7771d20e8bf7d436
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 24 21:22:50 2002 +0000

            * khtml/khtml_part.cpp: (KHTMLPart::clear): Remove code that reset m_frameNameId,
    	to complete Maciej's change to fix bug 3006354.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1659 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index dde505d..b442778 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-07-24  Darin Adler  <darin at apple.com>
 
+        * khtml/khtml_part.cpp: (KHTMLPart::clear): Remove code that reset m_frameNameId,
+	to complete Maciej's change to fix bug 3006354.
+
+2002-07-24  Darin Adler  <darin at apple.com>
+
 	- fixed 2906567 -- Font size calculations should use 96 dpi instead of 72 dpi
 	- fixed 3005932 -- fonts specified in 'ex' units rendered waaaaaaay too large
 	
@@ -103,7 +108,7 @@
 	assertion go away by itself, but it seems good to avoid the
 	possibility of triggering it in the future.
 	
-        * khtml/khtmlpart_p.h: Make m_partNameId static.
+        * khtml/khtmlpart_p.h: Make m_frameNameId static.
         * khtml/khtml_part.cpp: Initialize it here.
 
 2002-07-24  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index dde505d..b442778 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-07-24  Darin Adler  <darin at apple.com>
 
+        * khtml/khtml_part.cpp: (KHTMLPart::clear): Remove code that reset m_frameNameId,
+	to complete Maciej's change to fix bug 3006354.
+
+2002-07-24  Darin Adler  <darin at apple.com>
+
 	- fixed 2906567 -- Font size calculations should use 96 dpi instead of 72 dpi
 	- fixed 3005932 -- fonts specified in 'ex' units rendered waaaaaaay too large
 	
@@ -103,7 +108,7 @@
 	assertion go away by itself, but it seems good to avoid the
 	possibility of triggering it in the future.
 	
-        * khtml/khtmlpart_p.h: Make m_partNameId static.
+        * khtml/khtmlpart_p.h: Make m_frameNameId static.
         * khtml/khtml_part.cpp: Initialize it here.
 
 2002-07-24  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index dde505d..b442778 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-07-24  Darin Adler  <darin at apple.com>
 
+        * khtml/khtml_part.cpp: (KHTMLPart::clear): Remove code that reset m_frameNameId,
+	to complete Maciej's change to fix bug 3006354.
+
+2002-07-24  Darin Adler  <darin at apple.com>
+
 	- fixed 2906567 -- Font size calculations should use 96 dpi instead of 72 dpi
 	- fixed 3005932 -- fonts specified in 'ex' units rendered waaaaaaay too large
 	
@@ -103,7 +108,7 @@
 	assertion go away by itself, but it seems good to avoid the
 	possibility of triggering it in the future.
 	
-        * khtml/khtmlpart_p.h: Make m_partNameId static.
+        * khtml/khtmlpart_p.h: Make m_frameNameId static.
         * khtml/khtml_part.cpp: Initialize it here.
 
 2002-07-24  Darin Adler  <darin at apple.com>
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 8641515..a0e00a2 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -967,7 +967,9 @@ void KHTMLPart::clear()
   d->m_redirectLockHistory = true;
   d->m_bHTTPRefresh = false;
   d->m_bClearing = false;
+#ifndef APPLE_CHANGES
   d->m_frameNameId = 1;
+#endif
   d->m_bFirstData = true;
 
   d->m_bMousePressed = false;

-- 
WebKit Debian packaging