[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 2b825da2330b3e8f9b0f08dd81ac83a888de78f5
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 21 19:54:36 2003 +0000

            Reviewed by Nobody, fixing an accidental commit.
    
            * khtml/khtml_part.cpp:
    	* khtml/html/html_documentimpl.cpp:
            * khtml/xml/dom_docimpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3366 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1af1061..6f8b593 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2003-01-21  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Nobody, fixing an accidental commit.
+
+        * khtml/khtml_part.cpp:
+	* khtml/html/html_documentimpl.cpp:
+        * khtml/xml/dom_docimpl.h:
+
 2003-01-21  Darin Adler  <darin at apple.com>
 
         Everything else reviewed by Maciej, dtd.cpp and htmlparser.cpp changes reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1af1061..6f8b593 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2003-01-21  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Nobody, fixing an accidental commit.
+
+        * khtml/khtml_part.cpp:
+	* khtml/html/html_documentimpl.cpp:
+        * khtml/xml/dom_docimpl.h:
+
 2003-01-21  Darin Adler  <darin at apple.com>
 
         Everything else reviewed by Maciej, dtd.cpp and htmlparser.cpp changes reviewed by Dave.
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index acb2b7d..4e95d50 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -299,12 +299,8 @@ static bool isTransitional(const QString &spec, int start)
 
 void HTMLDocumentImpl::close()
 {
-    if (parsing() || loading()) {
-	return;
-    }
-
     // First fire the onload.
-    bool doload = !parsing() && !loading() && m_tokenizer;
+    bool doload = !parsing() && m_tokenizer;
     
     bool wasNotRedirecting = !view() || view()->part()->d->m_redirectURL.isEmpty();
     
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 9b6ad11..fc791a4 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -404,7 +404,6 @@ bool KHTMLPart::openURL( const KURL &url )
 
         d->m_bComplete = true;
         d->m_doc->setParsing(false);
-        d->m_doc->setLoading(false);
 
         kdDebug( 6050 ) << "completed..." << endl;
         emit completed();
@@ -520,7 +519,6 @@ bool KHTMLPart::closeURL()
     kdDebug( 6050 ) << " was still parsing... calling end " << endl;
     slotFinishedParsing();
     d->m_doc->setParsing(false);
-    d->m_doc->setLoading(false);
   }
 
   if ( !d->m_workingURL.isEmpty() )
@@ -1412,7 +1410,6 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
 #endif
 
   d->m_doc->setParsing(true);
-  d->m_doc->setLoading(true);
 }
 
 void KHTMLPart::write( const char *str, int len )
@@ -1626,7 +1623,6 @@ void KHTMLPart::checkCompleted()
   // OK, completed.
   // Now do what should be done when we are really completed.
   d->m_bComplete = true;
-  d->m_doc->setLoading(false);
 
   checkEmitLoadEvent(); // if we didn't do it before
 
@@ -1686,7 +1682,7 @@ void KHTMLPart::checkCompleted()
 
 void KHTMLPart::checkEmitLoadEvent()
 {
-  if ( d->m_bLoadEventEmitted || !d->m_doc || d->m_doc->parsing() || d->m_doc->loading() ) return;
+  if ( d->m_bLoadEventEmitted || !d->m_doc || d->m_doc->parsing() ) return;
 
   ConstFrameIt it = d->m_frames.begin();
   ConstFrameIt end = d->m_frames.end();
@@ -2833,10 +2829,6 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
 
     if ( child->m_type != khtml::ChildFrame::Object )
     {
-      d->m_bComplete = false;
-      d->m_bLoadEventEmitted = false;
-      d->m_doc->setLoading(true);
-
       connect( part, SIGNAL( started( KIO::Job *) ),
                this, SLOT( slotChildStarted( KIO::Job *) ) );
       connect( part, SIGNAL( completed() ),
@@ -3245,7 +3237,7 @@ void KHTMLPart::slotChildStarted( KIO::Job *job )
       emit d->m_extension->openURLNotify();
     }
 #endif
-
+    d->m_bComplete = false;
     emit started( job );
   }
 }
diff --git a/WebCore/khtml/xml/dom_docimpl.h b/WebCore/khtml/xml/dom_docimpl.h
index 01029d4..121080f 100644
--- a/WebCore/khtml/xml/dom_docimpl.h
+++ b/WebCore/khtml/xml/dom_docimpl.h
@@ -295,8 +295,6 @@ public:
 
     void setParsing(bool b) { m_bParsing = b; }
     bool parsing() const { return m_bParsing; }
-    void setLoading(bool b) { m_bLoading = b; }
-    bool loading() const { return m_bLoading; }
 
     void setTextColor( DOMString color ) { m_textColor = color; }
     DOMString textColor() const { return m_textColor; }
@@ -501,7 +499,6 @@ protected:
     bool m_loadingSheet;
     bool visuallyOrdered;
     bool m_bParsing;
-    bool m_bLoading;
     bool m_docChanged;
     bool m_styleSelectorDirty;
     bool m_inStyleRecalc;

-- 
WebKit Debian packaging