Title: [158320] trunk/Source/WebCore
Revision
158320
Author
commit-qu...@webkit.org
Date
2013-10-30 15:17:27 -0700 (Wed, 30 Oct 2013)

Log Message

Web Inspector: Remove InspectorAgent::restore functionality
https://bugs.webkit.org/show_bug.cgi?id=123525

Patch by Joseph Pecoraro <pecor...@apple.com> on 2013-10-30
Reviewed by Timothy Hatcher.

Remove unused InspectorAgent restore functionality.

* inspector/InspectorApplicationCacheAgent.cpp:
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorBaseAgent.cpp:
* inspector/InspectorBaseAgent.h:
* inspector/InspectorCSSAgent.cpp:
* inspector/InspectorCSSAgent.h:
* inspector/InspectorCanvasAgent.cpp:
* inspector/InspectorCanvasAgent.h:
* inspector/InspectorConsoleAgent.cpp:
* inspector/InspectorConsoleAgent.h:
* inspector/InspectorController.cpp:
* inspector/InspectorController.h:
* inspector/InspectorDOMAgent.cpp:
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDatabaseAgent.cpp:
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorDebuggerAgent.cpp:
* inspector/InspectorDebuggerAgent.h:
* inspector/InspectorHeapProfilerAgent.cpp:
* inspector/InspectorHeapProfilerAgent.h:
* inspector/InspectorIndexedDBAgent.cpp:
* inspector/InspectorIndexedDBAgent.h:
* inspector/InspectorLayerTreeAgent.cpp:
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorPageAgent.cpp:
* inspector/InspectorPageAgent.h:
* inspector/InspectorProfilerAgent.cpp:
* inspector/InspectorProfilerAgent.h:
* inspector/InspectorResourceAgent.cpp:
* inspector/InspectorResourceAgent.h:
* inspector/InspectorTimelineAgent.cpp:
* inspector/InspectorTimelineAgent.h:
* inspector/InspectorWorkerAgent.cpp:
* inspector/InspectorWorkerAgent.h:
* inspector/PageRuntimeAgent.cpp:
* inspector/PageRuntimeAgent.h:
* inspector/WorkerInspectorController.cpp:
* inspector/WorkerInspectorController.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (158319 => 158320)


--- trunk/Source/WebCore/ChangeLog	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/ChangeLog	2013-10-30 22:17:27 UTC (rev 158320)
@@ -1,3 +1,51 @@
+2013-10-30  Joseph Pecoraro  <pecor...@apple.com>
+
+        Web Inspector: Remove InspectorAgent::restore functionality
+        https://bugs.webkit.org/show_bug.cgi?id=123525
+
+        Reviewed by Timothy Hatcher.
+
+        Remove unused InspectorAgent restore functionality.
+
+        * inspector/InspectorApplicationCacheAgent.cpp:
+        * inspector/InspectorApplicationCacheAgent.h:
+        * inspector/InspectorBaseAgent.cpp:
+        * inspector/InspectorBaseAgent.h:
+        * inspector/InspectorCSSAgent.cpp:
+        * inspector/InspectorCSSAgent.h:
+        * inspector/InspectorCanvasAgent.cpp:
+        * inspector/InspectorCanvasAgent.h:
+        * inspector/InspectorConsoleAgent.cpp:
+        * inspector/InspectorConsoleAgent.h:
+        * inspector/InspectorController.cpp:
+        * inspector/InspectorController.h:
+        * inspector/InspectorDOMAgent.cpp:
+        * inspector/InspectorDOMAgent.h:
+        * inspector/InspectorDatabaseAgent.cpp:
+        * inspector/InspectorDatabaseAgent.h:
+        * inspector/InspectorDebuggerAgent.cpp:
+        * inspector/InspectorDebuggerAgent.h:
+        * inspector/InspectorHeapProfilerAgent.cpp:
+        * inspector/InspectorHeapProfilerAgent.h:
+        * inspector/InspectorIndexedDBAgent.cpp:
+        * inspector/InspectorIndexedDBAgent.h:
+        * inspector/InspectorLayerTreeAgent.cpp:
+        * inspector/InspectorLayerTreeAgent.h:
+        * inspector/InspectorPageAgent.cpp:
+        * inspector/InspectorPageAgent.h:
+        * inspector/InspectorProfilerAgent.cpp:
+        * inspector/InspectorProfilerAgent.h:
+        * inspector/InspectorResourceAgent.cpp:
+        * inspector/InspectorResourceAgent.h:
+        * inspector/InspectorTimelineAgent.cpp:
+        * inspector/InspectorTimelineAgent.h:
+        * inspector/InspectorWorkerAgent.cpp:
+        * inspector/InspectorWorkerAgent.h:
+        * inspector/PageRuntimeAgent.cpp:
+        * inspector/PageRuntimeAgent.h:
+        * inspector/WorkerInspectorController.cpp:
+        * inspector/WorkerInspectorController.h:
+
 2013-10-30  Jer Noble  <jer.no...@apple.com>
 
         REGRESSION(r158288): media/media-can-play-mpeg4-video.html fails

Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -67,14 +67,6 @@
     m_frontend = 0;
 }
 
