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

[Eric]

eseidel     05/10/31 23:16:09

  Modified:    .        ChangeLog
               khtml/xml dom_docimpl.cpp xml_tokenizer.cpp
  Log:
  Bug #: 5529
  Submitted by: eseidel
  Reviewed by: hyatt
          Now ignores XSLT PIs in documents resulting from transforms.
          http://bugzilla.opendarwin.org/show_bug.cgi?id=5529
  
          * khtml/xml/dom_docimpl.cpp:
          (DocumentImpl::recalcStyleSelector):
          * khtml/xml/xml_tokenizer.cpp:
          (khtml::XMLTokenizer::processingInstruction):
  
  Revision  Changes    Path
  1.317     +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.316
  retrieving revision 1.317
  diff -u -r1.316 -r1.317
  --- ChangeLog	31 Oct 2005 19:04:39 -0000	1.316
  +++ ChangeLog	1 Nov 2005 07:16:06 -0000	1.317
  @@ -1,3 +1,15 @@
  +2005-10-31  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by hyatt.
  +
  +        Now ignores XSLT PIs in documents resulting from transforms.
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=5529
  +
  +        * khtml/xml/dom_docimpl.cpp:
  +        (DocumentImpl::recalcStyleSelector):
  +        * khtml/xml/xml_tokenizer.cpp:
  +        (khtml::XMLTokenizer::processingInstruction):
  +
   2005-10-31  David Harrison  <harrison at apple.com>
   
           Remove conditionalized away code added as part of tab character support.
  
  
  
  1.266     +3 -1      WebCore/khtml/xml/dom_docimpl.cpp
  
  Index: dom_docimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
  retrieving revision 1.265
  retrieving revision 1.266
  diff -u -r1.265 -r1.266
  --- dom_docimpl.cpp	28 Oct 2005 08:01:53 -0000	1.265
  +++ dom_docimpl.cpp	1 Nov 2005 07:16:08 -0000	1.266
  @@ -2069,7 +2069,9 @@
               sheet = pi->sheet();
   #ifdef KHTML_XSLT
               if (pi->isXSL()) {
  -                applyXSLTransform(pi);
  +                // Don't apply transforms to already transformed documents -- <rdar://problem/4132806>
  +                if (!transformSourceDocument())
  +                    applyXSLTransform(pi);
                   return;
               }
   #endif
  
  
  
  1.50      +5 -0      WebCore/khtml/xml/xml_tokenizer.cpp
  
  Index: xml_tokenizer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- xml_tokenizer.cpp	27 Oct 2005 22:34:50 -0000	1.49
  +++ xml_tokenizer.cpp	1 Nov 2005 07:16:08 -0000	1.50
  @@ -489,7 +489,12 @@
       // don't load stylesheets for standalone documents
       if (m_doc->document()->part()) {
   	m_sawXSLTransform = !pi->checkStyleSheet();
  +#ifdef KHTML_XSLT
  +        // Pretend we didn't see this PI if we're the result of a transform.
  +        if (m_sawXSLTransform && !m_doc->document()->transformSourceDocument())
  +#else
           if (m_sawXSLTransform)
  +#endif
               // Stop the SAX parser.
               stopParsing();
       }