[webkit-changes] cvs commit: WebCore/khtml/xsl xslt_processorimpl.cpp

[Timothy]

thatcher    05/11/10 17:51:17

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml/misc Tag: Safari-1-3-branch loader.cpp loader.h
               khtml/xsl Tag: Safari-1-3-branch xslt_processorimpl.cpp
  Log:
          Merged fix from TOT to Safari-1-3-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.335.2.10 +19 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.335.2.9
  retrieving revision 1.335.2.10
  diff -u -r1.335.2.9 -r1.335.2.10
  --- ChangeLog	11 Nov 2005 01:17:09 -0000	1.335.2.9
  +++ ChangeLog	11 Nov 2005 01:51:12 -0000	1.335.2.10
  @@ -2,6 +2,25 @@
   
           Merged fix from TOT to Safari-1-3-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-1-3-branch
  +
       2005-10-03  Beth Dakin  <bdakin at apple.com>
   
           Reviewed by Darin.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.67.6.2  +3 -2      WebCore/khtml/misc/loader.cpp
  
  Index: loader.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
  retrieving revision 1.67.6.1
  retrieving revision 1.67.6.2
  diff -u -r1.67.6.1 -r1.67.6.2
  --- loader.cpp	13 Jul 2005 05:08:07 -0000	1.67.6.1
  +++ loader.cpp	11 Nov 2005 01:51:16 -0000	1.67.6.2
  @@ -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.8.2  +2 -1      WebCore/khtml/misc/loader.h
  
  Index: loader.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/loader.h,v
  retrieving revision 1.38.8.1
  retrieving revision 1.38.8.2
  diff -u -r1.38.8.1 -r1.38.8.2
  --- loader.h	13 Jul 2005 05:08:07 -0000	1.38.8.1
  +++ loader.h	11 Nov 2005 01:51:16 -0000	1.38.8.2
  @@ -86,6 +86,7 @@
       class CachedObject;
       class Request;
       class DocLoader;
  +    class Decoder;
   
    #define MAX_LRU_LISTS 20
       
  @@ -428,7 +429,7 @@
           
   protected:
           DOM::DOMString m_sheet;
  -        QTextCodec* m_codec;
  +        Decoder* m_decoder;
       };
   #endif
       
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.8.2   +1 -2      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.8.1
  retrieving revision 1.4.8.2
  diff -u -r1.4.8.1 -r1.4.8.2
  --- xslt_processorimpl.cpp	27 Jun 2005 23:32:27 -0000	1.4.8.1
  +++ xslt_processorimpl.cpp	11 Nov 2005 01:51:17 -0000	1.4.8.2
  @@ -104,7 +104,7 @@
   
   void XSLTProcessorImpl::addToResult(const char* buffer, int len)
   {
  -    m_resultOutput += QString(buffer, len);
  +    m_resultOutput += QString::fromUtf8(buffer, len);
   }
   
   DocumentImpl* XSLTProcessorImpl::documentFromXMLDocPtr(xmlDocPtr resultDoc, xsltStylesheetPtr sheet)
  @@ -136,7 +136,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);