-void InspectorApplicationCacheAgent::restore()
-{
-    if (m_state->getBoolean(ApplicationCacheAgentState::applicationCacheAgentEnabled)) {
-        ErrorString error;
-        enable(&error);
-    }
-}
-
 void InspectorApplicationCacheAgent::enable(ErrorString*)
 {
     m_state->setBoolean(ApplicationCacheAgentState::applicationCacheAgentEnabled, true);

Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -61,7 +61,6 @@
     // InspectorBaseAgent
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     // InspectorInstrumentation API
     void updateApplicationCacheStatus(Frame*);

Modified: trunk/Source/WebCore/inspector/InspectorBaseAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorBaseAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorBaseAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -66,12 +66,6 @@
         m_agents[i]->clearFrontend();
 }
 
-void InspectorAgentRegistry::restore()
-{
-    for (size_t i = 0; i < m_agents.size(); i++)
-        m_agents[i]->restore();
-}
-
 void InspectorAgentRegistry::registerInDispatcher(InspectorBackendDispatcher* dispatcher)
 {
     for (size_t i = 0; i < m_agents.size(); i++)

Modified: trunk/Source/WebCore/inspector/InspectorBaseAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorBaseAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorBaseAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -51,7 +51,6 @@
 
     virtual void setFrontend(InspectorFrontend*) { }
     virtual void clearFrontend() { }
-    virtual void restore() { }
     virtual void registerInDispatcher(InspectorBackendDispatcher*) = 0;
     virtual void discardAgent() { }
 
@@ -71,7 +70,6 @@
 
     void setFrontend(InspectorFrontend*);
     void clearFrontend();
-    void restore();
     void registerInDispatcher(InspectorBackendDispatcher*);
     void discardAgents();
 

Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -657,18 +657,6 @@
     m_domAgent = 0;
 }
 
-void InspectorCSSAgent::restore()
-{
-    if (m_state->getBoolean(CSSAgentState::cssAgentEnabled)) {
-        ErrorString error;
-        enable(&error);
-    }
-    if (m_state->getBoolean(CSSAgentState::isSelectorProfiling)) {
-        String errorString;
-        startSelectorProfiler(&errorString);
-    }
-}
-
 void InspectorCSSAgent::reset()
 {
     m_idToInspectorStyleSheet.clear();

Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -99,7 +99,6 @@
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void discardAgent();
-    virtual void restore();
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
     void reset();

Modified: trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -91,14 +91,6 @@
     disable(0);
 }
 
-void InspectorCanvasAgent::restore()
-{
-    if (m_state->getBoolean(CanvasAgentState::canvasAgentEnabled)) {
-        ErrorString error;
-        enable(&error);
-    }
-}
-
 void InspectorCanvasAgent::enable(ErrorString*)
 {
     if (m_enabled)

Modified: trunk/Source/WebCore/inspector/InspectorCanvasAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorCanvasAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorCanvasAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -64,7 +64,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     void frameNavigated(Frame*);
     void frameDetached(Frame*);

Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -131,15 +131,6 @@
     m_counts.clear();
 }
 
