Unreviewed, rolling out r138436.
http://trac.webkit.org/changeset/138436
https://bugs.webkit.org/show_bug.cgi?id=105723
Asserts on state restoration in debug builds (Requested by
apavlov on #webkit).
Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-12-24
* inspector/InspectorAgent.cpp:
(InspectorAgentState):
(WebCore::InspectorAgent::enable):
(WebCore::InspectorAgent::disable):
(WebCore::InspectorAgent::evaluateForTestInFrontend):
(WebCore::InspectorAgent::inspect):
* inspector/InspectorApplicationCacheAgent.cpp:
(ApplicationCacheAgentState):
(WebCore::InspectorApplicationCacheAgent::restore):
(WebCore::InspectorApplicationCacheAgent::enable):
* inspector/InspectorCSSAgent.cpp:
(CSSAgentState):
(WebCore::InspectorCSSAgent::restore):
(WebCore::InspectorCSSAgent::enable):
(WebCore::InspectorCSSAgent::disable):
* inspector/InspectorCanvasAgent.cpp:
(CanvasAgentState):
(WebCore::InspectorCanvasAgent::restore):
(WebCore::InspectorCanvasAgent::enable):
(WebCore::InspectorCanvasAgent::disable):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorController.h:
(WebCore):
(InspectorController):
* inspector/InspectorDOMStorageAgent.cpp:
(DOMStorageAgentState):
(WebCore::InspectorDOMStorageAgent::restore):
(WebCore::InspectorDOMStorageAgent::enable):
(WebCore::InspectorDOMStorageAgent::disable):
* inspector/InspectorDatabaseAgent.cpp:
(DatabaseAgentState):
(WebCore):
(WebCore::InspectorDatabaseAgent::enable):
(WebCore::InspectorDatabaseAgent::disable):
(WebCore::InspectorDatabaseAgent::restore):
* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::disable):
* inspector/InspectorFileSystemAgent.cpp:
(FileSystemAgentState):
(WebCore):
(WebCore::InspectorFileSystemAgent::enable):
(WebCore::InspectorFileSystemAgent::disable):
(WebCore::InspectorFileSystemAgent::clearFrontend):
(WebCore::InspectorFileSystemAgent::restore):
* inspector/InspectorIndexedDBAgent.cpp:
(IndexedDBAgentState):
(WebCore):
(WebCore::InspectorIndexedDBAgent::restore):
(WebCore::InspectorIndexedDBAgent::enable):
(WebCore::InspectorIndexedDBAgent::disable):
* inspector/InspectorLayerTreeAgent.cpp:
(LayerTreeAgentState):
(WebCore::InspectorLayerTreeAgent::restore):
(WebCore::InspectorLayerTreeAgent::enable):
(WebCore::InspectorLayerTreeAgent::disable):
* inspector/InspectorPageAgent.cpp:
(PageAgentState):
(WebCore::InspectorPageAgent::restore):
(WebCore::InspectorPageAgent::webViewResized):
(WebCore::InspectorPageAgent::enable):
(WebCore::InspectorPageAgent::disable):
(WebCore::InspectorPageAgent::addScriptToEvaluateOnLoad):
(WebCore::InspectorPageAgent::removeScriptToEvaluateOnLoad):
(WebCore::InspectorPageAgent::setDeviceMetricsOverride):
(WebCore::InspectorPageAgent::setShowPaintRects):
(WebCore::InspectorPageAgent::setShowFPSCounter):
(WebCore::InspectorPageAgent::setScriptExecutionDisabled):
(WebCore::InspectorPageAgent::didClearWindowObjectInWorld):
(WebCore::InspectorPageAgent::applyScreenWidthOverride):
(WebCore::InspectorPageAgent::applyScreenHeightOverride):
(WebCore::InspectorPageAgent::didPaint):
(WebCore::InspectorPageAgent::didLayout):
(WebCore::InspectorPageAgent::setEmulatedMedia):
(WebCore::InspectorPageAgent::applyEmulatedMedia):
* inspector/InspectorResourceAgent.cpp:
(ResourceAgentState):
(WebCore::InspectorResourceAgent::restore):
(WebCore::InspectorResourceAgent::~InspectorResourceAgent):
(WebCore::InspectorResourceAgent::enable):
(WebCore::InspectorResourceAgent::disable):
* inspector/InspectorState.cpp:
(WebCore::InspectorState::InspectorState):
(WebCore::InspectorState::loadFromCookie):
(WebCore):
(WebCore::InspectorState::mute):
(WebCore::InspectorState::unmute):
(WebCore::InspectorState::updateCookie):
(WebCore::InspectorState::remove):
* inspector/InspectorState.h:
(WebCore):
(InspectorState):
(WebCore::InspectorState::setLong):
* inspector/InspectorTimelineAgent.cpp:
(TimelineAgentState):
(WebCore::InspectorTimelineAgent::restore):
(WebCore::InspectorTimelineAgent::start):
(WebCore::InspectorTimelineAgent::stop):
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
* inspector/WorkerInspectorController.h:
(WebCore):
(WorkerInspectorController):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/inspector/InspectorCSSAgent.cpp b/Source/WebCore/inspector/InspectorCSSAgent.cpp
index 6264091..d525e6d 100644
--- a/Source/WebCore/inspector/InspectorCSSAgent.cpp
+++ b/Source/WebCore/inspector/InspectorCSSAgent.cpp
@@ -63,7 +63,7 @@
#include <wtf/text/StringConcatenate.h>
namespace CSSAgentState {
-static const char enabled[] = "enabled";
+static const char cssAgentEnabled[] = "cssAgentEnabled";
static const char isSelectorProfiling[] = "isSelectorProfiling";
}
@@ -561,7 +561,7 @@
void InspectorCSSAgent::restore()
{
- if (m_state->getBoolean(CSSAgentState::enabled)) {
+ if (m_state->getBoolean(CSSAgentState::cssAgentEnabled)) {
ErrorString error;
enable(&error);
}
@@ -590,14 +590,14 @@
void InspectorCSSAgent::enable(ErrorString*)
{
- m_state->setBoolean(CSSAgentState::enabled, true);
+ m_state->setBoolean(CSSAgentState::cssAgentEnabled, true);
m_instrumentingAgents->setInspectorCSSAgent(this);
}
void InspectorCSSAgent::disable(ErrorString*)
{
m_instrumentingAgents->setInspectorCSSAgent(0);
- m_state->setBoolean(CSSAgentState::enabled, false);
+ m_state->setBoolean(CSSAgentState::cssAgentEnabled, false);
}
void InspectorCSSAgent::mediaQueryResultChanged()
