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

[Timothy]

thatcher    05/10/11 14:12:18

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/misc Tag: Safari-2-0-branch loader.cpp
  Log:
          Merged fix from TOT to Safari-2-0-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.37  +14 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.36
  retrieving revision 1.1.2.37
  diff -u -r1.1.2.36 -r1.1.2.37
  --- ChangeLog	6 Oct 2005 23:02:11 -0000	1.1.2.36
  +++ ChangeLog	11 Oct 2005 21:12:13 -0000	1.1.2.37
  @@ -1,3 +1,17 @@
  +2005-10-11  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-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-417.3 ===
   
   2005-10-06  Timothy Hatcher  <timothy at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.67.8.4  +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.4
  diff -u -r1.67.8.3 -r1.67.8.4
  --- loader.cpp	9 Sep 2005 17:17:08 -0000	1.67.8.3
  +++ loader.cpp	11 Oct 2005 21:12:17 -0000	1.67.8.4
  @@ -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 );