-void InspectorConsoleAgent::restore()
-{
-    if (m_state->getBoolean(ConsoleAgentState::consoleMessagesEnabled)) {
-        m_frontend->messagesCleared();
-        ErrorString error;
-        enable(&error);
-    }
-}
-
 void InspectorConsoleAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_frontend = frontend->console();

Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -68,7 +68,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<ScriptArguments>, unsigned long requestIdentifier = 0);
     void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);

Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorController.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -284,14 +284,6 @@
     m_inspectorClient->closeInspectorFrontend();
 }
 
-void InspectorController::reconnectFrontend(InspectorFrontendChannel* frontendChannel, const String& inspectorStateCookie)
-{
-    ASSERT(!m_inspectorFrontend);
-    connectFrontend(frontendChannel);
-    m_state->loadFromCookie(inspectorStateCookie);
-    m_agents.restore();
-}
-
 void InspectorController::setProcessId(long processId)
 {
     IdentifiersFactory::setProcessId(processId);

Modified: trunk/Source/WebCore/inspector/InspectorController.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorController.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorController.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -96,7 +96,6 @@
     bool hasFrontend() const { return m_inspectorFrontend; }
     void connectFrontend(InspectorFrontendChannel*);
     void disconnectFrontend();
-    void reconnectFrontend(InspectorFrontendChannel*, const String& inspectorStateCookie);
     void setProcessId(long);
     void webViewResized(const IntSize&);
 

Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -267,13 +267,6 @@
     reset();
 }
 
-void InspectorDOMAgent::restore()
-{
-    // Reset document to avoid early return from setDocument.
-    m_document = 0;
-    setDocument(m_pageAgent->mainFrame()->document());
-}
-
 Vector<Document*> InspectorDOMAgent::documents()
 {
     Vector<Document*> result;

Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -115,7 +115,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     Vector<Document*> documents();
     void reset();

Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -257,11 +257,6 @@
     m_state->setBoolean(DatabaseAgentState::databaseAgentEnabled, m_enabled);
 }
 
-void InspectorDatabaseAgent::restore()
-{
-    m_enabled = m_state->getBoolean(DatabaseAgentState::databaseAgentEnabled);
-}
-
 void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, const String& databaseId, RefPtr<TypeBuilder::Array<String>>& names)
 {
     if (!m_enabled) {

Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -58,7 +58,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     void clearResources();
 

Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -147,17 +147,6 @@
     m_state->setBoolean(DebuggerAgentState::debuggerEnabled, false);
 }
 
-void InspectorDebuggerAgent::restore()
-{
-    if (enabled()) {
-        m_frontend->globalObjectCleared();
-        enable();
-        long pauseState = m_state->getLong(DebuggerAgentState::pauseOnExceptionsState);
-        String error;
-        setPauseOnExceptionsImpl(&error, pauseState);
-    }
-}
-
 void InspectorDebuggerAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_frontend = frontend->debugger();

Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -73,7 +73,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     bool isPaused();
     bool runningNestedMessageLoop();

Modified: trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -96,11 +96,6 @@
     m_frontend = 0;
 }
 
-void InspectorHeapProfilerAgent::restore()
-{
-    resetFrontendProfiles();
-}
-
 void InspectorHeapProfilerAgent::collectGarbage(WebCore::ErrorString*)
 {
     ScriptProfiler::collectGarbage();

Modified: trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -67,7 +67,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     virtual void takeHeapSnapshot(ErrorString*, const bool* reportProgress);
 

Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -577,14 +577,6 @@
     disable(0);
 }
 
