[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-06-19 20:32:10
Message-ID: 20100619203210.460D8AC8D9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1140109 by orlovich:

Woops. Make sure we hold load event for resolution of mimetype of kids, too.
Also rename fullyLoaded -> isFullyLoaded to make its nature clearer.


 M  +4 -4      khtml_part.cpp  
 M  +1 -1      khtmlpart_p.h  


--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #1140108:1140109
@@ -2320,7 +2320,7 @@
   setUserStyleSheet( KUrl( settings()->userStyleSheet() ) );
 }
 
-bool KHTMLPartPrivate::fullyLoaded(bool* pendingRedirections) const
+bool KHTMLPartPrivate::isFullyLoaded(bool* pendingRedirections) const
 {
   *pendingRedirections = false;
   
@@ -2328,7 +2328,7 @@
   ConstFrameIt it = m_frames.constBegin();
   const ConstFrameIt end = m_frames.constEnd();
   for (; it != end; ++it ) {
-    if ( !(*it)->m_bCompleted )
+    if ( !(*it)->m_bCompleted || (*it)->m_run )
     {
       //kDebug( 6050 ) << this << " is waiting for " << (*it)->m_part;
       return false;
@@ -2382,7 +2382,7 @@
   }
 
   bool fullyLoaded, pendingChildRedirections;
-  fullyLoaded = d->fullyLoaded(&pendingChildRedirections);
+  fullyLoaded = d->isFullyLoaded(&pendingChildRedirections);
 
   // Are we still loading, or already have done the relevant work?
   if (!fullyLoaded || d->m_bComplete)
@@ -2459,7 +2459,7 @@
 void KHTMLPart::checkEmitLoadEvent()
 {
   bool fullyLoaded, pendingChildRedirections;
-  fullyLoaded = d->fullyLoaded(&pendingChildRedirections);
+  fullyLoaded = d->isFullyLoaded(&pendingChildRedirections);
 
   // ### might want to wait on pendingChildRedirections here, too
   if ( d->m_bLoadEventEmitted || !d->m_doc || !fullyLoaded ) return;
--- trunk/KDE/kdelibs/khtml/khtmlpart_p.h #1140108:1140109
@@ -512,7 +512,7 @@
   // The return value doesn't consider any pending redirections.
   // If the return value is true, however, pendingRedirections will
   // report if there are any
-  bool fullyLoaded(bool* pendingRedirections) const;
+  bool isFullyLoaded(bool* pendingRedirections) const;
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]