[webkit-changes] cvs commit: WebCore/khtml/html htmltokenizer.cpp

[Geoffrey]

ggaren      05/10/23 18:39:41

  Modified:    .        ChangeLog
               khtml    khtml_part.cpp
               khtml/html htmltokenizer.cpp
  Log:
          Reviewed by Maciej.
  
          Removed early return from stopLoading because it prevented
          onunload events from firing.
  
          Also, for better abstraction, made the tokenizer -- instead of the
          data source -- responsible for calling [WebFrame _checkLoadComplete]
          when the tokenizer stops.
  
          * khtml/html/htmltokenizer.cpp:
          (khtml::HTMLTokenizer::stopParsing):
          * khtml/khtml_part.cpp:
          (KHTMLPart::stopLoading):
  
  Revision  Changes    Path
  1.264     +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.263
  retrieving revision 1.264
  diff -u -r1.263 -r1.264
  --- ChangeLog	23 Oct 2005 18:00:07 -0000	1.263
  +++ ChangeLog	24 Oct 2005 01:39:36 -0000	1.264
  @@ -1,3 +1,19 @@
  +2005-10-23  Geoffrey Garen  <ggaren at apple.com>
  +
  +        Reviewed by Maciej.
  +
  +        Removed early return from stopLoading because it prevented
  +        onunload events from firing.
  +
  +        Also, for better abstraction, made the tokenizer -- instead of the 
  +        data source -- responsible for calling [WebFrame _checkLoadComplete]
  +        when the tokenizer stops.
  +
  +        * khtml/html/htmltokenizer.cpp:
  +        (khtml::HTMLTokenizer::stopParsing):
  +        * khtml/khtml_part.cpp:
  +        (KHTMLPart::stopLoading):
  +
   2005-10-23 Julien Palmas <julien.palmas at gmail.com>
   
           Reviewed by mjs.
  
  
  
  1.350     +0 -3      WebCore/khtml/khtml_part.cpp
  
  Index: khtml_part.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
  retrieving revision 1.349
  retrieving revision 1.350
  diff -u -r1.349 -r1.350
  --- khtml_part.cpp	22 Oct 2005 04:38:49 -0000	1.349
  +++ khtml_part.cpp	24 Oct 2005 01:39:39 -0000	1.350
  @@ -602,9 +602,6 @@
   
   void KHTMLPart::stopLoading(bool sendUnload)
   {
  -  if (d->m_bComplete)
  -    return;
  -  
     if (d->m_doc && d->m_doc->tokenizer())
       d->m_doc->tokenizer()->stopParsing();
       
  
  
  
  1.122     +5 -0      WebCore/khtml/html/htmltokenizer.cpp
  
  Index: htmltokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- htmltokenizer.cpp	22 Oct 2005 01:41:35 -0000	1.121
  +++ htmltokenizer.cpp	24 Oct 2005 01:39:40 -0000	1.122
  @@ -1557,6 +1557,11 @@
           killTimer(timerId);
           timerId = 0;
       }
  +
  +    // The part needs to know that the tokenizer has finished with its data,
  +    // regardless of whether it happened naturally or due to manual intervention.
  +    if (view && view->part())
  +      view->part()->tokenizerProcessedData();
   }
   
   bool HTMLTokenizer::processingData() const