[webkit-changes] cvs commit: WebCore/kwq KWQTextArea.mm
Timothy
thatcher at opensource.apple.com
Thu Nov 10 17:45:56 PST 2005
thatcher 05/11/10 17:45:56
Modified: . Tag: Safari-2-0-branch ChangeLog
khtml/misc Tag: Safari-2-0-branch loader.cpp loader.h
khtml/xsl Tag: Safari-2-0-branch xslt_processorimpl.cpp
kwq Tag: Safari-2-0-branch KWQTextArea.mm
Log:
Merged fix from TOT to Safari-2-0-branch
2005-09-21 Vicki Murley <vicki at apple.com>
Changes by Romain Brestac, reviewed by Darin.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=3418
(unicode characters not preserved after a xslt transformation)
* khtml/misc/loader.cpp:
(CachedXSLStyleSheet::CachedXSLStyleSheet):
(CachedXSLStyleSheet::data):
* khtml/misc/loader.h:
* khtml/xsl/xslt_processorimpl.cpp:
(DOM::XSLTProcessorImpl::addToResult):
(DOM::XSLTProcessorImpl::documentFromXMLDocPtr):
Revision Changes Path
No revision
No revision
1.1.2.49 +19 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.1.2.48
retrieving revision 1.1.2.49
diff -u -r1.1.2.48 -r1.1.2.49
--- ChangeLog 11 Nov 2005 01:18:50 -0000 1.1.2.48
+++ ChangeLog 11 Nov 2005 01:45:51 -0000 1.1.2.49
@@ -2,6 +2,25 @@
Merged fix from TOT to Safari-2-0-branch
+ 2005-09-21 Vicki Murley <vicki at apple.com>
+
+ Changes by Romain Brestac, reviewed by Darin.
+
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=3418
+ (unicode characters not preserved after a xslt transformation)
+
+ * khtml/misc/loader.cpp:
+ (CachedXSLStyleSheet::CachedXSLStyleSheet):
+ (CachedXSLStyleSheet::data):
+ * khtml/misc/loader.h:
+ * khtml/xsl/xslt_processorimpl.cpp:
+ (DOM::XSLTProcessorImpl::addToResult):
+ (DOM::XSLTProcessorImpl::documentFromXMLDocPtr):
+
+2005-11-10 Timothy Hatcher <timothy at apple.com>
+
+ Merged fix from TOT to Safari-2-0-branch
+
2005-10-03 Beth Dakin <bdakin at apple.com>
Reviewed by Darin.
No revision
No revision
1.67.8.5 +3 -2 WebCore/khtml/misc/loader.cpp
Index: loader.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
retrieving revision 1.67.8.4
retrieving revision 1.67.8.5
diff -u -r1.67.8.4 -r1.67.8.5
--- loader.cpp 11 Oct 2005 21:12:17 -0000 1.67.8.4
+++ loader.cpp 11 Nov 2005 01:45:54 -0000 1.67.8.5
@@ -52,6 +52,7 @@
#include <kdebug.h>
#include "khtml_factory.h"
#include "khtml_part.h"
+#include "decoder.h"
#include "html/html_documentimpl.h"
#include "css/css_stylesheetimpl.h"
@@ -1102,7 +1103,7 @@
// load the file
Cache::loader()->load(dl, this, false);
m_loading = true;
- m_codec = QTextCodec::codecForName("iso8859-1");
+ m_decoder = new Decoder;
}
void CachedXSLStyleSheet::ref(CachedObjectClient *c)
@@ -1126,7 +1127,7 @@
if(!eof) return;
buffer.close();
setSize(buffer.buffer().size());
- QString data = m_codec->toUnicode( buffer.buffer().data(), size() );
+ QString data = m_decoder->decode( buffer.buffer().data(), size() );
m_sheet = DOMString(data);
m_loading = false;
1.38.10.3 +2 -1 WebCore/khtml/misc/loader.h
Index: loader.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.h,v
retrieving revision 1.38.10.2
retrieving revision 1.38.10.3
diff -u -r1.38.10.2 -r1.38.10.3
--- loader.h 9 Sep 2005 17:17:08 -0000 1.38.10.2
+++ loader.h 11 Nov 2005 01:45:54 -0000 1.38.10.3
@@ -86,6 +86,7 @@
class CachedObject;
class Request;
class DocLoader;
+ class Decoder;
#define MAX_LRU_LISTS 20
@@ -431,7 +432,7 @@
protected:
DOM::DOMString m_sheet;
- QTextCodec* m_codec;
+ Decoder* m_decoder;
};
#endif
No revision
No revision
1.4.10.3 +0 -1 WebCore/khtml/xsl/xslt_processorimpl.cpp
Index: xslt_processorimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xsl/xslt_processorimpl.cpp,v
retrieving revision 1.4.10.2
retrieving revision 1.4.10.3
diff -u -r1.4.10.2 -r1.4.10.3
--- xslt_processorimpl.cpp 2 Aug 2005 21:35:31 -0000 1.4.10.2
+++ xslt_processorimpl.cpp 11 Nov 2005 01:45:55 -0000 1.4.10.3
@@ -177,7 +177,6 @@
result->attach();
result->setURL(m_sourceDocument->URL());
result->setBaseURL(m_sourceDocument->baseURL());
- result->setDecoder(m_sourceDocument->decoder()); // FIXME: Should just be UTF-16.
result->docLoader()->setShowAnimations(m_sourceDocument->docLoader()->showAnimations());
result->setTransformSourceDocument(m_sourceDocument);
No revision
No revision
1.72.8.6 +1 -1 WebCore/kwq/KWQTextArea.mm
Index: KWQTextArea.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQTextArea.mm,v
retrieving revision 1.72.8.5
retrieving revision 1.72.8.6
diff -u -r1.72.8.5 -r1.72.8.6
--- KWQTextArea.mm 11 Nov 2005 01:28:43 -0000 1.72.8.5
+++ KWQTextArea.mm 11 Nov 2005 01:45:56 -0000 1.72.8.6
@@ -991,4 +991,4 @@
}
}
- at end
\ No newline at end of file
+ at end
More information about the webkit-changes
mailing list