Diff
Modified: trunk/Source/WebCore/ChangeLog (158376 => 158377)
--- trunk/Source/WebCore/ChangeLog 2013-10-31 18:29:47 UTC (rev 158376)
+++ trunk/Source/WebCore/ChangeLog 2013-10-31 18:33:47 UTC (rev 158377)
@@ -1,3 +1,48 @@
+2013-10-31 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Remove last member variable uses of InspectorState from Agents
+ https://bugs.webkit.org/show_bug.cgi?id=123540
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ (WebCore::InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent):
+ (WebCore::InspectorDOMDebuggerAgent::setBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::removeBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded):
+ (WebCore::InspectorDOMDebuggerAgent::setXHRBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::removeXHRBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::willSendXMLHttpRequest):
+ DOMDebuggerAgentState::eventListenerBreakpoints -> m_eventListenerBreakpoints.
+ DOMDebuggerAgentState::xhrBreakpoints -> m_xhrBreakpoints.
+
+ * inspector/InspectorDebuggerAgent.h:
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
+ (WebCore::InspectorDebuggerAgent::disable):
+ (WebCore::InspectorDebuggerAgent::setBreakpointByUrl):
+ (WebCore::InspectorDebuggerAgent::removeBreakpoint):
+ (WebCore::InspectorDebuggerAgent::didParseSource):
+ DebuggerAgentState::_javascript_Breakpoints -> m_javaScriptBreakpoints.
+
+ * inspector/InspectorPageAgent.h:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::disable):
+ (WebCore::InspectorPageAgent::addScriptToEvaluateOnLoad):
+ (WebCore::InspectorPageAgent::removeScriptToEvaluateOnLoad):
+ (WebCore::InspectorPageAgent::didClearWindowObjectInWorld):
+ PageAgentState::pageAgentScriptsToEvaluateOnLoad -> m_scriptsToEvaluateOnLoad.
+ This is a lazily created InspectorObject member variable.
+
+ * inspector/InspectorResourceAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::willSendRequest):
+ (WebCore::InspectorResourceAgent::disable):
+ (WebCore::InspectorResourceAgent::setExtraHTTPHeaders):
+ ResourceAgentState::extraRequestHeaders -> m_extraRequestHeaders.
+ This is a lazily created InspectorObject member variable.
+
2013-10-31 Philippe Normand <[email protected]>
Unreviewed, one more build fix after r158365.
Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (158376 => 158377)
--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2013-10-31 18:29:47 UTC (rev 158376)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2013-10-31 18:33:47 UTC (rev 158377)
@@ -64,11 +64,6 @@
namespace WebCore {
-namespace DOMDebuggerAgentState {
-static const char eventListenerBreakpoints[] = "eventListenerBreakpoints";
-static const char xhrBreakpoints[] = "xhrBreakpoints";
-}
-
PassOwnPtr<InspectorDOMDebuggerAgent> InspectorDOMDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* inspectorState, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent* inspectorAgent)
{
return adoptPtr(new InspectorDOMDebuggerAgent(instrumentingAgents, inspectorState, domAgent, debuggerAgent, inspectorAgent));
@@ -78,6 +73,8 @@
: InspectorBaseAgent<InspectorDOMDebuggerAgent>("DOMDebugger", instrumentingAgents, inspectorState)
, m_domAgent(domAgent)
, m_debuggerAgent(debuggerAgent)
+ , m_eventListenerBreakpoints(InspectorObject::create())
+ , m_xhrBreakpoints(InspectorObject::create())
, m_pauseInNextEventListener(false)
, m_pauseOnAllXHRsEnabled(false)
{
@@ -150,9 +147,7 @@
return;
}
- RefPtr<InspectorObject> eventListenerBreakpoints = m_state->getObject(DOMDebuggerAgentState::eventListenerBreakpoints);
- eventListenerBreakpoints->setBoolean(eventName, true);
- m_state->setObject(DOMDebuggerAgentState::eventListenerBreakpoints, eventListenerBreakpoints);
+ m_eventListenerBreakpoints->setBoolean(eventName, true);
}
void InspectorDOMDebuggerAgent::removeEventListenerBreakpoint(ErrorString* error, const String& eventName)
@@ -172,9 +167,7 @@
return;
}
- RefPtr<InspectorObject> eventListenerBreakpoints = m_state->getObject(DOMDebuggerAgentState::eventListenerBreakpoints);
- eventListenerBreakpoints->remove(eventName);
- m_state->setObject(DOMDebuggerAgentState::eventListenerBreakpoints, eventListenerBreakpoints);
+ m_eventListenerBreakpoints->remove(eventName);
}
void InspectorDOMDebuggerAgent::didInvalidateStyleAttr(Node* node)
@@ -372,8 +365,7 @@
if (m_pauseInNextEventListener)
m_pauseInNextEventListener = false;
else {
- RefPtr<InspectorObject> eventListenerBreakpoints = m_state->getObject(DOMDebuggerAgentState::eventListenerBreakpoints);
- if (eventListenerBreakpoints->find(fullEventName) == eventListenerBreakpoints->end())
+ if (m_eventListenerBreakpoints->find(fullEventName) == m_eventListenerBreakpoints->end())
return;
}
@@ -392,9 +384,7 @@
return;
}
- RefPtr<InspectorObject> xhrBreakpoints = m_state->getObject(DOMDebuggerAgentState::xhrBreakpoints);
- xhrBreakpoints->setBoolean(url, true);
- m_state->setObject(DOMDebuggerAgentState::xhrBreakpoints, xhrBreakpoints);
+ m_xhrBreakpoints->setBoolean(url, true);
}
void InspectorDOMDebuggerAgent::removeXHRBreakpoint(ErrorString*, const String& url)
@@ -404,9 +394,7 @@
return;
}
- RefPtr<InspectorObject> xhrBreakpoints = m_state->getObject(DOMDebuggerAgentState::xhrBreakpoints);
- xhrBreakpoints->remove(url);
- m_state->setObject(DOMDebuggerAgentState::xhrBreakpoints, xhrBreakpoints);
+ m_xhrBreakpoints->remove(url);
}
void InspectorDOMDebuggerAgent::willSendXMLHttpRequest(const String& url)
@@ -415,8 +403,7 @@
if (m_pauseOnAllXHRsEnabled)
breakpointURL = "";
else {
- RefPtr<InspectorObject> xhrBreakpoints = m_state->getObject(DOMDebuggerAgentState::xhrBreakpoints);
- for (InspectorObject::iterator it = xhrBreakpoints->begin(); it != xhrBreakpoints->end(); ++it) {
+ for (InspectorObject::iterator it = m_xhrBreakpoints->begin(); it != m_xhrBreakpoints->end(); ++it) {
if (url.contains(it->key)) {
breakpointURL = it->key;
break;
Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (158376 => 158377)
--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2013-10-31 18:29:47 UTC (rev 158376)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2013-10-31 18:33:47 UTC (rev 158377)
@@ -106,6 +106,8 @@
InspectorDOMAgent* m_domAgent;
InspectorDebuggerAgent* m_debuggerAgent;
HashMap<Node*, uint32_t> m_domBreakpoints;
+ RefPtr<InspectorObject> m_eventListenerBreakpoints;
+ RefPtr<InspectorObject> m_xhrBreakpoints;
bool m_pauseInNextEventListener;
bool m_pauseOnAllXHRsEnabled;
};
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (158376 => 158377)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-10-31 18:29:47 UTC (rev 158376)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-10-31 18:33:47 UTC (rev 158377)
@@ -53,10 +53,6 @@
namespace WebCore {
-namespace DebuggerAgentState {
-static const char _javascript_Breakpoints[] = "_javascript_Breakopints";
-};
-
const char* InspectorDebuggerAgent::backtraceObjectGroup = "backtrace";
InspectorDebuggerAgent::InspectorDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* inspectorState, InjectedScriptManager* injectedScriptManager)
@@ -64,6 +60,8 @@
, m_injectedScriptManager(injectedScriptManager)
, m_frontend(0)
, m_pausedScriptState(0)
+ , m_javaScriptBreakpoints(InspectorObject::create())
+ , m_enabled(false)
, m_javaScriptPauseScheduled(false)
, m_listener(0)
{
@@ -92,7 +90,7 @@
void InspectorDebuggerAgent::disable()
{
- m_state->setObject(DebuggerAgentState::_javascript_Breakpoints, InspectorObject::create());
+ m_javaScriptBreakpoints = InspectorObject::create();
m_instrumentingAgents->setInspectorDebuggerAgent(0);
stopListeningScriptDebugServer();
@@ -278,8 +276,7 @@
bool isRegex = optionalURLRegex;
String breakpointId = (isRegex ? "/" + url + "/" : url) + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
- RefPtr<InspectorObject> breakpointsCookie = m_state->getObject(DebuggerAgentState::_javascript_Breakpoints);
- if (breakpointsCookie->find(breakpointId) != breakpointsCookie->end()) {
+ if (m_javaScriptBreakpoints->find(breakpointId) != m_javaScriptBreakpoints->end()) {
*errorString = "Breakpoint at specified location already exists.";
return;
}
@@ -297,8 +294,7 @@
if (!breakpointActionsFromProtocol(errorString, actions, &breakpointActions))
return;
- breakpointsCookie->setObject(breakpointId, buildObjectForBreakpointCookie(url, lineNumber, columnNumber, condition, actions, isRegex, autoContinue));
- m_state->setObject(DebuggerAgentState::_javascript_Breakpoints, breakpointsCookie);
+ m_javaScriptBreakpoints->setObject(breakpointId, buildObjectForBreakpointCookie(url, lineNumber, columnNumber, condition, actions, isRegex, autoContinue));
ScriptBreakpoint breakpoint(lineNumber, columnNumber, condition, breakpointActions, autoContinue);
for (ScriptsMap::iterator it = m_scripts.begin(); it != m_scripts.end(); ++it) {
@@ -362,9 +358,7 @@
void InspectorDebuggerAgent::removeBreakpoint(ErrorString*, const String& breakpointId)
{
- RefPtr<InspectorObject> breakpointsCookie = m_state->getObject(DebuggerAgentState::_javascript_Breakpoints);
- breakpointsCookie->remove(breakpointId);
- m_state->setObject(DebuggerAgentState::_javascript_Breakpoints, breakpointsCookie);
+ m_javaScriptBreakpoints->remove(breakpointId);
BreakpointIdToDebugServerBreakpointIdsMap::iterator debugServerBreakpointIdsIterator = m_breakpointIdToDebugServerBreakpointIds.find(breakpointId);
if (debugServerBreakpointIdsIterator == m_breakpointIdToDebugServerBreakpointIds.end())
@@ -702,8 +696,7 @@
if (scriptURL.isEmpty())
return;
- RefPtr<InspectorObject> breakpointsCookie = m_state->getObject(DebuggerAgentState::_javascript_Breakpoints);
- for (InspectorObject::iterator it = breakpointsCookie->begin(); it != breakpointsCookie->end(); ++it) {
+ for (InspectorObject::iterator it = m_javaScriptBreakpoints->begin(); it != m_javaScriptBreakpoints->end(); ++it) {
RefPtr<InspectorObject> breakpointObject = it->value->asObject();
bool isRegex;
breakpointObject->getBoolean("isRegex", &isRegex);
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h (158376 => 158377)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-10-31 18:29:47 UTC (rev 158376)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h 2013-10-31 18:33:47 UTC (rev 158377)
@@ -174,6 +174,7 @@
String m_continueToLocationBreakpointId;
InspectorFrontend::Debugger::Reason::Enum m_breakReason;
RefPtr<InspectorObject> m_breakAuxData;
+ RefPtr<InspectorObject> m_javaScriptBreakpoints;
bool m_enabled;
bool m_javaScriptPauseScheduled;
Listener* m_listener;
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (158376 => 158377)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-10-31 18:29:47 UTC (rev 158376)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-10-31 18:33:47 UTC (rev 158377)
@@ -90,10 +90,6 @@
namespace WebCore {
-namespace PageAgentState {
-static const char pageAgentScriptsToEvaluateOnLoad[] = "pageAgentScriptsToEvaluateOnLoad";
-}
-
static bool decodeBuffer(const char* buffer, unsigned size, const String& textEncodingName, String* result)
{
if (buffer) {
@@ -406,7 +402,7 @@
void InspectorPageAgent::disable(ErrorString*)
{
m_enabled = false;
- m_state->remove(PageAgentState::pageAgentScriptsToEvaluateOnLoad);
+ m_scriptsToEvaluateOnLoad.clear();
m_instrumentingAgents->setInspectorPageAgent(0);
setScriptExecutionDisabled(0, m_originalScriptExecutionDisabled);
@@ -429,27 +425,26 @@
void InspectorPageAgent::addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* identifier)
{
- RefPtr<InspectorObject> scripts = m_state->getObject(PageAgentState::pageAgentScriptsToEvaluateOnLoad);
- if (!scripts) {
- scripts = InspectorObject::create();
- m_state->setObject(PageAgentState::pageAgentScriptsToEvaluateOnLoad, scripts);
- }
+ if (!m_scriptsToEvaluateOnLoad)
+ m_scriptsToEvaluateOnLoad = InspectorObject::create();
+
// Assure we don't override existing ids -- m_lastScriptIdentifier could get out of sync WRT actual
// scripts once we restored the scripts from the cookie during navigation.
do {
*identifier = String::number(++m_lastScriptIdentifier);
- } while (scripts->find(*identifier) != scripts->end());
- scripts->setString(*identifier, source);
+ } while (m_scriptsToEvaluateOnLoad->find(*identifier) != m_scriptsToEvaluateOnLoad->end());
+
+ m_scriptsToEvaluateOnLoad->setString(*identifier, source);
}
void InspectorPageAgent::removeScriptToEvaluateOnLoad(ErrorString* error, const String& identifier)
{
- RefPtr<InspectorObject> scripts = m_state->getObject(PageAgentState::pageAgentScriptsToEvaluateOnLoad);
- if (!scripts || scripts->find(identifier) == scripts->end()) {
+ if (!m_scriptsToEvaluateOnLoad || m_scriptsToEvaluateOnLoad->find(identifier) == m_scriptsToEvaluateOnLoad->end()) {
*error = "Script not found";
return;
}
- scripts->remove(identifier);
+
+ m_scriptsToEvaluateOnLoad->remove(identifier);
}
void InspectorPageAgent::reload(ErrorString*, const bool* const optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad, const String* optionalScriptPreprocessor)
@@ -828,15 +823,15 @@
if (!m_frontend)
return;
- RefPtr<InspectorObject> scripts = m_state->getObject(PageAgentState::pageAgentScriptsToEvaluateOnLoad);
- if (scripts) {
- InspectorObject::const_iterator end = scripts->end();
- for (InspectorObject::const_iterator it = scripts->begin(); it != end; ++it) {
+ if (m_scriptsToEvaluateOnLoad) {
+ InspectorObject::const_iterator end = m_scriptsToEvaluateOnLoad->end();
+ for (InspectorObject::const_iterator it = m_scriptsToEvaluateOnLoad->begin(); it != end; ++it) {
String scriptText;
if (it->value->asString(&scriptText))
frame->script().executeScript(scriptText);
}
}
+
if (!m_scriptToEvaluateOnLoadOnce.isEmpty())
frame->script().executeScript(m_scriptToEvaluateOnLoadOnce);
}
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (158376 => 158377)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2013-10-31 18:29:47 UTC (rev 158376)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2013-10-31 18:33:47 UTC (rev 158377)
@@ -219,6 +219,7 @@
bool m_ignoreScriptsEnabledNotification;
bool m_showPaintRects;
String m_emulatedMedia;
+ RefPtr<InspectorObject> m_scriptsToEvaluateOnLoad;
RefPtr<GeolocationPosition> m_geolocationPosition;
RefPtr<GeolocationPosition> m_platformGeolocationPosition;
RefPtr<DeviceOrientationData> m_deviceOrientation;
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (158376 => 158377)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2013-10-31 18:29:47 UTC (rev 158376)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2013-10-31 18:33:47 UTC (rev 158377)
@@ -77,10 +77,6 @@
namespace WebCore {
-namespace ResourceAgentState {
-static const char extraRequestHeaders[] = "extraRequestHeaders";
-}
-
void InspectorResourceAgent::setFrontend(InspectorFrontend* frontend)
{
m_frontend = frontend->network();
@@ -200,9 +196,9 @@
m_resourcesData->setResourceType(requestId, type);
- if (RefPtr<InspectorObject> headers = m_state->getObject(ResourceAgentState::extraRequestHeaders)) {
- InspectorObject::const_iterator end = headers->end();
- for (InspectorObject::const_iterator it = headers->begin(); it != end; ++it) {
+ if (m_extraRequestHeaders) {
+ InspectorObject::const_iterator end = m_extraRequestHeaders->end();
+ for (InspectorObject::const_iterator it = m_extraRequestHeaders->begin(); it != end; ++it) {
String value;
if (it->value->asString(&value))
request.setHTTPHeaderField(it->key, value);
@@ -546,6 +542,7 @@
m_userAgentOverride = String();
m_instrumentingAgents->setInspectorResourceAgent(0);
m_resourcesData->clear();
+ m_extraRequestHeaders.clear();
}
void InspectorResourceAgent::setUserAgentOverride(ErrorString*, const String& userAgent)
@@ -555,7 +552,7 @@
void InspectorResourceAgent::setExtraHTTPHeaders(ErrorString*, const RefPtr<InspectorObject>& headers)
{
- m_state->setObject(ResourceAgentState::extraRequestHeaders, headers);
+ m_extraRequestHeaders = headers;
}
void InspectorResourceAgent::getResponseBody(ErrorString* errorString, const String& requestId, String* content, bool* base64Encoded)
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (158376 => 158377)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2013-10-31 18:29:47 UTC (rev 158376)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2013-10-31 18:33:47 UTC (rev 158377)
@@ -163,6 +163,7 @@
bool m_enabled;
bool m_cacheDisabled;
bool m_loadingXHRSynchronously;
+ RefPtr<InspectorObject> m_extraRequestHeaders;
typedef HashMap<ThreadableLoaderClient*, RefPtr<XHRReplayData>> PendingXHRReplayDataMap;
PendingXHRReplayDataMap m_pendingXHRReplayData;
