[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 90146dc26bcdcf7e4c221b00ba8d419fcfb9e087
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 5 11:20:16 2002 +0000

    	- fixed 3083732 - SJ: window comes out blank on samsung site
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
    	Don't start loading if the URL is exactly the same as the parent
    	URL. We may need a more stringent check, but this seems to match
    	the tolerance of other browsers OK.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2561 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f45cbb6..a386713 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2002-11-05  Maciej Stachowiak  <mjs at apple.com>
 
+	- fixed 3083732 - SJ: window comes out blank on samsung site
+	
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
+	Don't start loading if the URL is exactly the same as the parent
+	URL. We may need a more stringent check, but this seems to match
+	the tolerance of other browsers OK.
+
+2002-11-05  Maciej Stachowiak  <mjs at apple.com>
+
 	Added request and frame to click policy callback.
 	
         * WebView.subproj/WebControllerPolicyDelegate.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f45cbb6..a386713 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-11-05  Maciej Stachowiak  <mjs at apple.com>
 
+	- fixed 3083732 - SJ: window comes out blank on samsung site
+	
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
+	Don't start loading if the URL is exactly the same as the parent
+	URL. We may need a more stringent check, but this seems to match
+	the tolerance of other browsers OK.
+
+2002-11-05  Maciej Stachowiak  <mjs at apple.com>
+
 	Added request and frame to click policy callback.
 	
         * WebView.subproj/WebControllerPolicyDelegate.h:
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index fa39f32..5ae437a 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -306,7 +306,11 @@
     [[newFrame webView] _setMarginWidth:width];
     [[newFrame webView] _setMarginHeight:height];
 
-    [newFrame _loadURL:URL loadType:WebFrameLoadTypeInternal clientRedirect:NO triggeringEvent:nil];
+    // We must avoid loading the document itself as a subframe, like
+    // other browsers do, otherwise bugs like Radar 3083732
+    if (![[[URL _web_URLByRemovingFragment] absoluteURL] isEqual:[[[frame dataSource] URL] absoluteURL]]) {
+	[newFrame _loadURL:URL loadType:WebFrameLoadTypeInternal clientRedirect:NO triggeringEvent:nil];
+    }
 
     return [newFrame _bridge];
 }

-- 
WebKit Debian packaging