[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ap at apple.com
ap at apple.com
Wed Dec 22 15:38:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 79564b5c45f059e096c520b4f5d525699938394f
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 23:09:10 2010 +0000
Reviewed by Darin Adler.
https://bugs.webkit.org/show_bug.cgi?id=49281
Remove broken code for embedded CSS xml-stylesheet
* dom/Document.cpp: (WebCore::Document::recalcStyleSelector): This made no sense, was untested,
and didn't match Firefox.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71684 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4a140c8..57f1808 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-09 Alexey Proskuryakov <ap at apple.com>
+
+ Reviewed by Darin Adler.
+
+ https://bugs.webkit.org/show_bug.cgi?id=49281
+ Remove broken code for embedded CSS xml-stylesheet
+
+ * dom/Document.cpp: (WebCore::Document::recalcStyleSelector): This made no sense, was untested,
+ and didn't match Firefox.
+
2010-11-09 Brady Eidson <beidson at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 31d7d1f..9263525 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -2948,7 +2948,8 @@ void Document::recalcStyleSelector()
StyleSheet* sheet = 0;
if (n->nodeType() == PROCESSING_INSTRUCTION_NODE) {
- // Processing instruction (XML documents only)
+ // 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);
sheet = pi->sheet();
#if ENABLE(XSLT)
@@ -2960,25 +2961,6 @@ void Document::recalcStyleSelector()
return;
}
#endif
- if (!sheet && !pi->localHref().isEmpty()) {
- // Processing instruction with reference to an element in this document - e.g.
- // <?xml-stylesheet href="#mystyle">, with the element
- // <foo id="mystyle">heading { color: red; }</foo> at some location in
- // the document
- Element* elem = getElementById(pi->localHref().impl());
- if (elem) {
- String sheetText("");
- for (Node* c = elem->firstChild(); c; c = c->nextSibling()) {
- if (c->nodeType() == TEXT_NODE || c->nodeType() == CDATA_SECTION_NODE)
- sheetText += c->nodeValue();
- }
-
- RefPtr<CSSStyleSheet> cssSheet = CSSStyleSheet::create(this);
- cssSheet->parseString(sheetText);
- pi->setCSSStyleSheet(cssSheet);
- sheet = cssSheet.get();
- }
- }
} else if ((n->isHTMLElement() && (n->hasTagName(linkTag) || n->hasTagName(styleTag)))
#if ENABLE(SVG)
|| (n->isSVGElement() && n->hasTagName(SVGNames::styleTag))
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list