De-Element ScriptLoader

third_party/WebKit/Source/core/html/HTMLOptionElement.cpp

Index: third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp b/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
index 7e624fe3a9e334f9275f2ab81170e22aff58a57f..bd44cd96fadc4557c7460fcb6dfd85eadf46a0e7 100644
--- a/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp
@@ -383,10 +383,12 @@ String HTMLOptionElement::collectOptionInnerText() const {
     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();
 }