[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 58521793fa9b9d2bedd69d7752967137376d2d41
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 30 22:06:10 2002 +0000

            Reviewed by Maciej.
    
    	- fixed 3135642 -- ad frames are missing at channels.netscape.com
    
            * khtml/rendering/render_frames.cpp: (RenderPartObject::updateWidget): Updated to use the
    	same rule as Mozilla: Empty URL for an iframe means "about:blank".
    
            * khtml/ecma/kjs_window.cpp: (Window::isSafeScript): Loosen things so that it's safe for
    	a frame to manipulate an empty child frame, as well as an empty opened window. Also remove
    	the useless check for an empty document -- it never happens in practice.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3213 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4d09c77..6f3d44e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-12-30  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3135642 -- ad frames are missing at channels.netscape.com
+
+        * khtml/rendering/render_frames.cpp: (RenderPartObject::updateWidget): Updated to use the
+	same rule as Mozilla: Empty URL for an iframe means "about:blank".
+
+        * khtml/ecma/kjs_window.cpp: (Window::isSafeScript): Loosen things so that it's safe for
+	a frame to manipulate an empty child frame, as well as an empty opened window. Also remove
+	the useless check for an empty document -- it never happens in practice.
+
 2002-12-30  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin and Gramps
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4d09c77..6f3d44e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-12-30  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3135642 -- ad frames are missing at channels.netscape.com
+
+        * khtml/rendering/render_frames.cpp: (RenderPartObject::updateWidget): Updated to use the
+	same rule as Mozilla: Empty URL for an iframe means "about:blank".
+
+        * khtml/ecma/kjs_window.cpp: (Window::isSafeScript): Loosen things so that it's safe for
+	a frame to manipulate an empty child frame, as well as an empty opened window. Also remove
+	the useless check for an empty document -- it never happens in practice.
+
 2002-12-30  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin and Gramps
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 0c0407a..b4060fe 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -916,16 +916,12 @@ bool Window::isSafeScript(ExecState *exec) const
   if ( activePart == m_part ) // Not calling from another frame, no problem.
     return true;
 
-  if ( m_part->document().isNull() )
-    return true; // allow to access a window that was just created (e.g. with window.open("about:blank"))
-
-  if ( activePart == m_part->opener() && 
-       shouldLoadAsEmptyDocument(KURL(m_part->document().completeURL("").string())) ) {
-    return true; // allow access from the window opened this one if it
-		 // made an initially empty document.
+  // allow access from the window that opened this one if it made an initially empty document
+  if ( ( activePart == m_part->opener() || activePart == m_part->parentPart() ) && 
+       shouldLoadAsEmptyDocument(m_part->url()) ) {
+    return true;
   }
 
-
   DOM::HTMLDocument thisDocument = m_part->htmlDocument();
   if ( thisDocument.isNull() ) {
     kdDebug(6070) << "Window::isSafeScript: trying to access an XML document !?" << endl;
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 2dd1acb..8d0ec40 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -800,7 +800,8 @@ void RenderPartObject::updateWidget()
       assert(element()->id() == ID_IFRAME);
       HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(element());
       url = o->url.string();
-      if( url.isEmpty()) return;
+      if (url.isEmpty())
+        url = "about:blank";
       KHTMLView *v = static_cast<KHTMLView *>(m_view);
       v->part()->requestFrame( this, url, o->name.string(), QStringList(), true );
   }

-- 
WebKit Debian packaging