Merge 95600 - Style changes on forwarded shadow children should trigger shadow renderer reconstru...

Source/WebCore/dom/NodeRenderingContext.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 46 matching lines @@
         m_parentNodeForRenderingAndStyle = parent->shadowHost();
         return;
     }
 
     m_location = LocationLightChild;
 
     if (parent->isElementNode()) {
         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;
             } 
                 
             m_phase = AttachContentLight;
             m_parentNodeForRenderingAndStyle = parent;
             return;
         }
     }
@@ skipping 285 matching lines @@
     m_context.hostChildrenChanged();
 
     if (!newRenderer)
         return;
 
     // Note: Adding newRenderer instead of renderer(). renderer() may be a child of newRenderer.
     parentRenderer->addChild(newRenderer, nextRenderer);
 }
 
 }