Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Side by Side Diff: Source/WebCore/inspector/InspectorAgent.h

Issue 11366107: Merge 133052 - Web Inspector: frame chooser does not work on subsequent inspector open. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/WebCore/inspector/InspectorAgent.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 InspectorFrontend* frontend() const { return m_frontend; } 73 InspectorFrontend* frontend() const { return m_frontend; }
74 74
75 virtual void setFrontend(InspectorFrontend*); 75 virtual void setFrontend(InspectorFrontend*);
76 virtual void clearFrontend(); 76 virtual void clearFrontend();
77 77
78 void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld*); 78 void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld*);
79 79
80 void didCommitLoad(); 80 void didCommitLoad();
81 void domContentLoadedEventFired(); 81 void domContentLoadedEventFired();
82 bool didCommitLoadFired() { return m_didCommitLoadFired; }
83 82
84 bool hasFrontend() const { return m_frontend; } 83 bool hasFrontend() const { return m_frontend; }
85 84
86 // Generic code called from custom implementations. 85 // Generic code called from custom implementations.
87 void evaluateForTestInFrontend(long testCallId, const String& script); 86 void evaluateForTestInFrontend(long testCallId, const String& script);
88 87
89 void setInjectedScriptForOrigin(const String& origin, const String& source); 88 void setInjectedScriptForOrigin(const String& origin, const String& source);
90 89
91 void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints); 90 void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
92 91
93 private: 92 private:
94 InspectorAgent(Page*, InjectedScriptManager*, InstrumentingAgents*, Inspecto rState*); 93 InspectorAgent(Page*, InjectedScriptManager*, InstrumentingAgents*, Inspecto rState*);
95 94
96 void unbindAllResources(); 95 void unbindAllResources();
97 96
98 #if ENABLE(JAVASCRIPT_DEBUGGER) 97 #if ENABLE(JAVASCRIPT_DEBUGGER)
99 void toggleRecordButton(bool); 98 void toggleRecordButton(bool);
100 #endif 99 #endif
101 100
102 bool isMainResourceLoader(DocumentLoader*, const KURL& requestUrl); 101 bool isMainResourceLoader(DocumentLoader*, const KURL& requestUrl);
103 102
104 Page* m_inspectedPage; 103 Page* m_inspectedPage;
105 InspectorFrontend* m_frontend; 104 InspectorFrontend* m_frontend;
106 InjectedScriptManager* m_injectedScriptManager; 105 InjectedScriptManager* m_injectedScriptManager;
107 106
108 Vector<pair<long, String> > m_pendingEvaluateTestCommands; 107 Vector<pair<long, String> > m_pendingEvaluateTestCommands;
109 pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<InspectorObject> > m _pendingInspectData; 108 pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<InspectorObject> > m _pendingInspectData;
110 typedef HashMap<String, String> InjectedScriptForOriginMap; 109 typedef HashMap<String, String> InjectedScriptForOriginMap;
111 InjectedScriptForOriginMap m_injectedScriptForOrigin; 110 InjectedScriptForOriginMap m_injectedScriptForOrigin;
112 bool m_didCommitLoadFired;
113 }; 111 };
114 112
115 } // namespace WebCore 113 } // namespace WebCore
116 114
117 #endif // !defined(InspectorAgent_h) 115 #endif // !defined(InspectorAgent_h)
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/InspectorAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698