Title: [96025] branches/chromium/835/Source/WebCore/dom
- Revision
- 96025
- Author
- [email protected]
- Date
- 2011-09-26 16:07:28 -0700 (Mon, 26 Sep 2011)
Log Message
Merge 95600 - Style changes on forwarded shadow children should trigger shadow renderer reconstruction.
BUG=93788
Review URL: http://codereview.chromium.org/8041049
Modified Paths
Diff
Modified: branches/chromium/835/Source/WebCore/dom/NodeRenderingContext.cpp (96024 => 96025)
--- branches/chromium/835/Source/WebCore/dom/NodeRenderingContext.cpp 2011-09-26 23:04:14 UTC (rev 96024)
+++ branches/chromium/835/Source/WebCore/dom/NodeRenderingContext.cpp 2011-09-26 23:07:28 UTC (rev 96025)
@@ -61,7 +61,8 @@
m_visualParentShadowRoot = toElement(parent)->shadowRoot();
if (m_visualParentShadowRoot) {
- if ((m_includer = m_visualParentShadowRoot->includerFor(m_node))) {
+ if ((m_includer = m_visualParentShadowRoot->includerFor(m_node))
+ && m_visualParentShadowRoot->isInclusionSelectorActive()) {
m_phase = AttachContentForwarded;
m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_includer).parentNodeForRenderingAndStyle();
return;
Modified: branches/chromium/835/Source/WebCore/dom/ShadowRoot.cpp (96024 => 96025)
--- branches/chromium/835/Source/WebCore/dom/ShadowRoot.cpp 2011-09-26 23:04:14 UTC (rev 96024)
+++ branches/chromium/835/Source/WebCore/dom/ShadowRoot.cpp 2011-09-26 23:07:28 UTC (rev 96025)
@@ -114,6 +114,11 @@
setNeedsStyleRecalc();
}
+bool ShadowRoot::isInclusionSelectorActive() const
+{
+ return m_inclusions && m_inclusions->hasCandidates();
+}
+
bool ShadowRoot::hasContentElement() const
{
for (Node* n = firstChild(); n; n = n->traverseNextNode(this)) {
Modified: branches/chromium/835/Source/WebCore/dom/ShadowRoot.h (96024 => 96025)
--- branches/chromium/835/Source/WebCore/dom/ShadowRoot.h 2011-09-26 23:04:14 UTC (rev 96024)
+++ branches/chromium/835/Source/WebCore/dom/ShadowRoot.h 2011-09-26 23:07:28 UTC (rev 96025)
@@ -43,6 +43,7 @@
ShadowContentElement* includerFor(Node*) const;
void hostChildrenChanged();
+ bool isInclusionSelectorActive() const;
virtual void attach();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
