Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / HTMLPlugInElement.cpp

diff --git a/src/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp b/src/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
index 0b2df23..b3eb176 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
+++ b/src/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
@@ -129,6 +129,7 @@ void HTMLPlugInElement::attach(const AttachContext& context)
         && !m_isDelayingLoadEvent) {
         m_isDelayingLoadEvent = true;
         document().incrementLoadEventDelayCount();
+        document().loadPluginsSoon();
     }
 }
 
@@ -201,7 +202,7 @@ void HTMLPlugInElement::finishParsingChildren()
 
     setNeedsWidgetUpdate(true);
     if (inDocument())
-        setNeedsStyleRecalc();
+        setNeedsStyleRecalc(SubtreeStyleChange);
 }
 
 void HTMLPlugInElement::resetInstance()
@@ -324,6 +325,11 @@ bool HTMLPlugInElement::isKeyboardFocusable() const
     return pluginWidget() && pluginWidget()->isPluginView() && toPluginView(pluginWidget())->supportsKeyboardFocus();
 }
 
+bool HTMLPlugInElement::hasCustomFocusLogic() const
+{
+    return !hasAuthorShadowRoot();
+}
+
 bool HTMLPlugInElement::isPluginElement() const
 {
     return true;