Added setting up VMLibraryHooks for Dartium to support resolvePageUri

Source/bindings/core/dart/DartApplicationLoader.h

 // Copyright 2011, 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 88 matching lines @@
 
         Document* document();
         Document* originDocument() const { return m_originDocument; }
         PassRefPtr<DartScriptInfo> scriptInfo() const { return m_scriptInfo; }
 
     private:
         Document* m_originDocument;
         RefPtr<DartScriptInfo> m_scriptInfo;
     };
 
+    static String resolveUrl(String mainLibraryURL, const String& url, const String& packageRootOverride);
+
     static PassRefPtr<DartApplicationLoader> create(Document* document, bool domEnabled)
     {
         return adoptRef(new DartApplicationLoader(document, domEnabled));
     }
 
     void load(PassRefPtr<DartErrorEventDispatcher>);
 
     Document* document() { return m_originDocument; }
 
     void callEntryPoint();
 
     void logObservatoryInformation();
 
     void validateUrlLoaded(const String& url);
 
     // Registers a request to be fetched later.
     void addRequest(PassRefPtr<DartScriptInfo>);
 
     // Fetches all pending requests and invokes callback when done.
     void processRequests(Dart_Isolate, const ScriptSourceCode&, PassRefPtr<Callback>);
     void processSingleRequest(Dart_Isolate, const String& url, PassRefPtr<Callback>);
 
     bool running() const { return m_state >= Running; }
     bool error() const { return m_state == Error; }
     bool uninitialized() const { return m_state == Uninitialized; }
 
     const KURL& scriptUrl() { return m_scriptUrl; }
+    const String packageRoot() { return m_packageRoot; }

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

const String packageRoot() const { return m_packageRoot; }

Same for scriptUrl too.

[terry, 2017/01/09 21:06:02]

Done.

 
     static void initializePlaceholderInteropClasses();
 
 private:
     enum State {
         // The application failed to load.
         Error = -1,
 
         // The isolate is not set.
         Uninitialized = 0,
@@ skipping 24 matching lines @@
     typedef Vector<Dart_PersistentHandle> HandleSet;
     typedef HashMap<String, HandleSet*> UrlHandleMap;
     typedef Deque<RefPtr<DartScriptInfo> > ScriptList;
     typedef HashMap<String, DartAggregate*> AggregateMap;
 
     DartApplicationLoader(Document*, bool domEnabled = true);
 
     void loadScriptFromSnapshot(const String& url, const uint8_t* snapshot, intptr_t snapshotSize);
 
     Dart_Handle topLevelLibrary();
+    void setupVMLibraryHooks();
 
     // FIXME(vsm): Do we need all of these?
     void scriptLoadError(String failedUrl);
     void reportDartError(Dart_Handle);
     void reportError(Dart_Handle error, const String& url);
     void reportError(const String& error, const String& url);
 
     void initialize(Dart_Isolate, const String& scriptUrl, PassRefPtr<Callback>);
 
     void process(const String& url, const String& source, intptr_t lineNumber);
@@ skipping 29 matching lines @@
 
     State m_state;
 
     friend class DartService;
     friend class ScriptLoadedCallback;
 };
 
 }
 
 #endif // DartApplicationLoader_h