-void InspectorIndexedDBAgent::restore()
-{
-    if (m_state->getBoolean(IndexedDBAgentState::indexedDBAgentEnabled)) {
-        ErrorString error;
-        enable(&error);
-    }
-}
-
 void InspectorIndexedDBAgent::enable(ErrorString*)
 {
     m_state->setBoolean(IndexedDBAgentState::indexedDBAgentEnabled, true);

Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -53,7 +53,6 @@
     ~InspectorIndexedDBAgent();
 
     virtual void clearFrontend();
-    virtual void restore();
 
     // Called from the front-end.
     virtual void enable(ErrorString*);

Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -75,12 +75,6 @@
     disable(0);
 }
 
-void InspectorLayerTreeAgent::restore()
-{
-    if (m_state->getBoolean(LayerTreeAgentState::layerTreeAgentEnabled))
-        enable(0);
-}
-
 void InspectorLayerTreeAgent::reset()
 {
     m_documentLayerToIdMap.clear();

Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -57,7 +57,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
     void reset();
 
     void layerTreeDidChange();

Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -398,35 +398,6 @@
     m_frontend = 0;
 }
 
-void InspectorPageAgent::restore()
-{
-    if (m_state->getBoolean(PageAgentState::pageAgentEnabled)) {
-        ErrorString error;
-        enable(&error);
-        bool scriptExecutionDisabled = m_state->getBoolean(PageAgentState::pageAgentScriptExecutionDisabled);
-        setScriptExecutionDisabled(0, scriptExecutionDisabled);
-        bool showPaintRects = m_state->getBoolean(PageAgentState::pageAgentShowPaintRects);
-        setShowPaintRects(0, showPaintRects);
-        bool showDebugBorders = m_state->getBoolean(PageAgentState::pageAgentShowDebugBorders);
-        setShowDebugBorders(0, showDebugBorders);
-        bool showFPSCounter = m_state->getBoolean(PageAgentState::pageAgentShowFPSCounter);
-        setShowFPSCounter(0, showFPSCounter);
-        String emulatedMedia = m_state->getString(PageAgentState::pageAgentEmulatedMedia);
-        setEmulatedMedia(0, emulatedMedia);
-        bool continuousPaintingEnabled = m_state->getBoolean(PageAgentState::pageAgentContinuousPaintingEnabled);
-        setContinuousPaintingEnabled(0, continuousPaintingEnabled);
-
-        int currentWidth = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenWidthOverride));
-        int currentHeight = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenHeightOverride));
-        double currentFontScaleFactor = m_state->getDouble(PageAgentState::pageAgentFontScaleFactorOverride);
-        bool currentFitWindow = m_state->getBoolean(PageAgentState::pageAgentFitWindow);
-        updateViewMetrics(currentWidth, currentHeight, currentFontScaleFactor, currentFitWindow);
-#if ENABLE(TOUCH_EVENTS)
-        updateTouchEventEmulationInPage(m_state->getBoolean(PageAgentState::touchEventEmulationEnabled));
-#endif
-    }
-}
-
 void InspectorPageAgent::webViewResized(const IntSize& size)
 {
     int currentWidth = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenWidthOverride));

Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorPageAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -165,7 +165,6 @@
     // Inspector Controller API
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     void webViewResized(const IntSize&);
 

Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -351,23 +351,6 @@
     disable(&error);
 }
 
-void InspectorProfilerAgent::restore()
-{
-    // Need to restore enablement state here as in setFrontend m_state wasn't loaded yet.
-    restoreEnablement();
-    resetFrontendProfiles();
-    if (m_state->getBoolean(ProfilerAgentState::userInitiatedProfiling))
-        start();
-}
-
-void InspectorProfilerAgent::restoreEnablement()
-{
-    if (m_state->getBoolean(ProfilerAgentState::profilerEnabled)) {
-        ErrorString error;
-        enable(&error);
-    }
-}
-
 void InspectorProfilerAgent::start(ErrorString*)
 {
     if (m_recordingCPUProfile)

Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -93,7 +93,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     virtual void takeHeapSnapshot(ErrorString*, const bool* reportProgress);
     void toggleRecordButton(bool isProfiling);

Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -96,12 +96,6 @@
     disable(&error);
 }
 
