Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)

1 files changed, 6 insertions, 3 deletions

diff --git a/Source/WebCore/dom/ShadowRoot.cpp b/Source/WebCore/dom/ShadowRoot.cpp
index 464beae48..86a10cdc0 100644
--- a/Source/WebCore/dom/ShadowRoot.cpp
+++ b/Source/WebCore/dom/ShadowRoot.cpp
@@ -144,8 +144,7 @@ String ShadowRoot::innerHTML() const
 
 void ShadowRoot::setInnerHTML(const String& markup, ExceptionCode& ec)
 {
-    RefPtr<DocumentFragment> fragment = createFragmentFromSource(markup, host(), ec);
-    if (fragment)
+    if (RefPtr<DocumentFragment> fragment = createFragmentForInnerOuterHTML(markup, host(), ec))
         replaceChildrenWithFragment(this, fragment.release(), ec);
 }
 
@@ -188,7 +187,11 @@ bool ShadowRoot::applyAuthorStyles() const
 
 void ShadowRoot::setApplyAuthorStyles(bool value)
 {
-    m_applyAuthorStyles = value;
+    if (m_applyAuthorStyles != value) {
+        m_applyAuthorStyles = value;
+        if (attached() && owner())
+            owner()->setNeedsRedistributing();
+    }
 }
 
 void ShadowRoot::attach()