Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 146 matching lines @@
 #include "core/html/HTMLCollection.h"
 #include "core/html/HTMLDialogElement.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLHeadElement.h"
 #include "core/html/HTMLHtmlElement.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLLinkElement.h"
 #include "core/html/HTMLMetaElement.h"
+#include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLScriptElement.h"
 #include "core/html/HTMLTemplateElement.h"
 #include "core/html/HTMLTitleElement.h"
 #include "core/html/PluginDocument.h"
 #include "core/html/WindowNameCollection.h"
 #include "core/html/canvas/CanvasContextCreationAttributes.h"
 #include "core/html/canvas/CanvasFontCache.h"
 #include "core/html/canvas/CanvasRenderingContext.h"
 #include "core/html/forms/FormController.h"
 #include "core/html/imports/HTMLImportLoader.h"
@@ skipping 183 matching lines @@
 
   // rule (d) above
   CharDecompositionType decompType = decompositionType(c);
   if (decompType == DecompositionFont || decompType == DecompositionCompat)
     return false;
 
   return true;
 }
 
 static FrameViewBase* frameViewBaseForElement(const Element& focusedElement) {
+  // Return either plugin or frame.
+  // TODO(joelhockey): FrameViewBase class will soon be removed.  It will be
+  // replaced with Focusable ABC that FrameView and PluginView will implement
+  // and this method will return Focusable.
+  if (isHTMLPlugInElement(focusedElement))
+    return toHTMLPlugInElement(focusedElement).plugin();

[dcheng, 2017/04/05 09:12:24]

Btw, I would suggest just changing 381 to use pluginOrFrame() and remove this
for now.

If/when we get around to changing pluginOrFrame(), we'll have a natural way of
addressing the issue here then as well

[joelhockey, 2017/04/05 22:10:31]

I'll stick with this for right now in the hope of landing this quickly.  But
I've found out from my investigations yesterday that only plugin is relevant
here in the calls to setFocus, and this code will go away when I use the
dispatchBlur/dispatchFocus directly on HTMLPlugInElement.

+
   LayoutObject* layoutObject = focusedElement.layoutObject();
   if (!layoutObject || !layoutObject->isLayoutPart())
     return 0;
   return toLayoutPart(layoutObject)->frameViewBase();
 }
 
 static bool acceptsEditingFocus(const Element& element) {
   DCHECK(hasEditableStyle(element));
 
   return element.document().frame() && rootEditableElement(element);
@@ skipping 6248 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (blink::Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->url().getString().utf8().data());
 }
 #endif