Refactoring XSLT

Source/core/dom/ProcessingInstruction.cpp

 /*
  * Copyright (C) 2000 Peter Kelly (pmk@post.com)
  * Copyright (C) 2006, 2008, 2009 Apple Inc. All rights reserved.
  *
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 14 matching lines @@
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/MediaList.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Document.h"
 #include "core/dom/IncrementLoadEventDelayCount.h"
 #include "core/dom/StyleEngine.h"
 #include "core/fetch/CSSStyleSheetResource.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/XSLStyleSheetResource.h"
+#include "core/xml/DocumentXSLT.h"
 #include "core/xml/XSLStyleSheet.h"
 #include "core/xml/parser/XMLDocumentParser.h" // for parseAttributes()
 
 namespace blink {
 
 inline ProcessingInstruction::ProcessingInstruction(Document& document, const String& target, const String& data)
     : CharacterData(document, data, CreateOther)
     , m_target(target)
     , m_loading(false)
     , m_alternate(false)
     , m_createdByParser(false)
     , m_isCSS(false)
     , m_isXSL(false)
+    , m_listenerForXSLT(nullptr)
 {
 }
 
 PassRefPtrWillBeRawPtr<ProcessingInstruction> ProcessingInstruction::create(Document& document, const String& target, const String& data)
 {
     return adoptRefWillBeNoop(new ProcessingInstruction(document, target, data));
 }
 
 ProcessingInstruction::~ProcessingInstruction()
 {
 #if !ENABLE(OILPAN)
     if (m_sheet)
         clearSheet();
 
     // FIXME: ProcessingInstruction should not be in document here.
     // However, if we add ASSERT(!inDocument()), fast/xsl/xslt-entity.xml
     // crashes. We need to investigate ProcessingInstruction lifetime.
-    if (inDocument()) {
-        if (m_isCSS)
-            document().styleEngine()->removeStyleSheetCandidateNode(this);
-        else if (m_isXSL)
-            document().styleEngine()->removeXSLStyleSheet(this);
-    }
+    if (inDocument() && m_isCSS)
+        document().styleEngine()->removeStyleSheetCandidateNode(this);
 #endif
 }
 
 String ProcessingInstruction::nodeName() const
 {
     return m_target;
 }
 
 Node::NodeType ProcessingInstruction::nodeType() const
 {
@@ skipping 74 matching lines @@
     FetchRequest request(ResourceRequest(document().completeURL(href)), FetchInitiatorTypeNames::processinginstruction);
     if (m_isXSL) {
         resource = document().fetcher()->fetchXSLStyleSheet(request);
     } else {
         request.setCharset(charset.isEmpty() ? document().charset() : charset);
         resource = document().fetcher()->fetchCSSStyleSheet(request);
     }
 
     if (resource) {
         m_loading = true;
-        document().styleEngine()->addPendingSheet();
+        if (!m_isXSL)
+            document().styleEngine()->addPendingSheet();
         setResource(resource);
     }
 }
 
 bool ProcessingInstruction::isLoading() const
 {
     if (m_loading)
         return true;
     if (!m_sheet)
         return false;
     return m_sheet->isLoading();
 }
 
 bool ProcessingInstruction::sheetLoaded()
 {
     if (!isLoading()) {
+        if (m_isXSL) {
+            DocumentXSLT::sheetLoaded(document(), this);
+            return true;
+        }
         document().styleEngine()->removePendingSheet(this);
         return true;
     }
     return false;
 }
 
 void ProcessingInstruction::setCSSStyleSheet(const String& href, const KURL& baseURL, const String& charset, const CSSStyleSheetResource* sheet)
 {
     if (!inDocument()) {
         ASSERT(!m_sheet);
@@ skipping 59 matching lines @@
 
 Node::InsertionNotificationRequest ProcessingInstruction::insertedInto(ContainerNode* insertionPoint)
 {
     CharacterData::insertedInto(insertionPoint);
     if (!insertionPoint->inDocument())
         return InsertionDone;
 
     String href;
     String charset;
     bool isValid = checkStyleSheet(href, charset);
-    if (m_isCSS)
+    if (m_isCSS) {
         document().styleEngine()->addStyleSheetCandidateNode(this, m_createdByParser);
-    else if (m_isXSL)
-        document().styleEngine()->addXSLStyleSheet(this, m_createdByParser);
+    } else if (m_isXSL) {
+        // No need to register XSLStyleSheet to StyleEngine.
+        m_listenerForXSLT = DocumentXSLT::addDOMContentLoadedListenerForXSLT(document(), this);
+        ASSERT(m_listenerForXSLT);

[tasak, 2014/11/19 09:23:03]

Should be ASSERT(m_listenerForXSLT || !RuntimeEnabledFeatures::xsltEnabled());

+    }
     if (isValid)
         process(href, charset);
     return InsertionDone;
 }
 
 void ProcessingInstruction::removedFrom(ContainerNode* insertionPoint)
 {
     CharacterData::removedFrom(insertionPoint);
     if (!insertionPoint->inDocument())
         return;
 
-    if (m_isCSS)
+    if (m_isCSS) {
         document().styleEngine()->removeStyleSheetCandidateNode(this);
-    else if (m_isXSL)
-        document().styleEngine()->removeXSLStyleSheet(this);
+    } else if (m_isXSL) {

[tasak, 2014/11/19 09:23:03]

Should be (m_isXSL && m_listenerForXSLT)

+        document().removeEventListener(EventTypeNames::DOMContentLoaded, m_listenerForXSLT, false);
+        m_listenerForXSLT.clear();
+    }
 
+    // No need to remove XSLStyleSheet from StyleEngine.
     RefPtrWillBeRawPtr<StyleSheet> removedSheet = m_sheet;
 
     if (m_sheet) {
         ASSERT(m_sheet->ownerNode() == this);
         clearSheet();
     } else if (resource()) {
         ASSERT(m_loading);
         document().styleEngine()->removePendingSheet(this);
         clearResource();
     }
@@ skipping 11 matching lines @@
     m_sheet.release()->clearOwnerNode();
 }
 
 void ProcessingInstruction::trace(Visitor* visitor)
 {
     visitor->trace(m_sheet);
     CharacterData::trace(visitor);
 }
 
 } // namespace