[webkit-changes] cvs commit: WebCore/khtml/xml xml_tokenizer.cpp

[Adele]

adele       05/08/09 10:34:37

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/xml Tag: Safari-2-0-branch xml_tokenizer.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-08-09  Adele Peterson  <adele at apple.com>
  
          Reviewed by Darin.
  
          - fixed <rdar://problem/4056369> XML parsing hits disk to turn URL incorrectly passed as relative path name into absolute (prevents idle sleep)
  
          * khtml/xml/xml_tokenizer.cpp:
          (khtml::createQStringParser): removed last parameter, since we are no longer passing the url to xmlCreatePushParserCtxt
          (khtml::XMLTokenizer::finish): removed last parameter from createQStringParser
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.99 +14 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.98
  retrieving revision 1.4104.2.99
  diff -u -r1.4104.2.98 -r1.4104.2.99
  --- ChangeLog	9 Aug 2005 01:20:27 -0000	1.4104.2.98
  +++ ChangeLog	9 Aug 2005 17:34:29 -0000	1.4104.2.99
  @@ -1,3 +1,17 @@
  +2005-08-09  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-08-09  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by Darin.
  +        
  +        - fixed <rdar://problem/4056369> XML parsing hits disk to turn URL incorrectly passed as relative path name into absolute (prevents idle sleep)
  +
  +        * khtml/xml/xml_tokenizer.cpp:
  +        (khtml::createQStringParser): removed last parameter, since we are no longer passing the url to xmlCreatePushParserCtxt
  +        (khtml::XMLTokenizer::finish): removed last parameter from createQStringParser
  +
   2005-08-08  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.30.8.2  +3 -3      WebCore/khtml/xml/xml_tokenizer.cpp
  
  Index: xml_tokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
  retrieving revision 1.30.8.1
  retrieving revision 1.30.8.2
  diff -u -r1.30.8.1 -r1.30.8.2
  --- xml_tokenizer.cpp	1 Jul 2005 22:46:57 -0000	1.30.8.1
  +++ xml_tokenizer.cpp	9 Aug 2005 17:34:36 -0000	1.30.8.2
  @@ -220,7 +220,7 @@
       return 0;
   }
   
  -static xmlParserCtxtPtr createQStringParser(xmlSAXHandlerPtr handlers, void *userData, const char* uri = NULL)
  +static xmlParserCtxtPtr createQStringParser(xmlSAXHandlerPtr handlers, void *userData)
   {
       static bool didInit = false;
       if (!didInit) {
  @@ -230,7 +230,7 @@
           didInit = true;
       }
   
  -    xmlParserCtxtPtr parser = xmlCreatePushParserCtxt(handlers, userData, NULL, 0, uri);
  +    xmlParserCtxtPtr parser = xmlCreatePushParserCtxt(handlers, userData, NULL, 0, NULL);
       const QChar BOM(0xFEFF);
       const unsigned char BOMHighByte = *reinterpret_cast<const unsigned char *>(&BOM);
       xmlSwitchEncoding(parser, BOMHighByte == 0xFF ? XML_CHAR_ENCODING_UTF16LE : XML_CHAR_ENCODING_UTF16BE);
  @@ -582,7 +582,7 @@
       m_parserStopped = false;
       m_sawError = false;
       m_sawXSLTransform = false;
  -    m_context = createQStringParser(&sax, this, m_doc->document()->URL().ascii());
  +    m_context = createQStringParser(&sax, this);
       parseQString(m_context, m_xmlCode);
       xmlFreeParserCtxt(m_context);
       m_context = NULL;