Reland HTMLPlugInElement: Use custom focus logic only when there is a plugin.

Source/core/html/HTMLPlugInElement.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 111 matching lines @@
         LocalFrame* frame = toPluginView(widget)->pluginFrame();
         ASSERT(frame);
         frame->registerPluginElement(this);
     }
 #endif
     m_persistedPluginWidget = widget;
 }
 
 bool HTMLPlugInElement::canProcessDrag() const
 {
-    return pluginWidget() && pluginWidget()->isPluginView() && toPluginView(pluginWidget())->canProcessDrag();
+    if (Widget* widget = existingPluginWidget())
+        return widget->isPluginView() && toPluginView(widget)->canProcessDrag();
+    return false;
 }
 
 bool HTMLPlugInElement::willRespondToMouseClickEvents()
 {
     if (isDisabledFormControl())
         return false;
     RenderObject* r = renderer();
     return r && (r->isEmbeddedObject() || r->isRenderPart());
 }
 
@@ skipping 160 matching lines @@
 
     // If the host dynamically turns off JavaScript (or Java) we will still
     // return the cached allocated Bindings::Instance. Not supporting this
     // edge-case is OK.
     if (!m_pluginWrapper) {
         Widget* plugin;
 
         if (m_persistedPluginWidget)
             plugin = m_persistedPluginWidget.get();
         else
-            plugin = pluginWidget();
+            plugin = pluginWidgetForJSBindings();
 
         if (plugin)
             m_pluginWrapper = frame->script().createPluginWrapper(plugin);
     }
     return m_pluginWrapper.get();
 }
 
-Widget* HTMLPlugInElement::pluginWidget() const
+Widget* HTMLPlugInElement::existingPluginWidget() const
+{
+    if (RenderPart* renderPart = existingRenderPart())
+        return renderPart->widget();
+    return nullptr;
+}
+
+Widget* HTMLPlugInElement::pluginWidgetForJSBindings()
 {
     if (RenderPart* renderPart = renderPartForJSBindings())
         return renderPart->widget();
     return nullptr;
 }
 
 bool HTMLPlugInElement::isPresentationAttribute(const QualifiedName& name) const
 {
     if (name == widthAttr || name == heightAttr || name == vspaceAttr || name == hspaceAttr || name == alignAttr)
         return true;
@@ skipping 51 matching lines @@
 {
     // Needs to load the plugin immediatedly because this function is called
     // when JavaScript code accesses the plugin.
     // FIXME: Check if dispatching events here is safe.
     document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
     return existingRenderPart();
 }
 
 bool HTMLPlugInElement::isKeyboardFocusable() const
 {
+    if (useFallbackContent() || usePlaceholderContent())
+        return HTMLElement::isKeyboardFocusable();
+
     if (!document().isActive())
         return false;
-    return pluginWidget() && pluginWidget()->isPluginView() && toPluginView(pluginWidget())->supportsKeyboardFocus();
+
+    if (Widget* widget = existingPluginWidget())
+        return widget->isPluginView() && toPluginView(widget)->supportsKeyboardFocus();
+
+    return false;
 }
 
 bool HTMLPlugInElement::hasCustomFocusLogic() const
 {
-    return !hasAuthorShadowRoot();
+    return !useFallbackContent() && !usePlaceholderContent();
 }
 
 bool HTMLPlugInElement::isPluginElement() const
 {
     return true;
 }
 
 bool HTMLPlugInElement::rendererIsFocusable() const
 {
     if (HTMLFrameOwnerElement::supportsFocus() && HTMLFrameOwnerElement::rendererIsFocusable())
@@ skipping 235 matching lines @@
     return hasAuthorShadowRoot();
 }
 
 void HTMLPlugInElement::lazyReattachIfNeeded()
 {
     if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && renderer() && !isImageType())
         lazyReattachIfAttached();
 }
 
 }