[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 48cc1e86bb627dafce29cdda5a972134961c4653
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 16 15:47:38 2002 +0000

    	- fixed 3026042 -- hide frames button at developer documentation doesn't work
    
    	This regression was introduced by the anchor changes we made just after
    	the Alexander-15 release.
    
            * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
    	Make decisions about special handling for links with anchors based
    	on the target frame, not the current frame.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1845 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 81bdfbd..b9fc3b6 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-08-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3026042 -- hide frames button at developer documentation doesn't work
+
+	This regression was introduced by the anchor changes we made just after
+	the Alexander-15 release.
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
+	Make decisions about special handling for links with anchors based
+	on the target frame, not the current frame.
+
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
         * force-clean-timestamp: rebuild for JavaScriptCore changes.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 81bdfbd..b9fc3b6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-08-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3026042 -- hide frames button at developer documentation doesn't work
+
+	This regression was introduced by the anchor changes we made just after
+	the Alexander-15 release.
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
+	Make decisions about special handling for links with anchors based
+	on the target frame, not the current frame.
+
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
         * force-clean-timestamp: rebuild for JavaScriptCore changes.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 81bdfbd..b9fc3b6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-08-16  Darin Adler  <darin at apple.com>
+
+	- fixed 3026042 -- hide frames button at developer documentation doesn't work
+
+	This regression was introduced by the anchor changes we made just after
+	the Alexander-15 release.
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::urlSelected):
+	Make decisions about special handling for links with anchors based
+	on the target frame, not the current frame.
+
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
         * force-clean-timestamp: rebuild for JavaScriptCore changes.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 328af61..0723d77 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -189,21 +189,26 @@ void KWQKHTMLPartImpl::urlSelected(const QString &url, int button, int state, co
         [bridge openNewWindowWithURL:cocoaURL];
         return;
     }
-
-    // FIXME: KHTML does this in openURL -- we should consider doing that too, because
-    // this won't work when there's targeting involved.
-    KURL refLess(clickedURL);
-    part->m_url.setRef("");
-    refLess.setRef("");
-    if (refLess.url() == part->m_url.url()) {
-        part->m_url = clickedURL;
-        part->gotoAnchor(clickedURL.ref());
-        // This URL needs to be added to the back/forward list.
-        [bridge addBackForwardItemWithURL:cocoaURL anchor:clickedURL.ref().getNSString()];
-        return;
+    
+    WebCoreBridge *targetBridge = getBridgeForFrameName(target);
+
+    // FIXME: KHTML does this in openURL -- we should do this at that level so we don't
+    // have the complexity of dealing with the target here.
+    KHTMLPart *targetPart = [targetBridge part];
+    if (targetPart) {
+        KURL refLess(clickedURL);
+        targetPart->m_url.setRef("");
+        refLess.setRef("");
+        if (refLess.url() == targetPart->m_url.url()) {
+            targetPart->m_url = clickedURL;
+            targetPart->gotoAnchor(clickedURL.ref());
+            // This URL needs to be added to the back/forward list.
+            [targetBridge addBackForwardItemWithURL:cocoaURL anchor:clickedURL.ref().getNSString()];
+            return;
+        }
     }
     
-    [getBridgeForFrameName(target) loadURL:cocoaURL];
+    [targetBridge loadURL:cocoaURL];
 }
 
 bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, const QString &frameName,
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 328af61..0723d77 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -189,21 +189,26 @@ void KWQKHTMLPartImpl::urlSelected(const QString &url, int button, int state, co
         [bridge openNewWindowWithURL:cocoaURL];
         return;
     }
-
-    // FIXME: KHTML does this in openURL -- we should consider doing that too, because
-    // this won't work when there's targeting involved.
-    KURL refLess(clickedURL);
-    part->m_url.setRef("");
-    refLess.setRef("");
-    if (refLess.url() == part->m_url.url()) {
-        part->m_url = clickedURL;
-        part->gotoAnchor(clickedURL.ref());
-        // This URL needs to be added to the back/forward list.
-        [bridge addBackForwardItemWithURL:cocoaURL anchor:clickedURL.ref().getNSString()];
-        return;
+    
+    WebCoreBridge *targetBridge = getBridgeForFrameName(target);
+
+    // FIXME: KHTML does this in openURL -- we should do this at that level so we don't
+    // have the complexity of dealing with the target here.
+    KHTMLPart *targetPart = [targetBridge part];
+    if (targetPart) {
+        KURL refLess(clickedURL);
+        targetPart->m_url.setRef("");
+        refLess.setRef("");
+        if (refLess.url() == targetPart->m_url.url()) {
+            targetPart->m_url = clickedURL;
+            targetPart->gotoAnchor(clickedURL.ref());
+            // This URL needs to be added to the back/forward list.
+            [targetBridge addBackForwardItemWithURL:cocoaURL anchor:clickedURL.ref().getNSString()];
+            return;
+        }
     }
     
-    [getBridgeForFrameName(target) loadURL:cocoaURL];
+    [targetBridge loadURL:cocoaURL];
 }
 
 bool KWQKHTMLPartImpl::requestFrame( RenderPart *frame, const QString &url, const QString &frameName,

-- 
WebKit Debian packaging