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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 6feb655cfda48dccd84590c892cf5b70a65b403e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 24 09:37:57 2002 +0000

    	Made frame names globally unique, not just unique per parent frame
    	- this is needed to avoid triggering the assertion in 3006354
    	(Assertion failure on salon.com). Clearing my cache made the
    	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/khtml_part.cpp: Initialize it here.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1651 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d3dc395..1f6d9fc 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-07-24  Maciej Stachowiak  <mjs at apple.com>
+
+	Made frame names globally unique, not just unique per parent frame
+	- this is needed to avoid triggering the assertion in 3006354
+	(Assertion failure on salon.com). Clearing my cache made the
+	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/khtml_part.cpp: Initialize it here.
+
 2002-07-24  Darin Adler  <darin at apple.com>
 
 	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d3dc395..1f6d9fc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-07-24  Maciej Stachowiak  <mjs at apple.com>
+
+	Made frame names globally unique, not just unique per parent frame
+	- this is needed to avoid triggering the assertion in 3006354
+	(Assertion failure on salon.com). Clearing my cache made the
+	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/khtml_part.cpp: Initialize it here.
+
 2002-07-24  Darin Adler  <darin at apple.com>
 
 	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d3dc395..1f6d9fc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-07-24  Maciej Stachowiak  <mjs at apple.com>
+
+	Made frame names globally unique, not just unique per parent frame
+	- this is needed to avoid triggering the assertion in 3006354
+	(Assertion failure on salon.com). Clearing my cache made the
+	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/khtml_part.cpp: Initialize it here.
+
 2002-07-24  Darin Adler  <darin at apple.com>
 
 	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 6e612d7..42574b3 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2660,6 +2660,10 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
 #endif // APPLE_CHANGES
 }
 
+#ifdef APPLE_CHANGES
+unsigned KHTMLPartPrivate::m_frameNameId = 0;
+#endif
+
 QString KHTMLPart::requestFrameName()
 {
    return QString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++);
diff --git a/WebCore/khtml/khtmlpart_p.h b/WebCore/khtml/khtmlpart_p.h
index 480c3f0..edaa18b 100644
--- a/WebCore/khtml/khtmlpart_p.h
+++ b/WebCore/khtml/khtmlpart_p.h
@@ -126,7 +126,9 @@ public:
     m_javaContext = 0;
 #endif
     m_cacheId = 0;
+#ifndef APPLE_CHANGES
     m_frameNameId = 1;
+#endif
 
     m_restored = false;
 
@@ -223,7 +225,13 @@ public:
   bool m_metaRefreshEnabled :1;
   bool m_bPluginsOverride :1;
   bool m_restored :1;
+#ifdef APPLE_CHANGES
+  // Made this static so frame names are globally unique and unsigned
+  // so overflow is handled more gracefully.
+  static unsigned m_frameNameId;
+#else
   int m_frameNameId;
+#endif
   int m_dcop_counter;
   DCOPObject *m_dcopobject;
 

-- 
WebKit Debian packaging