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

Unified Diff: Source/core/dom/DocumentStyleSheetCollection.cpp

Issue 22392008: Manual merge of http://src.chromium.org/viewvc/blink?view=revision&revision=155043 (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1547/
Patch Set: Created 7 years, 4 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/core/dom/Document.cpp ('k') | Source/core/dom/ProcessingInstruction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/DocumentStyleSheetCollection.cpp
===================================================================
--- Source/core/dom/DocumentStyleSheetCollection.cpp (revision 155639)
+++ Source/core/dom/DocumentStyleSheetCollection.cpp (working copy)
@@ -270,7 +270,7 @@
for (StyleSheetCandidateListHashSet::iterator it = begin; it != end; ++it) {
Node* n = *it;
StyleSheet* sheet = 0;
- if (n->nodeType() == Node::PROCESSING_INSTRUCTION_NODE) {
+ if (n->nodeType() == Node::PROCESSING_INSTRUCTION_NODE && !m_document->isHTMLDocument()) {
// Processing instruction (XML documents only).
// We don't support linking to embedded CSS stylesheets, see <https://bugs.webkit.org/show_bug.cgi?id=49281> for discussion.
ProcessingInstruction* pi = static_cast<ProcessingInstruction*>(n);
@@ -278,7 +278,7 @@
// Don't apply XSL transforms to already transformed documents -- <rdar://problem/4132806>
if (pi->isXSL() && !m_document->transformSourceDocument()) {
// Don't apply XSL transforms until loading is finished.
- if (!m_document->parsing())
+ if (!m_document->parsing() && !pi->isLoading())
m_document->applyXSLTransform(pi);
return;
}
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/ProcessingInstruction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698