Oilpan: Prepare moving InspectorAgent related classes to oilpan

Source/core/inspector/InspectorState.h

 /*
  * Copyright (C) 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef InspectorState_h
 #define InspectorState_h
 
 
 #include "platform/JSONValues.h"
+#include "platform/heap/Handle.h"
 #include "wtf/HashMap.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class InspectorStateClient;
 
-class InspectorStateUpdateListener {
+class InspectorStateUpdateListener : public WillBeGarbageCollectedMixin {
 public:
     virtual ~InspectorStateUpdateListener() { }
     virtual void inspectorStateUpdated() = 0;
 };
 
-class InspectorState FINAL {
-    WTF_MAKE_FAST_ALLOCATED;
+class InspectorState FINAL : public NoBaseWillBeGarbageCollectedFinalized<InspectorState> {
+    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     InspectorState(InspectorStateUpdateListener*, PassRefPtr<JSONObject>);
 
     void loadFromCookie(const String& inspectorStateCookie);
 
     void mute();
     void unmute();
 
     bool getBoolean(const String& propertyName);
     String getString(const String& propertyName);
     long getLong(const String& propertyName);
     long getLong(const String& propertyName, long defaultValue);
     double getDouble(const String& propertyName);
     double getDouble(const String& propertyName, double defaultValue);
     PassRefPtr<JSONObject> getObject(const String& propertyName);
 
     void setBoolean(const String& propertyName, bool value) { setValue(propertyName, JSONBasicValue::create(value)); }
     void setString(const String& propertyName, const String& value) { setValue(propertyName, JSONString::create(value)); }
     void setLong(const String& propertyName, long value) { setValue(propertyName, JSONBasicValue::create((double)value)); }
     void setDouble(const String& propertyName, double value) { setValue(propertyName, JSONBasicValue::create(value)); }
     void setObject(const String& propertyName, PassRefPtr<JSONObject> value) { setValue(propertyName, value); }
 
     void remove(const String&);
+
+    void trace(Visitor*);
+
 private:
     void updateCookie();
     void setValue(const String& propertyName, PassRefPtr<JSONValue>);
 
     // Gets called from InspectorCompositeState::loadFromCookie().
     void setFromCookie(PassRefPtr<JSONObject>);
 
     friend class InspectorCompositeState;
 
-    InspectorStateUpdateListener* m_listener;
+    RawPtrWillBeMember<InspectorStateUpdateListener> m_listener;
     RefPtr<JSONObject> m_properties;
 };
 
-class InspectorCompositeState FINAL : public InspectorStateUpdateListener {
+class InspectorCompositeState FINAL : public NoBaseWillBeGarbageCollectedFinalized<InspectorCompositeState>, public InspectorStateUpdateListener {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InspectorCompositeState);
 public:
     InspectorCompositeState(InspectorStateClient* inspectorClient)
         : m_client(inspectorClient)
         , m_stateObject(JSONObject::create())
         , m_isMuted(false)
     {
     }
     virtual ~InspectorCompositeState() { }
+    void trace(Visitor*);
 
     void mute();
     void unmute();
 
     InspectorState* createAgentState(const String&);
     void loadFromCookie(const String&);
 
 private:
-    typedef HashMap<String, OwnPtr<InspectorState> > InspectorStateMap;
+    typedef WillBeHeapHashMap<String, OwnPtrWillBeMember<InspectorState> > InspectorStateMap;
 
     // From InspectorStateUpdateListener.
     virtual void inspectorStateUpdated() OVERRIDE;
 
     InspectorStateClient* m_client;
     RefPtr<JSONObject> m_stateObject;
     bool m_isMuted;
     InspectorStateMap m_inspectorStateMap;
 };
 
 } // namespace WebCore
 
 #endif // !defined(InspectorState_h)