Remove layoutObject() dependency from HTMLPlugInElement::layoutObjectIsFocusable().

third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * 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 24 matching lines @@
 #include "core/paint/EmbeddedObjectPainter.h"
 #include "core/plugins/PluginView.h"
 #include "platform/text/PlatformLocale.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 LayoutEmbeddedObject::LayoutEmbeddedObject(Element* element)
     : LayoutPart(element)
-    , m_showsUnavailablePluginIndicator(false)
 {
     view()->frameView()->setIsVisuallyNonEmpty();
 }
 
 LayoutEmbeddedObject::~LayoutEmbeddedObject()
 {
 }
 
 PaintLayerType LayoutEmbeddedObject::layerTypeRequired() const
 {
     // This can't just use LayoutPart::layerTypeRequired, because PaintLayerCompositor
     // doesn't loop through LayoutEmbeddedObjects the way it does frames in order
     // to update the self painting bit on their Layer.
     // Also, unlike iframes, embeds don't used the usesCompositing bit on LayoutView
     // in requiresAcceleratedCompositing.
     if (requiresAcceleratedCompositing())
         return NormalPaintLayer;
     return LayoutPart::layerTypeRequired();
 }
 
 static String localizedUnavailablePluginReplacementText(Node* node, LayoutEmbeddedObject::PluginUnavailabilityReason pluginUnavailabilityReason)
 {
     Locale& locale = node ? toElement(node)->locale() : Locale::defaultLocale();
     switch (pluginUnavailabilityReason) {
+    case LayoutEmbeddedObject::PluginAvailable:
+        NOTREACHED();
+        return String();
     case LayoutEmbeddedObject::PluginMissing:
         return locale.queryString(WebLocalizedString::MissingPluginText);
     case LayoutEmbeddedObject::PluginBlockedByContentSecurityPolicy:
         return locale.queryString(WebLocalizedString::BlockedPluginText);
     }

[kochi, 2016/07/21 02:09:56]

It seems compilers are complaining that on cases not caught in switch-case,
nothing is returned.

[tkent, 2016/07/21 02:21:07]

Try bots are red because of other reasons, I think.

[kochi, 2016/07/21 02:27:21]

See this, for this case.
https://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel...

[tkent, 2016/07/21 04:08:25]

Oh, you're right.  Thank you.

-
-    ASSERT_NOT_REACHED();
-    return String();
 }
 
 void LayoutEmbeddedObject::setPluginUnavailabilityReason(PluginUnavailabilityReason pluginUnavailabilityReason)
 {
-    ASSERT(!m_showsUnavailablePluginIndicator);
-    m_showsUnavailablePluginIndicator = true;
+    DCHECK_EQ(PluginAvailable, m_pluginUnavailabilityReason);
     m_pluginUnavailabilityReason = pluginUnavailabilityReason;
 
     m_unavailablePluginReplacementText = localizedUnavailablePluginReplacementText(node(), pluginUnavailabilityReason);
 
     // node() is nullptr when LayoutPart is being destroyed.
     if (node())
         setShouldDoFullPaintInvalidation();
 }
 
 bool LayoutEmbeddedObject::showsUnavailablePluginIndicator() const
 {
-    return m_showsUnavailablePluginIndicator;
+    return m_pluginUnavailabilityReason != PluginAvailable;
 }
 
 void LayoutEmbeddedObject::paintContents(const PaintInfo& paintInfo, const LayoutPoint& paintOffset) const
 {
     Element* element = toElement(node());
     if (!isHTMLPlugInElement(element))
         return;
 
     LayoutPart::paintContents(paintInfo, paintOffset);
 }
@@ skipping 57 matching lines @@
 }
 
 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const
 {
     if (!node() || !widget() || !widget()->isFrameView())
         return nullptr;
     return toFrameView(widget())->embeddedReplacedContent();
 }
 
 } // namespace blink