[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 34039077b3adf96d4c0daef452972438e586ec8b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 23 19:57:34 2002 +0000

            Reviewed by NOBODY (OOPS!).
    
    	- fixed 3134558 -- REGRESSION: Lord of the Rings site problems
    
    	This regression was caused when we fixed the abcnews.com problem (3124933).
    
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::createEmptyDocument):
    	Despite its name, this function was never intended to overwrite an existing document with
    	an empty document. When we changed it do do the creation in a better way, we lost the
    	check that prevents it from doing anything at all if we already have a document.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3174 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2d24892..e75ce65 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-12-23  Darin Adler  <darin at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+	- fixed 3134558 -- REGRESSION: Lord of the Rings site problems
+
+	This regression was caused when we fixed the abcnews.com problem (3124933).
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::createEmptyDocument):
+	Despite its name, this function was never intended to overwrite an existing document with
+	an empty document. When we changed it do do the creation in a better way, we lost the
+	check that prevents it from doing anything at all if we already have a document.
+
 2002-12-22  Darin Adler  <darin at apple.com>
 
         Reviewed by Don.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2d24892..e75ce65 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-12-23  Darin Adler  <darin at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+	- fixed 3134558 -- REGRESSION: Lord of the Rings site problems
+
+	This regression was caused when we fixed the abcnews.com problem (3124933).
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::createEmptyDocument):
+	Despite its name, this function was never intended to overwrite an existing document with
+	an empty document. When we changed it do do the creation in a better way, we lost the
+	check that prevents it from doing anything at all if we already have a document.
+
 2002-12-22  Darin Adler  <darin at apple.com>
 
         Reviewed by Don.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 0a90ccf..69eb441 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -666,7 +666,12 @@ bool KWQKHTMLPart::runJavaScriptPrompt(const QString &prompt, const QString &def
 
 void KWQKHTMLPart::createEmptyDocument()
 {
-    [_bridge loadEmptyDocumentSynchronously];
+    // Although it's not completely clear from the name of this function,
+    // it does nothing if we already have a document, and just creates an
+    // empty one if we have no document at all.
+    if (!d->m_doc) {
+        [_bridge loadEmptyDocumentSynchronously];
+    }
 }
 
 void KWQKHTMLPart::addMetaData(const QString &key, const QString &value)

-- 
WebKit Debian packaging