[webkit-changes] cvs commit: WebCore/khtml/xml xml_tokenizer.cpp
Adele
adele at opensource.apple.com
Tue Aug 9 10:33:38 PDT 2005
adele 05/08/09 10:33:38
Modified: . ChangeLog
khtml/xml xml_tokenizer.cpp
Log:
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
1.4545 +10 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4544
retrieving revision 1.4545
diff -u -r1.4544 -r1.4545
--- ChangeLog 9 Aug 2005 00:13:45 -0000 1.4544
+++ ChangeLog 9 Aug 2005 17:33:34 -0000 1.4545
@@ -1,3 +1,13 @@
+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 David Hyatt <hyatt at apple.com>
Fix for radar bug #4202641, make sure line breaks happen inside
1.36 +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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xml_tokenizer.cpp 30 Jul 2005 02:33:26 -0000 1.35
+++ xml_tokenizer.cpp 9 Aug 2005 17:33:38 -0000 1.36
@@ -222,7 +222,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) {
@@ -232,7 +232,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);
@@ -577,7 +577,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;
More information about the webkit-changes
mailing list