[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 0e3dadfeaf9ba3efa727d545439e2da2f376ece9
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 23 05:04:31 2002 +0000

    	Fixed Radar 3004897 - assert at mapquest
    
            * khtml/html/html_baseimpl.cpp:
            (HTMLIFrameElementImpl::attach): Put back frame name uniqueness
    	check. Lack of this check was causing duplicate frames to be left
    	floating in space.
            * kwq/KWQKHTMLPartImpl.mm:
            (KWQKHTMLPartImpl::requestFrame): Add an assertion that no frame
    	of the requested name already exists.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1632 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c9f7cdf..b6f9899 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-07-22  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Radar 3004897 - assert at mapquest
+
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLIFrameElementImpl::attach): Put back frame name uniqueness
+	check. Lack of this check was causing duplicate frames to be left
+	floating in space.
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::requestFrame): Add an assertion that no frame
+	of the requested name already exists.
+
 2002-07-22  David Hyatt  <hyatt at apple.com>
 
 	Fix for bug 3004889, plugin content on stylesheet pages not
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c9f7cdf..b6f9899 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-07-22  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Radar 3004897 - assert at mapquest
+
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLIFrameElementImpl::attach): Put back frame name uniqueness
+	check. Lack of this check was causing duplicate frames to be left
+	floating in space.
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::requestFrame): Add an assertion that no frame
+	of the requested name already exists.
+
 2002-07-22  David Hyatt  <hyatt at apple.com>
 
 	Fix for bug 3004889, plugin content on stylesheet pages not
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c9f7cdf..b6f9899 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-07-22  Maciej Stachowiak  <mjs at apple.com>
+
+	Fixed Radar 3004897 - assert at mapquest
+
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLIFrameElementImpl::attach): Put back frame name uniqueness
+	check. Lack of this check was causing duplicate frames to be left
+	floating in space.
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::requestFrame): Add an assertion that no frame
+	of the requested name already exists.
+
 2002-07-22  David Hyatt  <hyatt at apple.com>
 
 	Fix for bug 3004889, plugin content on stylesheet pages not
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index 0be0b0d..1bae529 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -630,11 +630,7 @@ void HTMLIFrameElementImpl::attach()
     if (m_render) {
         // we need a unique name for every frame in the frameset. Hope that's unique enough.
         KHTMLView* w = getDocument()->view();
-#ifdef APPLE_CHANGES
-        if(name.isEmpty())
-#else
         if(name.isEmpty() || w->part()->frameExists( name.string() ))
-#endif
             name = DOMString(w->part()->requestFrameName());
 
         static_cast<RenderPartObject*>(m_render)->updateWidget();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 0ad6541..171c025 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -424,6 +424,8 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
 bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &url, const QString &frameName,
                                      const QStringList &params, bool isIFrame )
 {
+    KWQ_ASSERT(!frameExists(frameName));
+
     NSURL *childURL = part->completeURL(url).getNSURL();
     if (childURL == nil) {
         NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", m_baseURL.prettyURL().ascii(), url.ascii());
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 0ad6541..171c025 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -424,6 +424,8 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
 bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &url, const QString &frameName,
                                      const QStringList &params, bool isIFrame )
 {
+    KWQ_ASSERT(!frameExists(frameName));
+
     NSURL *childURL = part->completeURL(url).getNSURL();
     if (childURL == nil) {
         NSLog (@"ERROR (probably need to fix CFURL): unable to create URL with path (base URL %s, relative URL %s)", m_baseURL.prettyURL().ascii(), url.ascii());

-- 
WebKit Debian packaging