Apply all blink changes between @202695 and tip of trunk

Source/bindings/core/dart/DartDOMData.h

 /*
  * Copyright (C) 2012 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 53 matching lines @@
 typedef HashMap<void*, Dart_WeakPersistentHandle> DartDOMObjectMap;
 /* TODO(terry): Had to change HashMap to point to void* otherwise C++ error:
  *              [blink-gc] Class 'DartDOMData' contains invalid fields. Raw
  *              pointer field 'm_messagePortMap' to a GC managed class.
  * typedef HashMap<MessagePort*, Dart_WeakPersistentHandle> DartMessagePortMap;
  */
 typedef HashMap<void*, Dart_WeakPersistentHandle> DartMessagePortMap;
 typedef HashSet<DartIsolateDestructionObserver*> DartIsolateDestructionObservers;
 typedef Dart_PersistentHandle ClassTable[NumWebkitClassIds];
 typedef Dart_PersistentHandle LibraryTable[NumDartLibraryIds];
-typedef HashMap<Node*, Dart_WeakReferenceSet> WeakReferenceSetForRootMap;
 
 class DartDOMData {
 public:
     DartDOMData(ExecutionContext*, const char* scriptURL, const char* packageRoot, bool isDOMEnabled);
     ~DartDOMData();
 
     static DartDOMData* current();
 
     char* scriptURL() const { return m_scriptURL; }
     const char* packageRoot() const { return m_packageRoot; }
     ExecutionContext* scriptExecutionContext() { return m_scriptExecutionContext; }
     bool isDOMEnabled() { return m_isDOMEnabled; }
 
     // We track the Dart specific recursion level here as well as the global
     // recursion level tracked by m_recursionScope due to dartbug.com/14183.
     int* recursion() { return &m_recursion; }
     DartStringCache& stringCache() { return m_stringCache; }
 
     void setThreadSafeIsolateWrapper(PassRefPtr<ThreadSafeDartIsolateWrapper>);
     PassRefPtr<ThreadSafeDartIsolateWrapper> threadSafeIsolateWrapper();
 
     void setApplicationLoader(PassRefPtr<DartApplicationLoader>);
     PassRefPtr<DartApplicationLoader> applicationLoader();
 
+    bool hasApplicationLoader() { return m_applicationLoader; }
+
     Vector<uint8_t>* applicationSnapshot() { return &m_applicationSnapshot; }
 
     void setReachableWeakHandle(Dart_WeakPersistentHandle reachableWeakHandle)
     {
         m_reachableWeakHandle = reachableWeakHandle;
     }
     Dart_WeakPersistentHandle reachableWeakHandle() { return m_reachableWeakHandle; }
 
     DartDOMObjectMap* objectMap() { return &m_objectMap; }
     DartMessagePortMap* messagePortMap() { return &m_messagePortMap; }
@@ skipping 77 matching lines @@
 
     Dart_PersistentHandle currentException() const
     {
         return m_currentException;
     }
     void setCurrentException(Dart_PersistentHandle exception)
     {
         m_currentException = exception;
     }
 
-    WeakReferenceSetForRootMap* weakReferenceSetForRootMap() const
-    {
-        return m_weakReferenceSetForRootMap;
-    }
-    void setWeakReferenceSetForRootMap(WeakReferenceSetForRootMap* map)
-    {
-        m_weakReferenceSetForRootMap = map;
-    }
-
-    Dart_WeakReferenceSet documentWeakReferenceSet() const
-    {
-        return m_documentWeakReferenceSet;
-    }
-    void setDocumentWeakReferenceSet(Dart_WeakReferenceSet set)
-    {
-        m_documentWeakReferenceSet = set;
-    }
-
-    Dart_WeakReferenceSetBuilder weakReferenceSetBuilder() const
-    {
-        return m_weakReferenceSetBuilder;
-    }
-    void setWeakReferenceSetBuilder(Dart_WeakReferenceSetBuilder setBuilder)
-    {
-        m_weakReferenceSetBuilder = setBuilder;
-    }
-
 private:
     Dart_PersistentHandle getLibrary(int libraryId, const char* name);
 
     char* m_scriptURL;
     const char* m_packageRoot;
     ExecutionContext* m_scriptExecutionContext;
     bool m_isDOMEnabled;
     int m_recursion;
     DartStringCache m_stringCache;
     RefPtr<ThreadSafeDartIsolateWrapper> m_threadSafeIsolateWrapper;
     Mutex m_isolateWrapperMutex;
     RefPtr<DartApplicationLoader> m_applicationLoader;
     Vector<uint8_t> m_applicationSnapshot;
     Dart_WeakPersistentHandle m_reachableWeakHandle;
 
     DartJsInteropData m_jsInteropData;
     DartDOMObjectMap m_objectMap;
     DartMessagePortMap m_messagePortMap;
     DartIsolateDestructionObservers m_isolateDestructionObservers;
     ClassTable m_classHandleCache;
     LibraryTable m_libraryHandleCache;
     Dart_PersistentHandle m_functionType;
     Dart_PersistentHandle m_currentException;
     DartScriptState* m_rootScriptState;
-
-    WeakReferenceSetForRootMap* m_weakReferenceSetForRootMap;
-    Dart_WeakReferenceSet m_documentWeakReferenceSet;
-    Dart_WeakReferenceSetBuilder m_weakReferenceSetBuilder;
 };
 
 }
 
 #endif // DartDOMData_h