[webkit-changes] cvs commit: WebCore/khtml/misc loader.cpp loader.h
Adele
adele at opensource.apple.com
Tue Jul 12 22:08:08 PDT 2005
adele 05/07/12 22:08:07
Modified: . Tag: Safari-1-3-branch ChangeLog
khtml/misc Tag: Safari-1-3-branch loader.cpp loader.h
Log:
Merged fix from TOT to Safari-1-3-branch
<rdar://problem/4165001>
2005-05-27 Adele Peterson <adele at apple.com>
Reviewed by Darin.
fix for <rdar://problem/4121747> Cannot log into Cingular.com account page (load event delivered while still processing incoming data)
* khtml/misc/loader.cpp:
(DocLoader::DocLoader): Initialized m_loadInProgress to false.
(DocLoader::setLoadInProgress): Added.
(Loader::slotFinished): sets the m_loadInProgress flag to reflect the fact that we're not really done loading this request until we emit the signal with the request status.
(Loader::numRequests): If there's a load in progress, we increment the number of requests so it doesn't seem like the load is done.
* khtml/misc/loader.h: (khtml::DocLoader::loadInProgress): Added.
Revision Changes Path
No revision
No revision
1.4108.4.40 +18 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4108.4.39
retrieving revision 1.4108.4.40
diff -u -r1.4108.4.39 -r1.4108.4.40
--- ChangeLog 13 Jul 2005 04:51:56 -0000 1.4108.4.39
+++ ChangeLog 13 Jul 2005 05:07:59 -0000 1.4108.4.40
@@ -1,6 +1,24 @@
2005-07-12 Adele Peterson <adele at apple.com>
Merged fix from TOT to Safari-1-3-branch
+ <rdar://problem/4165001>
+
+ 2005-05-27 Adele Peterson <adele at apple.com>
+
+ Reviewed by Darin.
+
+ fix for <rdar://problem/4121747> Cannot log into Cingular.com account page (load event delivered while still processing incoming data)
+
+ * khtml/misc/loader.cpp:
+ (DocLoader::DocLoader): Initialized m_loadInProgress to false.
+ (DocLoader::setLoadInProgress): Added.
+ (Loader::slotFinished): sets the m_loadInProgress flag to reflect the fact that we're not really done loading this request until we emit the signal with the request status.
+ (Loader::numRequests): If there's a load in progress, we increment the number of requests so it doesn't seem like the load is done.
+ * khtml/misc/loader.h: (khtml::DocLoader::loadInProgress): Added.
+
+2005-07-12 Adele Peterson <adele at apple.com>
+
+ Merged fix from TOT to Safari-1-3-branch
<rdar://problem/4165000>
2005-05-05 David Hyatt <hyatt at apple.com>
No revision
No revision
1.67.6.1 +16 -5 WebCore/khtml/misc/loader.cpp
Index: loader.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
retrieving revision 1.67
retrieving revision 1.67.6.1
diff -u -r1.67 -r1.67.6.1
--- loader.cpp 18 Dec 2004 03:30:08 -0000 1.67
+++ loader.cpp 13 Jul 2005 05:08:07 -0000 1.67.6.1
@@ -1257,6 +1257,7 @@
m_showAnimations = KHTMLSettings::KAnimationEnabled;
m_part = part;
m_doc = doc;
+ m_loadInProgress = false;
#if APPLE_CHANGES
Cache::init();
@@ -1469,6 +1470,11 @@
m_docObjects.removeRef( o );
}
+void DocLoader::setLoadInProgress(bool load)
+{
+ m_loadInProgress = load;
+}
+
// ------------------------------------------------------------------------------------------
Loader::Loader() : QObject()
@@ -1571,7 +1577,7 @@
if ( !r )
return;
-
+
if (j->error() || j->isErrorPage())
{
kdDebug(6060) << "Loader::slotFinished, with error. job->error()= " << j->error() << " job->isErrorPage()=" << j->isErrorPage() << endl;
@@ -1580,8 +1586,7 @@
}
else
{
- r->object->data(r->m_buffer, true);
-
+ r->object->data(r->m_buffer, true);
emit requestDone( r->m_docLoader, r->object );
time_t expireDate = j->queryMetaData("expire-date").toLong();
kdDebug(6060) << "Loader::slotFinished, url = " << j->url().url() << " expires " << ctime(&expireDate) << endl;
@@ -1620,16 +1625,19 @@
callback->handleError();
}
else {
+ docLoader->setLoadInProgress(true);
r->object->error( job->error(), job->errorText().ascii() );
+ docLoader->setLoadInProgress(false);
emit requestFailed( docLoader, object );
Cache::removeCacheEntry( object );
}
}
else {
+ docLoader->setLoadInProgress(true);
object->data(r->m_buffer, true);
-
r->object->setAllData(allData);
-
+ docLoader->setLoadInProgress(false);
+
// Let the background image decoder trigger the done signal.
if (!backgroundImageDecoding)
emit requestDone( docLoader, object );
@@ -1706,6 +1714,9 @@
res++;
#endif
+ if (dl->loadInProgress())
+ res++;
+
return res;
}
1.38.8.1 +4 -0 WebCore/khtml/misc/loader.h
Index: loader.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.h,v
retrieving revision 1.38
retrieving revision 1.38.8.1
diff -u -r1.38 -r1.38.8.1
--- loader.h 7 Dec 2004 23:06:24 -0000 1.38
+++ loader.h 13 Jul 2005 05:08:07 -0000 1.38.8.1
@@ -491,6 +491,9 @@
void setCachePolicy( KIO::CacheControl cachePolicy );
void setShowAnimations( KHTMLSettings::KAnimationAdvice );
void removeCachedObject( CachedObject*) const;
+
+ void setLoadInProgress(bool);
+ bool loadInProgress() const { return m_loadInProgress; }
private:
bool needReload(const KURL &fullUrl);
@@ -506,6 +509,7 @@
KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
KHTMLPart* m_part;
DOM::DocumentImpl* m_doc;
+ bool m_loadInProgress;
};
/**
More information about the webkit-changes
mailing list