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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 6315720247466b59336869ad5b5ef1c7220866e8
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 4 23:47:31 2002 +0000

    	* kwq/KWQKHTMLPart.mm:
    	(KWQKHTMLPartImpl::timerEvent):
    	(KWQKHTMLPartImpl::redirectURL):
    
    	Renamed redirectJS to redirectURL to more correctly reflect it's
    	function.
    
    	(KWQKHTMLPartImpl::urlSelected):
    
        Fixed 2935505.  We now pop out of a frame if a link is clicked in a frame
        and that frame is the only frame in a frameset.  This emulates the behavior of IE.
    
    	* kwq/KWQKHTMLPartImpl.h:
    	* kwq/external.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b6bb1a7..6cea47d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,22 @@
 2002-06-04  Richard Williamson  <rjw at apple.com>
 
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::timerEvent):
+	(KWQKHTMLPartImpl::redirectURL):
+	
+	Renamed redirectJS to redirectURL to more correctly reflect it's
+	function.
+	
+	(KWQKHTMLPartImpl::urlSelected):
+
+    Fixed 2935505.  We now pop out of a frame if a link is clicked in a frame
+    and that frame is the only frame in a frameset.  This emulates the behavior of IE.
+
+	* kwq/KWQKHTMLPartImpl.h:
+	* kwq/external.h:
+
+2002-06-04  Richard Williamson  <rjw at apple.com>
+
     More exclusion for pre 6C48.
     
 	* kwq/KWQPixmap.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b6bb1a7..6cea47d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,22 @@
 2002-06-04  Richard Williamson  <rjw at apple.com>
 
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::timerEvent):
+	(KWQKHTMLPartImpl::redirectURL):
+	
+	Renamed redirectJS to redirectURL to more correctly reflect it's
+	function.
+	
+	(KWQKHTMLPartImpl::urlSelected):
+
+    Fixed 2935505.  We now pop out of a frame if a link is clicked in a frame
+    and that frame is the only frame in a frameset.  This emulates the behavior of IE.
+
+	* kwq/KWQKHTMLPartImpl.h:
+	* kwq/external.h:
+
+2002-06-04  Richard Williamson  <rjw at apple.com>
+
     More exclusion for pre 6C48.
     
 	* kwq/KWQPixmap.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b6bb1a7..6cea47d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,22 @@
 2002-06-04  Richard Williamson  <rjw at apple.com>
 
+	* kwq/KWQKHTMLPart.mm:
+	(KWQKHTMLPartImpl::timerEvent):
+	(KWQKHTMLPartImpl::redirectURL):
+	
+	Renamed redirectJS to redirectURL to more correctly reflect it's
+	function.
+	
+	(KWQKHTMLPartImpl::urlSelected):
+
+    Fixed 2935505.  We now pop out of a frame if a link is clicked in a frame
+    and that frame is the only frame in a frameset.  This emulates the behavior of IE.
+
+	* kwq/KWQKHTMLPartImpl.h:
+	* kwq/external.h:
+
+2002-06-04  Richard Williamson  <rjw at apple.com>
+
     More exclusion for pre 6C48.
     
 	* kwq/KWQPixmap.mm:
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 504b72f..0023175 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -48,7 +48,7 @@ public:
     void slotData(NSString *, const char *bytes, int length, bool complete = false);
 
     void scheduleRedirection(int delay, const QString &url);
-    void redirectJS();
+    void redirectURL();
     virtual void timerEvent(QTimerEvent *);
 
     bool gotoBaseAnchor();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 56834a5..fe8772a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -361,12 +361,12 @@ void KWQKHTMLPartImpl::timerEvent(QTimerEvent *e)
 {
     if (e->timerId()==m_redirectionTimer)
     {
-    	redirectJS();
+    	redirectURL();
     	return;
     }
 }
 
-void KWQKHTMLPartImpl::redirectJS()
+void KWQKHTMLPartImpl::redirectURL()
 {
   QString u = d->m_redirectURL;
   d->m_delayRedirect = 0;
@@ -426,6 +426,12 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
     if (_target.isEmpty()){
         oldDataSource = getDataSource();
         frame = [oldDataSource webFrame];
+        
+        // If we're the only frame in a frameset then pop
+        // the frame.
+        if ([[[oldDataSource parent] children] count] == 1){
+            frame = [[oldDataSource parent] webFrame];
+        }
     }
     else {
         frame = [[getDataSource() controller] frameNamed: QSTRING_TO_NSSTRING(_target)];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 504b72f..0023175 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -48,7 +48,7 @@ public:
     void slotData(NSString *, const char *bytes, int length, bool complete = false);
 
     void scheduleRedirection(int delay, const QString &url);
-    void redirectJS();
+    void redirectURL();
     virtual void timerEvent(QTimerEvent *);
 
     bool gotoBaseAnchor();
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 56834a5..fe8772a 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -361,12 +361,12 @@ void KWQKHTMLPartImpl::timerEvent(QTimerEvent *e)
 {
     if (e->timerId()==m_redirectionTimer)
     {
-    	redirectJS();
+    	redirectURL();
     	return;
     }
 }
 
-void KWQKHTMLPartImpl::redirectJS()
+void KWQKHTMLPartImpl::redirectURL()
 {
   QString u = d->m_redirectURL;
   d->m_delayRedirect = 0;
@@ -426,6 +426,12 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
     if (_target.isEmpty()){
         oldDataSource = getDataSource();
         frame = [oldDataSource webFrame];
+        
+        // If we're the only frame in a frameset then pop
+        // the frame.
+        if ([[[oldDataSource parent] children] count] == 1){
+            frame = [[oldDataSource parent] webFrame];
+        }
     }
     else {
         frame = [[getDataSource() controller] frameNamed: QSTRING_TO_NSSTRING(_target)];
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index a9d85c4..b5094bb 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -80,6 +80,7 @@ namespace khtml {
 - (void)_setFinalURL: (NSURL *)url;
 - (id <IFLocationChangeHandler>)_locationChangeHandler;
 - (BOOL)_isStopping;
+- (NSArray *)children;
 @end
 
 @interface IFWebView: NSObject

-- 
WebKit Debian packaging