| Index: Source/core/html/HTMLPlugInElement.cpp
|
| diff --git a/Source/core/html/HTMLPlugInElement.cpp b/Source/core/html/HTMLPlugInElement.cpp
|
| index 1d6b6f977958523f9a484a210837de048d5a2f56..443106c54c54c868d366763da0944ed954fbe4f2 100644
|
| --- a/Source/core/html/HTMLPlugInElement.cpp
|
| +++ b/Source/core/html/HTMLPlugInElement.cpp
|
| @@ -602,10 +602,10 @@ void HTMLPlugInElement::setPlaceholder(PassOwnPtrWillBeRawPtr<PluginPlaceholder>
|
| {
|
| bool needsLazyReattach = (!placeholder) != (!m_placeholder);
|
| if (placeholder) {
|
| - placeholder->loadIntoContainer(ensureUserAgentShadowRoot());
|
| + placeholder->loadIntoContainer(ensureClosedShadowRoot());
|
| m_placeholder = placeholder;
|
| } else {
|
| - ShadowRoot& shadowRoot = ensureUserAgentShadowRoot();
|
| + ShadowRoot& shadowRoot = ensureClosedShadowRoot();
|
| shadowRoot.removeChildren();
|
| shadowRoot.appendChild(HTMLContentElement::create(document()));
|
| m_placeholder.clear();
|
| @@ -652,12 +652,12 @@ bool HTMLPlugInElement::pluginIsLoadable(const KURL& url, const String& mimeType
|
| return !MixedContentChecker::shouldBlockFetch(frame, WebURLRequest::RequestContextObject, WebURLRequest::FrameTypeNone, url);
|
| }
|
|
|
| -void HTMLPlugInElement::didAddUserAgentShadowRoot(ShadowRoot&)
|
| +void HTMLPlugInElement::didAddClosedShadowRoot(ShadowRoot&)
|
| {
|
| - userAgentShadowRoot()->appendChild(HTMLContentElement::create(document()));
|
| + closedShadowRoot()->appendChild(HTMLContentElement::create(document()));
|
| }
|
|
|
| -void HTMLPlugInElement::willAddFirstAuthorShadowRoot()
|
| +void HTMLPlugInElement::willAddFirstOpenShadowRoot()
|
| {
|
| lazyReattachIfAttached();
|
| }
|
| @@ -669,7 +669,7 @@ bool HTMLPlugInElement::hasFallbackContent() const
|
|
|
| bool HTMLPlugInElement::useFallbackContent() const
|
| {
|
| - return hasAuthorShadowRoot();
|
| + return hasOpenShadowRoot();
|
| }
|
|
|
| void HTMLPlugInElement::lazyReattachIfNeeded()
|
|
|