Remove remaining HTML elements

sky/engine/core/script/dart_controller.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/engine/core/script/dart_controller.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/trace_event/trace_event.h"
 #include "dart/runtime/bin/embedded_dart_io.h"
 #include "dart/runtime/include/dart_mirrors_api.h"
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
 #include "sky/engine/bindings/builtin.h"
 #include "sky/engine/bindings/builtin_natives.h"
 #include "sky/engine/bindings/builtin_sky.h"
 #include "sky/engine/core/app/AbstractModule.h"
 #include "sky/engine/core/app/Module.h"
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/frame/LocalFrame.h"
-#include "sky/engine/core/html/HTMLScriptElement.h"
-#include "sky/engine/core/html/imports/HTMLImport.h"
-#include "sky/engine/core/html/imports/HTMLImportChild.h"
 #include "sky/engine/core/loader/FrameLoaderClient.h"
 #include "sky/engine/core/script/dart_debugger.h"
 #include "sky/engine/core/script/dart_library_provider_webview.h"
 #include "sky/engine/core/script/dart_service_isolate.h"
 #include "sky/engine/core/script/dom_dart_state.h"
 #include "sky/engine/public/platform/Platform.h"
 #include "sky/engine/tonic/dart_api_scope.h"
 #include "sky/engine/tonic/dart_class_library.h"
 #include "sky/engine/tonic/dart_dependency_catcher.h"
 #include "sky/engine/tonic/dart_error.h"
@@ skipping 31 matching lines @@
 
 extern const uint8_t* kDartVmIsolateSnapshotBuffer;
 extern const uint8_t* kDartIsolateSnapshotBuffer;
 
 DartController::DartController() : weak_factory_(this) {
 }
 
 DartController::~DartController() {
 }
 
-bool DartController::ImportChildLibraries(AbstractModule* module,
-                                          Dart_Handle library) {
-  // If the document has never seen an <import> tag, it won't have an import
-  // controller, and thus will return null for its root HTMLImport.  We could
-  // remove this null-check by always creating an ImportController.
-  HTMLImport* root = module->document()->import();
-  if (!root)
-    return true;
-
-  // TODO(abarth): Why doesn't HTMLImport do these casts for us?
-  for (HTMLImportChild* child =
-           static_cast<HTMLImportChild*>(root->firstChild());
-       child; child = static_cast<HTMLImportChild*>(child->next())) {
-    if (Element* link = child->link()) {
-      String name = link->getAttribute(HTMLNames::asAttr);
-
-      Module* child_module = child->module();
-      if (!child_module)
-        continue;
-      for (const auto& entry : child_module->libraries()) {
-        if (entry.library()->is_empty())
-          continue;
-        if (LogIfError(Dart_LibraryImportLibrary(
-                library, entry.library()->dart_value(),
-                StringToDart(dart_state(), name))))
-          return false;
-      }
-    }
-  }
-  return true;
-}
-
-Dart_Handle DartController::CreateLibrary(AbstractModule* module,
-                                          const String& source,
-                                          const TextPosition& textPosition) {
-  Dart_Handle library = Dart_LoadLibrary(
-      StringToDart(dart_state(), module->UrlForLibraryAt(textPosition)),
-      StringToDart(dart_state(), source), textPosition.m_line.zeroBasedInt(),
-      textPosition.m_column.zeroBasedInt());
-
-  if (LogIfError(library))
-    return nullptr;
-
-  if (!ImportChildLibraries(module, library))
-    return nullptr;
-
-  return library;
-}
-
 void DartController::DidLoadMainLibrary(String name) {
   DCHECK(Dart_CurrentIsolate() == dart_state()->isolate());
   DartApiScope dart_api_scope;
 
   if (LogIfError(Dart_FinalizeLoading(true)))
     return;
 
   Dart_Handle library = Dart_LookupLibrary(StringToDart(dart_state(), name));
   // TODO(eseidel): We need to load a 404 page instead!
   if (LogIfError(library))
@@ skipping 31 matching lines @@
   DartLibraryLoader& loader = dart_state()->library_loader();
   loader.set_library_provider(library_provider);
 
   DartDependencyCatcher dependency_catcher(loader);
   loader.LoadLibrary(name);
   loader.WaitForDependencies(dependency_catcher.dependencies(),
                              base::Bind(&DartController::DidLoadMainLibrary,
                                         weak_factory_.GetWeakPtr(), name));
 }
 
-void DartController::LoadScriptInModule(
-    AbstractModule* module,
-    const String& source,
-    const TextPosition& position,
-    const LoadFinishedCallback& finished_callback) {
-  DartState::Scope scope(dart_state());
-  CreateEmptyRootLibraryIfNeeded();
-
-  DartLibraryLoader& loader = dart_state()->library_loader();
-
-  if (!library_provider_) {
-    library_provider_ = adoptPtr(new DartLibraryProviderWebView());
-    loader.set_library_provider(library_provider_.get());
-  }
-
-  DartDependencyCatcher dependency_catcher(loader);
-  Dart_Handle library_handle = CreateLibrary(module, source, position);
-  if (!library_handle)
-    return finished_callback.Run(nullptr, nullptr);
-  RefPtr<DartValue> library = DartValue::Create(dart_state(), library_handle);
-  module->AddLibrary(library, position);
-
-  // TODO(eseidel): Better if the library/module retained its dependencies and
-  // dependency waiting could be separate from library creation.
-  dart_state()->library_loader().WaitForDependencies(
-      dependency_catcher.dependencies(),
-      base::Bind(finished_callback, module, library));
-}
-
-void DartController::ExecuteLibraryInModule(AbstractModule* module,
-                                            Dart_Handle library,
-                                            HTMLScriptElement* script) {
-  TRACE_EVENT1("sky", "DartController::ExecuteLibraryInModule",
-               "url", module->url().ascii().toStdString());
-  ASSERT(library);
-  DCHECK(Dart_CurrentIsolate() == dart_state()->isolate());
-  DartApiScope dart_api_scope;
-
-  // Don't continue if we failed to load the module.
-  if (LogIfError(Dart_FinalizeLoading(true)))
-    return;
-  const char* name = module->isApplication() ? "main" : "_init";
-
-  // main() is required, but init() is not:
-  // TODO(rmacnak): Dart_LookupFunction won't find re-exports, etc.
-  Dart_Handle entry = Dart_LookupFunction(library, ToDart(name));
-  if (module->isApplication()) {
-    DartInvokeAppField(library, ToDart(name), 0, nullptr);
-    return;
-  }
-
-  if (!Dart_IsFunction(entry))
-    return;
-
-  Dart_Handle args[] = {
-    ToDart(script),
-  };
-  DartInvokeAppField(library, ToDart(name), arraysize(args), args);
-}
-
 static void UnhandledExceptionCallback(Dart_Handle error) {
   LOG(ERROR) << Dart_GetError(error);
 }
 
 static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
                                      Dart_Handle library,
                                      Dart_Handle url) {
   return DartLibraryLoader::HandleLibraryTag(tag, library, url);
 }
 
@@ skipping 184 matching lines @@
                         nullptr,  // Isolate interrupt callback.
                         UnhandledExceptionCallback, IsolateShutdownCallback,
                         // File IO callbacks.
                         nullptr, nullptr, nullptr, nullptr, nullptr));
   // Wait for load port- ensures handle watcher and service isolates are
   // running.
   Dart_ServiceWaitForLoadPort();
 }
 
 } // namespace blink