-void InspectorResourceAgent::restore()
-{
-    if (m_state->getBoolean(ResourceAgentState::resourceAgentEnabled))
-        enable();
-}
-
 static PassRefPtr<InspectorObject> buildObjectForHeaders(const HTTPHeaderMap& headers)
 {
     RefPtr<InspectorObject> headersObject = InspectorObject::create();

Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -87,7 +87,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     static PassRefPtr<InspectorResourceAgent> restore(Page*, InspectorCompositeState*, InspectorFrontend*);
 

Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -86,17 +86,6 @@
     m_frontend = 0;
 }
 
-void InspectorTimelineAgent::restore()
-{
-    if (m_state->getBoolean(TimelineAgentState::timelineAgentEnabled)) {
-        m_maxCallStackDepth = m_state->getLong(TimelineAgentState::timelineMaxCallStackDepth);
-        ErrorString error;
-        bool includeDomCounters = m_state->getBoolean(TimelineAgentState::includeDomCounters);
-        bool includeNativeMemoryStatistics = m_state->getBoolean(TimelineAgentState::includeNativeMemoryStatistics);
-        start(&error, &m_maxCallStackDepth, &includeDomCounters, &includeNativeMemoryStatistics);
-    }
-}
-
 void InspectorTimelineAgent::start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters, const bool* includeNativeMemoryStatistics)
 {
     if (!m_frontend)

Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -138,7 +138,6 @@
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
 
     virtual void start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters, const bool* includeNativeMemoryStatistics);
     virtual void stop(ErrorString*);

Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -129,12 +129,6 @@
     m_inspectorFrontend = frontend;
 }
 
-void InspectorWorkerAgent::restore()
-{
-    if (m_state->getBoolean(WorkerAgentState::workerInspectionEnabled))
-        createWorkerFrontendChannelsForExistingWorkers();
-}
-
 void InspectorWorkerAgent::clearFrontend()
 {
     m_state->setBoolean(WorkerAgentState::autoconnectToWorkers, false);

Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -53,7 +53,6 @@
     ~InspectorWorkerAgent();
 
     virtual void setFrontend(InspectorFrontend*);
-    virtual void restore();
     virtual void clearFrontend();
 
     // Called from InspectorInstrumentation

Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -81,14 +81,6 @@
     disable(&errorString);
 }
 
-void PageRuntimeAgent::restore()
-{
-    if (m_state->getBoolean(PageRuntimeAgentState::runtimeEnabled)) {
-        String error;
-        enable(&error);
-    }
-}
-
 void PageRuntimeAgent::enable(ErrorString* errorString)
 {
     if (m_enabled)

Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/PageRuntimeAgent.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -53,7 +53,6 @@
     virtual ~PageRuntimeAgent();
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
-    virtual void restore();
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
 

Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (158319 => 158320)


--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp	2013-10-30 22:17:27 UTC (rev 158320)
@@ -160,15 +160,6 @@
     m_frontendChannel.clear();
 }
 
-void WorkerInspectorController::restoreInspectorStateFromCookie(const String& inspectorCookie)
-{
-    ASSERT(!m_frontend);
-    connectFrontend();
-    m_state->loadFromCookie(inspectorCookie);
-
-    m_agents.restore();
-}
-
 void WorkerInspectorController::dispatchMessageFromFrontend(const String& message)
 {
     if (m_backendDispatcher)

Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (158319 => 158320)


--- trunk/Source/WebCore/inspector/WorkerInspectorController.h	2013-10-30 22:12:04 UTC (rev 158319)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h	2013-10-30 22:17:27 UTC (rev 158320)
@@ -63,7 +63,6 @@
     bool hasFrontend() const { return m_frontend; }
     void connectFrontend();
     void disconnectFrontend();
-    void restoreInspectorStateFromCookie(const String& inspectorCookie);
     void dispatchMessageFromFrontend(const String&);
 #if ENABLE(_javascript__DEBUGGER)
     void resume();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to