[webkit-changes] cvs commit: WebCore/khtml/misc loader.cpp

[Justin]

justing     05/10/11 13:33:00

  Modified:    .        ChangeLog
               khtml/misc loader.cpp
  Log:
          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
  1.233     +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.232
  retrieving revision 1.233
  diff -u -r1.232 -r1.233
  --- ChangeLog	11 Oct 2005 19:16:41 -0000	1.232
  +++ ChangeLog	11 Oct 2005 20:32:55 -0000	1.233
  @@ -1,3 +1,13 @@
  +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:
  +        
   2005-10-11  Adele Peterson  <adele at apple.com>
   
           Rolling out fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5195
  
  
  
  1.78      +5 -1      WebCore/khtml/misc/loader.cpp
  
  Index: loader.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- loader.cpp	3 Oct 2005 21:12:35 -0000	1.77
  +++ loader.cpp	11 Oct 2005 20:33:00 -0000	1.78
  @@ -1668,6 +1668,9 @@
           ASSERT(r->object->isImage());
           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->isImage())
  @@ -1716,7 +1719,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 );