diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
| commit | beaeeb99881184fd368c121fcbb1a31c78b794a3 (patch) | |
| tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Source/WebCore/dom/StyledElement.cpp | |
| parent | f7697030f444b5e16331c6d0a99712736b9ff026 (diff) | |
| parent | 79143ccfc158ec4fffc49eee600d600edb342b16 (diff) | |
| download | qtwebkit-beaeeb99881184fd368c121fcbb1a31c78b794a3.tar.gz | |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I9e64176fe95183acf5e093aa081b0a498795bdb2
Diffstat (limited to 'Source/WebCore/dom/StyledElement.cpp')
| -rw-r--r-- | Source/WebCore/dom/StyledElement.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/dom/StyledElement.cpp b/Source/WebCore/dom/StyledElement.cpp index e5d06633d..e7c328a44 100644 --- a/Source/WebCore/dom/StyledElement.cpp +++ b/Source/WebCore/dom/StyledElement.cpp @@ -202,7 +202,7 @@ void StyledElement::styleAttributeChanged(const AtomicString& newStyleString, At if (PropertySetCSSStyleDeclaration* cssomWrapper = inlineStyleCSSOMWrapper()) cssomWrapper->clearParentElement(); ensureUniqueElementData().m_inlineStyle = nullptr; - } else if (reason == ModifiedByCloning || document().contentSecurityPolicy()->allowInlineStyle(document().url(), startLineNumber, isInUserAgentShadowTree())) + } else if (reason == ModifiedByCloning || document().contentSecurityPolicy()->allowInlineStyle(document().url(), startLineNumber, String(), isInUserAgentShadowTree())) setInlineStyleFromString(newStyleString); elementData()->setStyleAttributeIsDirty(false); |