Title: [112306] trunk/Source/WebCore
- Revision
- 112306
- Author
- [email protected]
- Date
- 2012-03-27 13:18:09 -0700 (Tue, 27 Mar 2012)
Log Message
Unreviewed, rolling out r112277.
http://trac.webkit.org/changeset/112277
https://bugs.webkit.org/show_bug.cgi?id=81985
possibly causing crashes?
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::insertedIntoDocument):
(WebCore::SVGUseElement::svgAttributeChanged):
(WebCore::SVGUseElement::willRecalcStyle):
(WebCore::SVGUseElement::finishParsingChildren):
* xml/XMLErrors.cpp:
(WebCore::XMLErrors::insertErrorMessageBlock):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112305 => 112306)
--- trunk/Source/WebCore/ChangeLog 2012-03-27 20:08:07 UTC (rev 112305)
+++ trunk/Source/WebCore/ChangeLog 2012-03-27 20:18:09 UTC (rev 112306)
@@ -1,3 +1,19 @@
+2012-03-27 Dirk Pranke <[email protected]>
+
+ Unreviewed, rolling out r112277.
+ http://trac.webkit.org/changeset/112277
+ https://bugs.webkit.org/show_bug.cgi?id=81985
+
+ possibly causing crashes?
+
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::insertedIntoDocument):
+ (WebCore::SVGUseElement::svgAttributeChanged):
+ (WebCore::SVGUseElement::willRecalcStyle):
+ (WebCore::SVGUseElement::finishParsingChildren):
+ * xml/XMLErrors.cpp:
+ (WebCore::XMLErrors::insertErrorMessageBlock):
+
2012-03-27 Joseph Pecoraro <[email protected]>
<http://webkit.org/b/82362> Web Inspector: Provide private -[DOMNode inspect]
Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (112305 => 112306)
--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2012-03-27 20:08:07 UTC (rev 112305)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2012-03-27 20:18:09 UTC (rev 112306)
@@ -181,8 +181,7 @@
SVGStyledTransformableElement::insertedIntoDocument();
ASSERT(!m_targetElementInstance || !isWellFormedDocument(document()));
ASSERT(!hasPendingResources() || !isWellFormedDocument(document()));
- if (!m_wasInsertedByParser)
- buildPendingResource();
+ buildPendingResource();
SVGExternalResourcesRequired::insertedIntoDocument(this);
}
@@ -253,8 +252,7 @@
m_cachedDocument->removeClient(this);
m_cachedDocument = 0;
}
- if (!m_wasInsertedByParser)
- buildPendingResource();
+ buildPendingResource();
return;
}
@@ -272,7 +270,7 @@
bool SVGUseElement::willRecalcStyle(StyleChange)
{
- if (!m_wasInsertedByParser && m_needsShadowTreeRecreation && renderer() && needsStyleRecalc())
+ if (m_needsShadowTreeRecreation && renderer() && needsStyleRecalc())
buildPendingResource();
return true;
}
@@ -955,10 +953,6 @@
{
SVGStyledTransformableElement::finishParsingChildren();
SVGExternalResourcesRequired::finishParsingChildren();
- if (m_wasInsertedByParser) {
- buildPendingResource();
- m_wasInsertedByParser = false;
- }
}
}
Modified: trunk/Source/WebCore/xml/XMLErrors.cpp (112305 => 112306)
--- trunk/Source/WebCore/xml/XMLErrors.cpp 2012-03-27 20:08:07 UTC (rev 112305)
+++ trunk/Source/WebCore/xml/XMLErrors.cpp 2012-03-27 20:18:09 UTC (rev 112306)
@@ -144,10 +144,11 @@
body->parserAddChild(documentElement);
m_document->parserAddChild(rootElement.get());
- if (m_document->attached())
- // In general, rootElement shouldn't be attached right now, but it will be if there is a style element
- // in the SVG content.
+ if (m_document->attached()) {
+ // rootElement shouldn't be attached right now, but in some cases might be.
+ // See https://bugs.webkit.org/show_bug.cgi?id=81985
rootElement->reattach();
+ }
documentElement = body.get();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
