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 14 matching lines @@
  */
 
 #include "core/html/HTMLOptionElement.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/Document.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/dom/NodeTraversal.h"
-#include "core/dom/ScriptLoader.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/html/HTMLDataListElement.h"
 #include "core/html/HTMLOptGroupElement.h"
 #include "core/html/HTMLSelectElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/style/ComputedStyle.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringBuilder.h"
@@ skipping 330 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() && toElement(node)->isScriptElement())
       node = NodeTraversal::nextSkippingChildren(*node, this);
     else
       node = NodeTraversal::next(*node, this);
   }
   return text.toString();
 }
 
 HTMLFormElement* HTMLOptionElement::form() const {
   if (HTMLSelectElement* selectElement = ownerSelectElement())
     return selectElement->formOwner();
@@ skipping 41 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