De-Element ScriptLoader

third_party/WebKit/Source/core/html/HTMLOptionElement.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@nypop.com)
  * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 365 matching lines @@
   }
   HTMLElement::removedFrom(insertionPoint);
 }
 
 String HTMLOptionElement::collectOptionInnerText() const {
   StringBuilder text;
   for (Node* node = firstChild(); node;) {
     if (node->isTextNode())
       text.append(node->nodeValue());
     // Text nodes inside script elements are not part of the option text.
-    if (node->isElementNode() && toScriptLoaderIfPossible(toElement(node)))
+    if (node->isElementNode() &&
+        ScriptLoaderClient::fromElementIfPossible((toElement(node)))) {

[hiroshige, 2017/03/01 00:58:14]

The purpose of this code looks like to determining whether |node| is a <script>
element or not, rather than obtaining ScriptLoader/ScriptLoaderClient.
I expect adding isScriptElement() to Element or somewhere is better (easier to
read, and hiding the details of ScriptLoader/ScriptLoaderClient from here).

[Nate Chapin, 2017/03/01 21:34:59]

Done.

       node = NodeTraversal::nextSkippingChildren(*node, this);
-    else
+    } else {
       node = NodeTraversal::next(*node, this);
+    }
   }
   return text.toString();
 }
 
 HTMLFormElement* HTMLOptionElement::form() const {
   if (HTMLSelectElement* selectElement = ownerSelectElement())
     return selectElement->formOwner();
 
   return nullptr;
 }
@@ skipping 38 matching lines @@
 }
 
 String HTMLOptionElement::innerText() {
   // A workaround for crbug.com/424578. We add ShadowRoot to an OPTION, but
   // innerText behavior for Shadow DOM is unclear.  We just return the same
   // string before adding ShadowRoot.
   return textContent();
 }
 
 }  // namespace blink