| Index: inspector/InspectorController.h
|
| ===================================================================
|
| --- inspector/InspectorController.h (revision 53180)
|
| +++ inspector/InspectorController.h (working copy)
|
| @@ -100,7 +100,6 @@
|
| typedef HashMap<RefPtr<Frame>, ResourcesMap*> FrameResourcesMap;
|
| typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
|
| typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
|
| - typedef HashMap<String, Vector<String> > ObjectGroupsMap;
|
|
|
| typedef enum {
|
| CurrentPanel,
|
| @@ -249,6 +248,8 @@
|
|
|
| void evaluateForTestInFrontend(long callId, const String& script);
|
|
|
| + ScriptObject injectedScriptForNodeId(long id);
|
| +
|
| private:
|
| static const char* const FrontendSettingsSettingName;
|
| friend class InspectorBackend;
|
| @@ -264,16 +265,6 @@
|
| InspectorDOMAgent* domAgent() { return m_domAgent.get(); }
|
| void releaseDOMAgent();
|
|
|
| - friend class InspectorFrontend;
|
| - // Following are used from InspectorFrontend only. We don't want to expose them to the
|
| - // rest of the InspectorController clients.
|
| - // TODO: extract these into a separate interface.
|
| - ScriptValue wrapObject(const ScriptValue& object, const String& objectGroup);
|
| - ScriptValue unwrapObject(const String& objectId);
|
| - void releaseWrapperObjectGroup(const String& objectGroup);
|
| -
|
| - void resetInjectedScript();
|
| -
|
| void deleteCookie(const String& cookieName, const String& domain);
|
|
|
| #if ENABLE(JAVASCRIPT_DEBUGGER)
|
| @@ -321,7 +312,6 @@
|
| OwnPtr<InspectorFrontend> m_frontend;
|
| RefPtr<InspectorDOMAgent> m_domAgent;
|
| OwnPtr<InspectorTimelineAgent> m_timelineAgent;
|
| - ScriptObject m_injectedScriptObj;
|
| Page* m_page;
|
| RefPtr<Node> m_nodeToFocus;
|
| RefPtr<InspectorResource> m_mainResource;
|
| @@ -350,9 +340,6 @@
|
| RefPtr<InspectorBackend> m_inspectorBackend;
|
| RefPtr<InspectorFrontendHost> m_inspectorFrontendHost;
|
| RefPtr<InjectedScriptHost> m_injectedScriptHost;
|
| - HashMap<String, ScriptValue> m_idToWrappedObject;
|
| - ObjectGroupsMap m_objectGroups;
|
| - long m_lastBoundObjectId;
|
|
|
| typedef HashMap<String, String> Settings;
|
| mutable Settings m_settings;
|
|
|