Refactoring XSLT

Source/core/xml/XSLTProcessor.cpp

 /*
  * This file is part of the XSL implementation.
  *
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple, Inc. All rights reserved.
  * Copyright (C) 2005, 2006 Alexey Proskuryakov <ap@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 13 matching lines @@
 #include "core/xml/XSLTProcessor.h"
 
 #include "core/dom/DOMImplementation.h"
 #include "core/dom/DocumentEncodingData.h"
 #include "core/dom/DocumentFragment.h"
 #include "core/editing/markup.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
+#include "core/xml/DocumentXSLT.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 static inline void transformTextStringToXHTMLDocumentString(String& text)
 {
     // Modify the output so that it is a well-formed XHTML document with a <pre> tag enclosing the text.
     text.replaceWithLiteral('&', "&amp;");
     text.replaceWithLiteral('<', "&lt;");
@@ skipping 32 matching lines @@
     if (frame) {
         RefPtrWillBeRawPtr<Document> oldDocument = frame->document();
         result = frame->localDOMWindow()->installNewDocument(sourceMIMEType, init, forceXHTML);
 
         // Before parsing, we need to save & detach the old document and get the new document
         // in place. We have to do this only if we're rendering the result document.
         if (FrameView* view = frame->view())
             view->clear();
 
         if (oldDocument) {
-            result->setTransformSourceDocument(oldDocument.get());
+            DocumentXSLT::from(*result).setTransformSourceDocument(oldDocument.get());
             result->updateSecurityOrigin(oldDocument->securityOrigin());
             result->setCookieURL(oldDocument->cookieURL());
-            result->initContentSecurityPolicy();
+
+            RefPtr<ContentSecurityPolicy> csp = ContentSecurityPolicy::create();
+            csp->copyStateFrom(oldDocument->contentSecurityPolicy());
+            result->initContentSecurityPolicy(csp);
         }
     } else {
         result = LocalDOMWindow::createDocument(sourceMIMEType, init, forceXHTML);
     }
 
     DocumentEncodingData data;
     data.setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncoding(sourceEncoding));
     result->setEncodingData(data);
     result->setContent(documentSource);
 
@@ skipping 59 matching lines @@
 }
 
 void XSLTProcessor::trace(Visitor* visitor)
 {
     visitor->trace(m_stylesheet);
     visitor->trace(m_stylesheetRootNode);
     visitor->trace(m_document);
 }
 
 } // namespace blink