[webkit-changes] cvs commit: WebCore/khtml/misc loader.cpp
Timothy
thatcher at opensource.apple.com
Tue Oct 11 13:56:31 PDT 2005
thatcher 05/10/11 13:56:30
Modified: . Tag: Safari-Den-branch ChangeLog
khtml/misc Tag: Safari-Den-branch loader.cpp
Log:
Merged fix from TOT to Safari-Den-branch
2005-10-10 Justin Garcia <justin.garcia at apple.com>
Reviewed by eric
<rdar://problem/4283218> M-JPEG / Server Push and JavaScript
Ignore multipart loads in numRequests, call checkCompleted() after each section is complete.
* khtml/misc/loader.cpp:
Revision Changes Path
No revision
No revision
1.1.2.23.2.9 +14 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.1.2.23.2.8
retrieving revision 1.1.2.23.2.9
diff -u -r1.1.2.23.2.8 -r1.1.2.23.2.9
--- ChangeLog 5 Oct 2005 16:18:32 -0000 1.1.2.23.2.8
+++ ChangeLog 11 Oct 2005 20:56:26 -0000 1.1.2.23.2.9
@@ -1,3 +1,17 @@
+2005-10-11 Timothy Hatcher <timothy at apple.com>
+
+ Merged fix from TOT to Safari-Den-branch
+
+ 2005-10-10 Justin Garcia <justin.garcia at apple.com>
+
+ Reviewed by eric
+
+ <rdar://problem/4283218> M-JPEG / Server Push and JavaScript
+
+ Ignore multipart loads in numRequests, call checkCompleted() after each section is complete.
+
+ * khtml/misc/loader.cpp:
+
=== WebCore-416.10 ===
2005-10-05 Timothy Hatcher <timothy at apple.com>
No revision
No revision
1.67.8.3.2.1 +5 -1 WebCore/khtml/misc/loader.cpp
Index: loader.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
retrieving revision 1.67.8.3
retrieving revision 1.67.8.3.2.1
diff -u -r1.67.8.3 -r1.67.8.3.2.1
--- loader.cpp 9 Sep 2005 17:17:08 -0000 1.67.8.3
+++ loader.cpp 11 Oct 2005 20:56:30 -0000 1.67.8.3.2.1
@@ -1670,6 +1670,9 @@
ASSERT(r->object->type() == CachedObject::Image);
static_cast<CachedImage *>(r->object)->clear();
r->m_buffer = QBuffer();
+ if (r->m_docLoader->part())
+ r->m_docLoader->part()->checkCompleted();
+
} else if (KWQResponseIsMultipart(response)) {
r->multipart = true;
if (!r->object->type() == CachedObject::Image)
@@ -1718,7 +1721,8 @@
QPtrDictIterator<Request> lIt( m_requestsLoading );
for (; lIt.current(); ++lIt )
if ( lIt.current()->m_docLoader == dl )
- res++;
+ if (!lIt.current()->multipart)
+ res++;
#if APPLE_CHANGES
QPtrListIterator<Request> bdIt( m_requestsBackgroundDecoding );
More information about the webkit-changes
mailing list