Added setting up VMLibraryHooks for Dartium to support resolvePageUri

Source/bindings/core/dart/DartApplicationLoader.cpp

 // Copyright (c) 2009, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 354 matching lines @@
         if (completeFutures && m_domEnabled) {
             // Call this after Dart_FinalizeLoading so that everything is ready.
             DartScriptDebugServer::shared().deferredReady();
         }
 
     }
     // Invoke the entry point on the main script URL if it has not yet been
     // invoked.
     if (m_state == Ready) {
         // Call the entry point on the main script URL.
+        setupVMLibraryHooks();
         callEntryPoint();
     }
 }
 
 void DartApplicationLoader::initializePlaceholderInteropClasses()
 {
     // Generate a stub patch for JsObjectImpl for non-DOM isolates to avoid
     // warnings about missing classes.
     DartApiScope apiScope;
 
@@ skipping 124 matching lines @@
     }
 }
 
 Dart_Handle DartApplicationLoader::topLevelLibrary()
 {
     Dart_Handle library = Dart_LookupLibrary(DartUtilities::safeStringToDartString(m_scriptUrlString));
     RELEASE_ASSERT(!Dart_IsError(library));
     return library;
 }
 
+void DartApplicationLoader::setupVMLibraryHooks()
+{
+    Dart_Handle builtin_library = Dart_LookupLibrary(Dart_NewStringFromCString("dart:_builtin"));
+    RELEASE_ASSERT(!Dart_IsError(builtin_library));

[siva, 2017/01/06 21:39:33]

Wouldn't need this library if the setup code was added in one of the other
libraries (see comment in the other CL).

+
+    // Call Dartium version of _setupHooks to configure VMLibraryHooks.
+    Dart_Handle dartium_setup_class = Dart_GetType(builtin_library, Dart_NewStringFromCString("DartiumSetup"), 0, 0);
+    RELEASE_ASSERT(!Dart_IsError(dartium_setup_class));
+    Dart_Handle result = Dart_Invoke(dartium_setup_class, Dart_NewStringFromCString("_setupHooks"), 0, NULL);
+    if (Dart_IsError(result)) {
+      reportError("Unable to invoke _setupHooks", "dart:_builtin");
+    }
+}
+
+
 void DartApplicationLoader::findDependences(const String& url, const String& source, intptr_t lineNumber)
 {
     ASSERT(m_pendingLibraries.contains(url) || m_pendingSource.contains(url));
 
     DartIsolateScope isolateScope(m_isolate);
     DartApiScope dartApiScope;
 
     if (m_pendingLibraries.contains(url)) {
         processLibrary(url, source, lineNumber);
     } else {
@@ skipping 226 matching lines @@
         m_scriptResource->removeClient(this);
         delete this;
     }
 
 private:
     String m_url;
     RefPtr<DartApplicationLoader> m_loader;
     ResourcePtr<ScriptResource> m_scriptResource;
 };
 
-static String resolveUrl(String mainLibraryURL, const String& url, const String& packageRootOverride)
+String DartApplicationLoader::resolveUrl(String mainLibraryURL, const String& url, const String& packageRootOverride)
 {
     if (!url.startsWith("package:") || url.startsWith("package://"))
         return url;
 
     String packageRoot;
     String packageUrl;
     if (!packageRootOverride.isNull()) {
         // Resolve with respect to the override. Append a
         // slash to ensure that resolution is against this
         // path and not its parent.
@@ skipping 77 matching lines @@
 
 void DartApplicationLoader::reportError(const String& error, const String& url)
 {
     if (m_state < Running)
         m_state = Error;
     m_loadCallback->reportError(error, url);
 }
 
 
 }