Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Unified Diff: Source/WebCore/dom/ProcessingInstruction.cpp

Issue 14113007: Remove the ENABLE_XSLT compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/dom/ProcessingInstruction.h ('k') | Source/WebCore/dom/TransformSource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/dom/ProcessingInstruction.cpp
diff --git a/Source/WebCore/dom/ProcessingInstruction.cpp b/Source/WebCore/dom/ProcessingInstruction.cpp
index 0c141ae304888502deb3da4eda28377a1d66a350..5c457c84e278ee976c0d2079f61eeea4a2a90395 100644
--- a/Source/WebCore/dom/ProcessingInstruction.cpp
+++ b/Source/WebCore/dom/ProcessingInstruction.cpp
@@ -47,9 +47,7 @@ inline ProcessingInstruction::ProcessingInstruction(Document* document, const St
, m_alternate(false)
, m_createdByParser(false)
, m_isCSS(false)
-#if ENABLE(XSLT)
, m_isXSL(false)
-#endif
{
ScriptWrappable::init(this);
}
@@ -123,13 +121,9 @@ void ProcessingInstruction::checkStyleSheet()
type = i->value;
m_isCSS = type.isEmpty() || type == "text/css";
-#if ENABLE(XSLT)
m_isXSL = (type == "text/xml" || type == "text/xsl" || type == "application/xml" ||
type == "application/xhtml+xml" || type == "application/rss+xml" || type == "application/atom+xml");
if (!m_isCSS && !m_isXSL)
-#else
- if (!m_isCSS)
-#endif
return;
String href = attrs.get("href");
@@ -143,7 +137,6 @@ void ProcessingInstruction::checkStyleSheet()
if (href.length() > 1 && href[0] == '#') {
m_localHref = href.substring(1);
-#if ENABLE(XSLT)
// We need to make a synthetic XSLStyleSheet that is embedded. It needs to be able
// to kick off import/include loads that can hang off some parent sheet.
if (m_isXSL) {
@@ -151,7 +144,6 @@ void ProcessingInstruction::checkStyleSheet()
m_sheet = XSLStyleSheet::createEmbedded(this, finalURL);
m_loading = false;
}
-#endif
} else {
if (m_cachedSheet) {
m_cachedSheet->removeClient(this);
@@ -166,11 +158,9 @@ void ProcessingInstruction::checkStyleSheet()
document()->styleSheetCollection()->addPendingSheet();
CachedResourceRequest request(ResourceRequest(document()->completeURL(href)));
-#if ENABLE(XSLT)
if (m_isXSL)
m_cachedSheet = document()->cachedResourceLoader()->requestXSLStyleSheet(request);
else
-#endif
{
String charset = attrs.get("charset");
if (charset.isEmpty())
@@ -233,23 +223,19 @@ void ProcessingInstruction::setCSSStyleSheet(const String& href, const KURL& bas
parseStyleSheet(sheet->sheetText(true));
}
-#if ENABLE(XSLT)
void ProcessingInstruction::setXSLStyleSheet(const String& href, const KURL& baseURL, const String& sheet)
{
ASSERT(m_isXSL);
m_sheet = XSLStyleSheet::create(this, href, baseURL);
parseStyleSheet(sheet);
}
-#endif
void ProcessingInstruction::parseStyleSheet(const String& sheet)
{
if (m_isCSS)
static_cast<CSSStyleSheet*>(m_sheet.get())->contents()->parseString(sheet);
-#if ENABLE(XSLT)
else if (m_isXSL)
static_cast<XSLStyleSheet*>(m_sheet.get())->parseString(sheet);
-#endif
if (m_cachedSheet)
m_cachedSheet->removeClient(this);
@@ -259,10 +245,8 @@ void ProcessingInstruction::parseStyleSheet(const String& sheet)
if (m_isCSS)
static_cast<CSSStyleSheet*>(m_sheet.get())->contents()->checkLoaded();
-#if ENABLE(XSLT)
else if (m_isXSL)
static_cast<XSLStyleSheet*>(m_sheet.get())->checkLoaded();
-#endif
}
void ProcessingInstruction::setCSSStyleSheet(PassRefPtr<CSSStyleSheet> sheet)
« no previous file with comments | « Source/WebCore/dom/ProcessingInstruction.h ('k') | Source/WebCore/dom/TransformSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698