2011-01-27 Yury Semikhatsky <yurys@chromium.org>
authoryurys@chromium.org <yurys@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jan 2011 14:03:18 +0000 (14:03 +0000)
committeryurys@chromium.org <yurys@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jan 2011 14:03:18 +0000 (14:03 +0000)
        Reviewed by Pavel Feldman.

        Web Inspector: store all settings related to the agents on the frontend side
        https://bugs.webkit.org/show_bug.cgi?id=53174

        * http/tests/inspector/console-xhr-logging.html: since the setting doesn't change on the front-end
        side there is no need to check it after modifying backend's value.
        * inspector/report-protocol-errors.html: use the new signature of disableDebugger method.
2011-01-27  Yury Semikhatsky  <yurys@chromium.org>

        Reviewed by Pavel Feldman.

        Web Inspector: store all settings related to the agents on the frontend side
        https://bugs.webkit.org/show_bug.cgi?id=53174

        * CMakeLists.txt:
        * GNUmakefile.am:
        * WebCore.exp.in:
        * WebCore.gypi:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * bindings/js/ScriptDebugServer.cpp:
        * bindings/js/ScriptDebugServer.h:
        * bindings/js/ScriptProfiler.cpp:
        * bindings/js/ScriptProfiler.h:
        * bindings/v8/ScriptDebugServer.cpp:
        * bindings/v8/ScriptDebugServer.h:
        * bindings/v8/ScriptProfiler.cpp:
        * bindings/v8/ScriptProfiler.h:
        * inspector/Inspector.idl:
        * inspector/InspectorAgent.cpp: profiler and debugger enablement state is now stored
        on the front-end side and will be pushed to the backend when the frontend is loaded.
        (WebCore::InspectorAgent::InspectorAgent):
        (WebCore::InspectorAgent::disconnectFrontend):
        (WebCore::InspectorAgent::restoreDebugger):
        (WebCore::InspectorAgent::restoreProfiler):
        (WebCore::InspectorAgent::enableProfiler):
        (WebCore::InspectorAgent::disableProfiler):
        (WebCore::InspectorAgent::showAndEnableDebugger):
        (WebCore::InspectorAgent::enableDebugger):
        (WebCore::InspectorAgent::disableDebugger):
        * inspector/InspectorAgent.h:
        * inspector/InspectorConsoleAgent.cpp: XHR failures will be logged to the console only
        if the front-end was opened during current browser session and XHR logging is turned on
        there.
        (WebCore::InspectorConsoleAgent::setMonitoringXHREnabled):
        (WebCore::InspectorConsoleAgent::setConsoleMessagesEnabled):
        * inspector/InspectorDebuggerAgent.cpp:
        * inspector/InspectorDebuggerAgent.h:
        * inspector/InspectorInstrumentation.cpp:
        (WebCore::InspectorInstrumentation::identifierForInitialRequestImpl):
        (WebCore::InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl):
        * inspector/InspectorProfilerAgent.cpp:
        (WebCore::InspectorProfilerAgent::InspectorProfilerAgent):
        (WebCore::InspectorProfilerAgent::startUserInitiatedProfiling):
        * inspector/InspectorSettings.cpp: Removed.
        * inspector/InspectorSettings.h: Removed.
        * inspector/InspectorState.cpp:
        (WebCore::InspectorState::InspectorState):
        * inspector/InspectorState.h:
        * inspector/front-end/ConsoleView.js:
        (WebInspector.ConsoleView.prototype._registerConsoleDomainDispatcher.dispatcher.consoleMessagesCleared):
        (WebInspector.ConsoleView.prototype._registerConsoleDomainDispatcher):
        (WebInspector.ConsoleView.prototype._handleContextMenuEvent.itemAction):
        (WebInspector.ConsoleView.prototype._handleContextMenuEvent):
        * inspector/front-end/ProfilesPanel.js:
        (WebInspector.ProfilesPanel.prototype._toggleProfiling):
        * inspector/front-end/ScriptsPanel.js:
        (WebInspector.ScriptsPanel.prototype._toggleDebugging):
        * inspector/front-end/Settings.js:
        (WebInspector.Settings):
        * inspector/front-end/inspector.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76792 268f45cc-cd09-0410-ab3c-d52691b4dbfc

36 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/inspector/console-xhr-logging.html
LayoutTests/inspector/report-protocol-errors.html
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/ScriptDebugServer.cpp
Source/WebCore/bindings/js/ScriptDebugServer.h
Source/WebCore/bindings/js/ScriptProfiler.cpp
Source/WebCore/bindings/js/ScriptProfiler.h
Source/WebCore/bindings/v8/ScriptDebugServer.cpp
Source/WebCore/bindings/v8/ScriptDebugServer.h
Source/WebCore/bindings/v8/ScriptProfiler.cpp
Source/WebCore/bindings/v8/ScriptProfiler.h
Source/WebCore/inspector/Inspector.idl
Source/WebCore/inspector/InspectorAgent.cpp
Source/WebCore/inspector/InspectorAgent.h
Source/WebCore/inspector/InspectorConsoleAgent.cpp
Source/WebCore/inspector/InspectorDebuggerAgent.cpp
Source/WebCore/inspector/InspectorDebuggerAgent.h
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorProfilerAgent.cpp
Source/WebCore/inspector/InspectorSettings.cpp [deleted file]
Source/WebCore/inspector/InspectorSettings.h [deleted file]
Source/WebCore/inspector/InspectorState.cpp
Source/WebCore/inspector/InspectorState.h
Source/WebCore/inspector/front-end/ConsoleView.js
Source/WebCore/inspector/front-end/ProfilesPanel.js
Source/WebCore/inspector/front-end/ScriptsPanel.js
Source/WebCore/inspector/front-end/Settings.js
Source/WebCore/inspector/front-end/inspector.js

index 9b1b726..155cdb2 100644 (file)
@@ -1,3 +1,14 @@
+2011-01-27  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: store all settings related to the agents on the frontend side
+        https://bugs.webkit.org/show_bug.cgi?id=53174
+
+        * http/tests/inspector/console-xhr-logging.html: since the setting doesn't change on the front-end
+        side there is no need to check it after modifying backend's value.
+        * inspector/report-protocol-errors.html: use the new signature of disableDebugger method.
+
 2011-01-27  Philippe Normand  <pnormand@igalia.com>
 
         Unreviewed, new GTK baselines for fast/multicol tests as follow-up
index 5b5aa7b..dc52a72 100755 (executable)
@@ -46,26 +46,18 @@ function requestHelper(method, url)
 function frontend_enableXMLHttpRequestLogging(testController)
 {
     InspectorBackend.setMonitoringXHREnabled(true, function() {
-         if (WebInspector.console._monitoringXHREnabled)
-            testController.notifyDone("enabled");
+        testController.notifyDone("enabled");
     });
 
-    if (WebInspector.console._monitoringXHREnabled)
-        return "enabled";
-
     testController.waitUntilDone();
 }
 
 function frontend_disableXMLHttpRequestLogging(testController)
 {
     InspectorBackend.setMonitoringXHREnabled(false, function() {
-        if (!WebInspector.console._monitoringXHREnabled)
-            testController.notifyDone("disabled");
+        testController.notifyDone("disabled");
     });
 
-    if (!WebInspector.console._monitoringXHREnabled)
-        return "disabled";
-
     testController.waitUntilDone();
 }
 
index 4c0ff6d..1827be0 100644 (file)
@@ -18,7 +18,6 @@ function test()
         '{"seq":5,"command":"resourceContent","arguments":{"identifier":"not a number"}}',
         '{"seq":6,"command":"removeBreakpoint","arguments":{}}',
         '{"seq":7,"command":"removeBreakpoint","arguments":{"breakpointId":"someBreakpointId"}}',
-
     ];
     var numberOfReports = 0;
 
@@ -36,7 +35,7 @@ function test()
             InspectorFrontendHost.sendMessageToBackend(messages[i]);
     }
 
-    InspectorBackend.disableDebugger(true, fire);
+    InspectorBackend.disableDebugger(fire);
 }
 
 </script>
index 93793e4..72639cf 100644 (file)
@@ -1173,7 +1173,6 @@ SET(WebCore_SOURCES
     inspector/InspectorProfilerAgent.cpp
     inspector/InspectorResourceAgent.cpp
     inspector/InspectorRuntimeAgent.cpp
-    inspector/InspectorSettings.cpp
     inspector/InspectorState.cpp
     inspector/InspectorStyleSheet.cpp
     inspector/InspectorTimelineAgent.cpp
index 63137f6..1d20174 100644 (file)
@@ -1,3 +1,69 @@
+2011-01-27  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: store all settings related to the agents on the frontend side
+        https://bugs.webkit.org/show_bug.cgi?id=53174
+
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * WebCore.exp.in:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/ScriptDebugServer.cpp:
+        * bindings/js/ScriptDebugServer.h:
+        * bindings/js/ScriptProfiler.cpp:
+        * bindings/js/ScriptProfiler.h:
+        * bindings/v8/ScriptDebugServer.cpp:
+        * bindings/v8/ScriptDebugServer.h:
+        * bindings/v8/ScriptProfiler.cpp:
+        * bindings/v8/ScriptProfiler.h:
+        * inspector/Inspector.idl:
+        * inspector/InspectorAgent.cpp: profiler and debugger enablement state is now stored
+        on the front-end side and will be pushed to the backend when the frontend is loaded.
+        (WebCore::InspectorAgent::InspectorAgent):
+        (WebCore::InspectorAgent::disconnectFrontend):
+        (WebCore::InspectorAgent::restoreDebugger):
+        (WebCore::InspectorAgent::restoreProfiler):
+        (WebCore::InspectorAgent::enableProfiler):
+        (WebCore::InspectorAgent::disableProfiler):
+        (WebCore::InspectorAgent::showAndEnableDebugger):
+        (WebCore::InspectorAgent::enableDebugger):
+        (WebCore::InspectorAgent::disableDebugger):
+        * inspector/InspectorAgent.h:
+        * inspector/InspectorConsoleAgent.cpp: XHR failures will be logged to the console only
+        if the front-end was opened during current browser session and XHR logging is turned on
+        there.
+        (WebCore::InspectorConsoleAgent::setMonitoringXHREnabled):
+        (WebCore::InspectorConsoleAgent::setConsoleMessagesEnabled):
+        * inspector/InspectorDebuggerAgent.cpp:
+        * inspector/InspectorDebuggerAgent.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::identifierForInitialRequestImpl):
+        (WebCore::InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl):
+        * inspector/InspectorProfilerAgent.cpp:
+        (WebCore::InspectorProfilerAgent::InspectorProfilerAgent):
+        (WebCore::InspectorProfilerAgent::startUserInitiatedProfiling):
+        * inspector/InspectorSettings.cpp: Removed.
+        * inspector/InspectorSettings.h: Removed.
+        * inspector/InspectorState.cpp:
+        (WebCore::InspectorState::InspectorState):
+        * inspector/InspectorState.h:
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype._registerConsoleDomainDispatcher.dispatcher.consoleMessagesCleared):
+        (WebInspector.ConsoleView.prototype._registerConsoleDomainDispatcher):
+        (WebInspector.ConsoleView.prototype._handleContextMenuEvent.itemAction):
+        (WebInspector.ConsoleView.prototype._handleContextMenuEvent):
+        * inspector/front-end/ProfilesPanel.js:
+        (WebInspector.ProfilesPanel.prototype._toggleProfiling):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._toggleDebugging):
+        * inspector/front-end/Settings.js:
+        (WebInspector.Settings):
+        * inspector/front-end/inspector.js:
+
 2011-01-27  Pavel Podivilov  <podivilov@chromium.org>
 
         Reviewed by Pavel Feldman.
index 99ea441..84d1df6 100644 (file)
@@ -1994,8 +1994,6 @@ webcore_sources += \
        Source/WebCore/inspector/InspectorResourceAgent.h \
        Source/WebCore/inspector/InspectorRuntimeAgent.cpp \
        Source/WebCore/inspector/InspectorRuntimeAgent.h \
-       Source/WebCore/inspector/InspectorSettings.cpp \
-       Source/WebCore/inspector/InspectorSettings.h \
        Source/WebCore/inspector/InspectorState.cpp \
        Source/WebCore/inspector/InspectorState.h \
        Source/WebCore/inspector/InspectorStyleSheet.cpp \
index a4bdaa8..957c492 100644 (file)
@@ -1368,9 +1368,9 @@ __ZN7WebCore14InspectorAgent5closeEv
 __ZN7WebCore14InspectorAgent9showPanelERKN3WTF6StringE
 __ZN7WebCore14InspectorAgent12ConsolePanelE
 __ZN7WebCore14InspectorAgent13ProfilesPanelE
-__ZN7WebCore14InspectorAgent14enableProfilerEbb
-__ZN7WebCore14InspectorAgent15disableDebuggerEb
-__ZN7WebCore14InspectorAgent15disableProfilerEb
+__ZN7WebCore14InspectorAgent14enableProfilerEv
+__ZN7WebCore14InspectorAgent15disableDebuggerEv
+__ZN7WebCore14InspectorAgent15disableProfilerEv
 __ZN7WebCore14InspectorAgent18disconnectFrontendEv
 __ZN7WebCore14InspectorAgent20stopTimelineProfilerEv
 __ZN7WebCore14InspectorAgent21showAndEnableDebuggerEv
index 4a4e04c..3a96529 100644 (file)
             'inspector/InspectorRuntimeAgent.cpp',
             'inspector/InspectorRuntimeAgent.h',
             'inspector/InspectorState.cpp',
-            'inspector/InspectorSettings.h',
-            'inspector/InspectorSettings.cpp',
             'inspector/InspectorState.h',
             'inspector/InspectorStyleSheet.cpp',
             'inspector/InspectorStyleSheet.h',
index e64ae97..aec3ecb 100644 (file)
@@ -1062,7 +1062,6 @@ SOURCES += \
     inspector/InspectorProfilerAgent.cpp \
     inspector/InspectorResourceAgent.cpp \
     inspector/InspectorRuntimeAgent.cpp \
-    inspector/InspectorSettings.cpp \
     inspector/InspectorState.cpp \
     inspector/InspectorStyleSheet.cpp \
     inspector/InspectorTimelineAgent.cpp \
@@ -1962,7 +1961,6 @@ HEADERS += \
     inspector/InspectorProfilerAgent.h \
     inspector/InspectorResourceAgent.h \
     inspector/InspectorRuntimeAgent.h \
-    inspector/InspectorSettings.h \
     inspector/InspectorState.h \
     inspector/InspectorStyleSheet.h \
     inspector/InspectorTimelineAgent.h \
index e2cefa0..74740d7 100755 (executable)
                                >
                        </File>
                        <File
-                               RelativePath="..\inspector\InspectorSettings.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\inspector\InspectorSettings.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\inspector\InspectorState.cpp"
                                >
                        </File>
index 2f221fb..d9f1105 100644 (file)
                7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */; };
                7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */; };
                7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7A5640BF12DF9E5E00F4536D /* InspectorSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A5640BD12DF9E5E00F4536D /* InspectorSettings.cpp */; };
-               7A5640C012DF9E5E00F4536D /* InspectorSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A5640BE12DF9E5E00F4536D /* InspectorSettings.h */; };
                7A674BDB0F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */; };
                7A674BDC0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */; };
                7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */; };
                7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDOMAgent.h; sourceTree = "<group>"; };
                7A563E5412DE32B000F4536D /* InjectedScriptSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptSource.h; sourceTree = "<group>"; };
                7A563F9512DF5C9100F4536D /* InjectedScriptSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InjectedScriptSource.js; sourceTree = "<group>"; };
-               7A5640BD12DF9E5E00F4536D /* InspectorSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorSettings.cpp; sourceTree = "<group>"; };
-               7A5640BE12DF9E5E00F4536D /* InspectorSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorSettings.h; sourceTree = "<group>"; };
                7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroupLoadDeferrer.cpp; sourceTree = "<group>"; };
                7A674BDA0F9EBF4E006CF099 /* PageGroupLoadDeferrer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroupLoadDeferrer.h; sourceTree = "<group>"; };
                7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMStorageAgent.cpp; sourceTree = "<group>"; };
                                82AB1772125C826700C5069D /* InspectorResourceAgent.h */,
                                7AA365ED12E7265400DCA242 /* InspectorRuntimeAgent.cpp */,
                                7AF11A5912E727490061F23C /* InspectorRuntimeAgent.h */,
-                               7A5640BD12DF9E5E00F4536D /* InspectorSettings.cpp */,
-                               7A5640BE12DF9E5E00F4536D /* InspectorSettings.h */,
                                4FA3B908125CD12100300BAD /* InspectorState.cpp */,
                                4FA3B909125CD12200300BAD /* InspectorState.h */,
                                82AB176F125C826700C5069D /* InspectorStyleSheet.cpp */,
                                9F0D6B2F121BFEBA006C0288 /* InspectorProfilerAgent.h in Headers */,
                                82AB1776125C826700C5069D /* InspectorResourceAgent.h in Headers */,
                                7AF11A5A12E727490061F23C /* InspectorRuntimeAgent.h in Headers */,
-                               7A5640C012DF9E5E00F4536D /* InspectorSettings.h in Headers */,
                                4FA3B90B125CD12200300BAD /* InspectorState.h in Headers */,
                                82AB1774125C826700C5069D /* InspectorStyleSheet.h in Headers */,
                                754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */,
                                9F0D6B2E121BFEBA006C0288 /* InspectorProfilerAgent.cpp in Sources */,
                                82AB1775125C826700C5069D /* InspectorResourceAgent.cpp in Sources */,
                                7AA365EE12E7265400DCA242 /* InspectorRuntimeAgent.cpp in Sources */,
-                               7A5640BF12DF9E5E00F4536D /* InspectorSettings.cpp in Sources */,
                                4FA3B90A125CD12200300BAD /* InspectorState.cpp in Sources */,
                                82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */,
                                754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
index 33a318c..8b45f9b 100644 (file)
@@ -117,11 +117,6 @@ void ScriptDebugServer::removeListener(ScriptDebugListener* listener, Page* page
     didRemoveListener(page);
 }
 
-bool ScriptDebugServer::isDebuggerAlwaysEnabled()
-{
-    return false;
-}
-
 bool ScriptDebugServer::hasListenersInterestedInPage(Page* page)
 {
     ASSERT_ARG(page, page);
index 1e38819..368b07b 100644 (file)
@@ -93,8 +93,6 @@ public:
 
     JavaScriptCallFrame* currentCallFrame();
 
-    bool isDebuggerAlwaysEnabled();
-
 private:
     typedef HashSet<ScriptDebugListener*> ListenerSet;
     typedef void (ScriptDebugServer::*JavaScriptExecutionCallback)(ScriptDebugListener*);
index 62ae9ba..f372c3c 100644 (file)
@@ -46,11 +46,6 @@ PassRefPtr<ScriptProfile> ScriptProfiler::stop(ScriptState* state, const String&
     return ScriptProfile::create(profile);
 }
 
-bool ScriptProfiler::isProfilerAlwaysEnabled()
-{
-    return false;
-}
-
 } // namespace WebCore
 
 #endif // ENABLE(JAVASCRIPT_DEBUGGER)
index 4c0c07f..d8ad482 100644 (file)
@@ -50,7 +50,6 @@ public:
     static void start(ScriptState* state, const String& title);
     static PassRefPtr<ScriptProfile> stop(ScriptState* state, const String& title);
     static PassRefPtr<ScriptHeapSnapshot> takeHeapSnapshot(const String&, HeapSnapshotProgress*) { return 0; }
-    static bool isProfilerAlwaysEnabled();
 };
 
 } // namespace WebCore
index 97c57f4..11fa860 100644 (file)
@@ -342,11 +342,6 @@ void ScriptDebugServer::setEnabled(bool value)
      m_enabled = value;
 }
 
-bool ScriptDebugServer::isDebuggerAlwaysEnabled()
-{
-    return m_enabled;
-}
-
 void ScriptDebugServer::interruptAndRun(PassOwnPtr<Task> task)
 {
     v8::Debug::DebugBreakForCommand(new ClientDataImpl(task));
index 953ddc3..b4e7390 100644 (file)
@@ -99,7 +99,6 @@ public:
     PassRefPtr<JavaScriptCallFrame> currentCallFrame();
 
     void setEnabled(bool);
-    bool isDebuggerAlwaysEnabled();
 
     class Task {
     public:
index 5de1b36..615dcfc 100644 (file)
@@ -90,9 +90,4 @@ PassRefPtr<ScriptHeapSnapshot> ScriptProfiler::takeHeapSnapshot(const String& ti
     return snapshot ? ScriptHeapSnapshot::create(snapshot) : 0;
 }
 
-bool ScriptProfiler::isProfilerAlwaysEnabled()
-{
-    return true;
-}
-
 } // namespace WebCore
index 83aab7b..9016668 100644 (file)
@@ -56,7 +56,6 @@ public:
     static void start(ScriptState* state, const String& title);
     static PassRefPtr<ScriptProfile> stop(ScriptState* state, const String& title);
     static PassRefPtr<ScriptHeapSnapshot> takeHeapSnapshot(const String& title, HeapSnapshotProgress*);
-    static bool isProfilerAlwaysEnabled();
 };
 
 } // namespace WebCore
index b8ccd8e..9797274 100644 (file)
@@ -94,7 +94,6 @@ module core {
         [domain=Console] void clearConsoleMessages();
         [notify, domain=Console] void consoleMessagesCleared();
         [domain=Console] void setMonitoringXHREnabled(in boolean enabled);
-        [notify, domain=Console] void monitoringXHRStateChanged(out boolean enabled);
 
         ///////////////////////////////////////////////////////////////////////
         // Network API
@@ -239,8 +238,8 @@ module core {
         // Debugger API
         ///////////////////////////////////////////////////////////////////////
 
-        [domain=Inspector] void enableDebugger(in boolean always);
-        [domain=Inspector] void disableDebugger(in boolean always);
+        [domain=Inspector] void enableDebugger();
+        [domain=Inspector] void disableDebugger();
 
         [notify, domain=Debugger] void debuggerWasEnabled();
         [notify, domain=Debugger] void debuggerWasDisabled();
@@ -290,8 +289,8 @@ module core {
         // Profiler API
         ///////////////////////////////////////////////////////////////////////
 
-        [domain=Inspector] void enableProfiler(in boolean always);
-        [domain=Inspector] void disableProfiler(in boolean always);
+        [domain=Inspector] void enableProfiler();
+        [domain=Inspector] void disableProfiler();
         [notify, domain=Profiler] void profilerWasEnabled();
         [notify, domain=Profiler] void profilerWasDisabled();
 
index 4b342c7..7640668 100644 (file)
@@ -72,7 +72,6 @@
 #include "InspectorProfilerAgent.h"
 #include "InspectorResourceAgent.h"
 #include "InspectorRuntimeAgent.h"
-#include "InspectorSettings.h"
 #include "InspectorState.h"
 #include "InspectorTimelineAgent.h"
 #include "InspectorValues.h"
@@ -146,7 +145,6 @@ InspectorAgent::InspectorAgent(InspectorController* inspectorController, Page* p
     , m_injectedScriptHost(InjectedScriptHost::create(this))
     , m_consoleAgent(new InspectorConsoleAgent(this))
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    , m_attachDebuggerWhenShown(false)
     , m_profilerAgent(InspectorProfilerAgent::create(this))
 #endif
 {
@@ -450,9 +448,7 @@ void InspectorAgent::disconnectFrontend()
     // If the window is being closed with the debugger enabled,
     // remember this state to re-enable debugger on the next window
     // opening.
-    bool debuggerWasEnabled = debuggerEnabled();
     disableDebugger();
-    m_attachDebuggerWhenShown = debuggerWasEnabled;
 #endif
     setSearchingForNode(false);
     unbindAllResources();
@@ -570,10 +566,8 @@ void InspectorAgent::restoreDebugger()
 {
     ASSERT(m_frontend);
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorDebuggerAgent::isDebuggerAlwaysEnabled() || m_attachDebuggerWhenShown || m_settings->getBoolean(InspectorSettings::DebuggerAlwaysEnabled)) {
-        enableDebugger(false);
-        m_attachDebuggerWhenShown = false;
-    }
+    if (m_state->getBoolean(InspectorState::debuggerEnabled))
+        enableDebugger();
 #endif
 }
 
@@ -582,7 +576,7 @@ void InspectorAgent::restoreProfiler(ProfilerRestoreAction action)
     ASSERT(m_frontend);
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     m_profilerAgent->setFrontend(m_frontend.get());
-    if (!ScriptProfiler::isProfilerAlwaysEnabled() && m_settings->getBoolean(InspectorSettings::ProfilerAlwaysEnabled))
+    if (m_state->getBoolean(InspectorState::profilerEnabled))
         enableProfiler();
     if (action == ProfilerRestoreResetAgent)
         m_profilerAgent->resetFrontendProfiles();
@@ -705,14 +699,6 @@ void InspectorAgent::willSendRequest(ResourceRequest& request)
     }
 }
 
-void InspectorAgent::ensureSettingsLoaded()
-{
-    if (m_settings)
-        return;
-    m_settings = new InspectorSettings(m_client);
-    m_state->setBoolean(InspectorState::monitoringXHR, m_settings->getBoolean(InspectorSettings::MonitoringXHREnabled));
-}
-
 void InspectorAgent::startTimelineProfiler()
 {
     if (!enabled())
@@ -992,17 +978,17 @@ bool InspectorAgent::profilerEnabled() const
     return enabled() && m_profilerAgent->enabled();
 }
 
-void InspectorAgent::enableProfiler(bool always, bool skipRecompile)
+void InspectorAgent::enableProfiler()
 {
-    if (always)
-        m_settings->setBoolean(InspectorSettings::ProfilerAlwaysEnabled, true);
-    m_profilerAgent->enable(skipRecompile);
+    if (profilerEnabled())
+        return;
+    m_state->setBoolean(InspectorState::profilerEnabled, true);
+    m_profilerAgent->enable(false);
 }
 
-void InspectorAgent::disableProfiler(bool always)
+void InspectorAgent::disableProfiler()
 {
-    if (always)
-        m_settings->setBoolean(InspectorSettings::ProfilerAlwaysEnabled, false);
+    m_state->setBoolean(InspectorState::profilerEnabled, false);
     m_profilerAgent->disable();
 }
 #endif
@@ -1017,18 +1003,17 @@ void InspectorAgent::showAndEnableDebugger()
         return;
 
     if (!m_frontend) {
-        m_attachDebuggerWhenShown = true;
+        m_state->setBoolean(InspectorState::debuggerEnabled, true);
         showPanel(ScriptsPanel);
     } else
-        enableDebugger(false);
+        enableDebugger();
 }
 
-void InspectorAgent::enableDebugger(bool always)
+void InspectorAgent::enableDebugger()
 {
-    ASSERT(!debuggerEnabled());
-    if (always)
-        m_settings->setBoolean(InspectorSettings::DebuggerAlwaysEnabled, true);
-
+    if (debuggerEnabled())
+        return;
+    m_state->setBoolean(InspectorState::debuggerEnabled, true);
     ASSERT(m_inspectedPage);
 
     m_debuggerAgent = InspectorDebuggerAgent::create(this, m_frontend.get());
@@ -1037,23 +1022,18 @@ void InspectorAgent::enableDebugger(bool always)
     m_frontend->debuggerWasEnabled();
 }
 
-void InspectorAgent::disableDebugger(bool always)
+void InspectorAgent::disableDebugger()
 {
     if (!enabled())
         return;
-
-    if (always)
-        m_settings->setBoolean(InspectorSettings::DebuggerAlwaysEnabled, false);
-
     ASSERT(m_inspectedPage);
-
     m_debuggerAgent.clear();
     m_browserDebuggerAgent.clear();
 
-    m_attachDebuggerWhenShown = false;
-
-    if (m_frontend)
+    if (m_frontend) {
         m_frontend->debuggerWasDisabled();
+        m_state->setBoolean(InspectorState::debuggerEnabled, false);
+    }
 }
 
 void InspectorAgent::resume()
index 362abec..8cc49a6 100644 (file)
@@ -74,7 +74,6 @@ class InspectorObject;
 class InspectorProfilerAgent;
 class InspectorResourceAgent;
 class InspectorRuntimeAgent;
-class InspectorSettings;
 class InspectorState;
 class InspectorStorageAgent;
 class InspectorTimelineAgent;
@@ -237,13 +236,13 @@ public:
     void startUserInitiatedProfiling();
     void stopProfiling() { stopUserInitiatedProfiling(); }
     void stopUserInitiatedProfiling();
-    void enableProfiler(bool always = false, bool skipRecompile = false);
-    void disableProfiler(bool always = false);
+    void enableProfiler();
+    void disableProfiler();
     bool profilerEnabled() const;
 
     void showAndEnableDebugger();
-    void enableDebugger(bool always);
-    void disableDebugger(bool always = false);
+    void enableDebugger();
+    void disableDebugger();
     bool debuggerEnabled() const { return m_debuggerAgent; }
     void resume();
 
@@ -258,7 +257,6 @@ public:
     void setInspectorExtensionAPI(const String& source);
 
     InspectorState* state() { return m_state.get(); }
-    InspectorSettings* settings() { return m_settings.get(); }
 
     // InspectorAgent API
     void getInspectorState(RefPtr<InspectorObject>* state);
@@ -269,7 +267,6 @@ public:
     void didEvaluateForTestInFrontend(long callId, const String& jsonResult);
 
     // InspectorInstrumentation API
-    void ensureSettingsLoaded();
     void willSendRequest(ResourceRequest&);
 
 private:
@@ -314,7 +311,6 @@ private:
 
     OwnPtr<InspectorTimelineAgent> m_timelineAgent;
     OwnPtr<InspectorState> m_state;
-    OwnPtr<InspectorSettings> m_settings;
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     OwnPtr<InspectorApplicationCacheAgent> m_applicationCacheAgent;
@@ -347,7 +343,6 @@ private:
     Vector<String> m_scriptsToEvaluateOnLoad;
     String m_inspectorExtensionAPI;
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    bool m_attachDebuggerWhenShown;
     OwnPtr<InspectorDebuggerAgent> m_debuggerAgent;
     OwnPtr<InspectorBrowserDebuggerAgent> m_browserDebuggerAgent;
     OwnPtr<InspectorProfilerAgent> m_profilerAgent;
index 76638c7..872cbb7 100644 (file)
@@ -33,7 +33,6 @@
 #include "InspectorAgent.h"
 #include "InspectorDOMAgent.h"
 #include "InspectorFrontend.h"
-#include "InspectorSettings.h"
 #include "InspectorState.h"
 #include "ResourceError.h"
 #include "ResourceResponse.h"
@@ -194,9 +193,6 @@ void InspectorConsoleAgent::didFailLoading(unsigned long identifier, const Resou
 void InspectorConsoleAgent::setMonitoringXHREnabled(bool enabled)
 {
     m_inspectorAgent->state()->setBoolean(InspectorState::monitoringXHR, enabled);
-    m_inspectorAgent->settings()->setBoolean(InspectorSettings::MonitoringXHREnabled, enabled);
-    if (m_frontend)
-        m_frontend->monitoringXHRStateChanged(enabled);
 }
 
 void InspectorConsoleAgent::setConsoleMessagesEnabled(bool enabled)
@@ -205,7 +201,6 @@ void InspectorConsoleAgent::setConsoleMessagesEnabled(bool enabled)
     if (!enabled || !m_frontend)
         return;
 
-    m_frontend->monitoringXHRStateChanged(m_inspectorAgent->state()->getBoolean(InspectorState::monitoringXHR));
     if (m_expiredConsoleMessageCount)
         m_frontend->updateConsoleMessageExpiredCount(m_expiredConsoleMessageCount);
     unsigned messageCount = m_consoleMessages.size();
index 9f3cce8..3c62981 100644 (file)
@@ -66,11 +66,6 @@ InspectorDebuggerAgent::~InspectorDebuggerAgent()
     m_pausedScriptState = 0;
 }
 
-bool InspectorDebuggerAgent::isDebuggerAlwaysEnabled()
-{
-    return ScriptDebugServer::shared().isDebuggerAlwaysEnabled();
-}
-
 void InspectorDebuggerAgent::activateBreakpoints()
 {
     ScriptDebugServer::shared().activateBreakpoints();
index 34ad0db..f0de973 100644 (file)
@@ -60,8 +60,6 @@ public:
     static PassOwnPtr<InspectorDebuggerAgent> create(InspectorAgent*, InspectorFrontend*);
     virtual ~InspectorDebuggerAgent();
 
-    static bool isDebuggerAlwaysEnabled();
-
     void setAllJavaScriptBreakpoints(PassRefPtr<InspectorObject>);
     void inspectedURLChanged(const String& url);
 
index c449ba4..dbb472a 100644 (file)
@@ -376,7 +376,6 @@ void InspectorInstrumentation::identifierForInitialRequestImpl(InspectorAgent* i
 {
     if (!ic->enabled())
         return;
-    ic->ensureSettingsLoaded();
 
     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
         resourceAgent->identifierForInitialRequest(identifier, request.url(), loader);
@@ -401,7 +400,6 @@ void InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl(InspectorAgent
 {
     if (!ic->enabled())
         return;
-    ic->ensureSettingsLoaded();
     if (InspectorResourceAgent* resourceAgent = retrieveResourceAgent(ic))
         resourceAgent->didLoadResourceFromMemoryCache(loader, cachedResource);
 }
index 4693050..47dc585 100644 (file)
@@ -65,7 +65,7 @@ PassOwnPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InspectorAgent
 InspectorProfilerAgent::InspectorProfilerAgent(InspectorAgent* inspectorAgent)
     : m_inspectorAgent(inspectorAgent)
     , m_frontend(0)
-    , m_enabled(ScriptProfiler::isProfilerAlwaysEnabled())
+    , m_enabled(false)
     , m_recordingUserInitiatedProfile(false)
     , m_currentUserInitiatedProfileNumber(-1)
     , m_nextUserInitiatedProfileNumber(1)
@@ -229,7 +229,7 @@ void InspectorProfilerAgent::startUserInitiatedProfiling()
     if (m_recordingUserInitiatedProfile)
         return;
     if (!enabled()) {
-        enable(false);
+        enable(true);
         ScriptDebugServer::shared().recompileAllJSFunctions();
     }
     m_recordingUserInitiatedProfile = true;
diff --git a/Source/WebCore/inspector/InspectorSettings.cpp b/Source/WebCore/inspector/InspectorSettings.cpp
deleted file mode 100644 (file)
index 08c5645..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "config.h"
-#include "InspectorSettings.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorClient.h"
-
-namespace WebCore {
-
-const char* InspectorSettings::MonitoringXHREnabled = "xhrMonitor";
-const char* InspectorSettings::ProfilerAlwaysEnabled = "profilerEnabled";
-const char* InspectorSettings::DebuggerAlwaysEnabled = "debuggerEnabled";
-
-InspectorSettings::InspectorSettings(InspectorClient* client)
-    : m_client(client)
-{
-    registerBoolean(MonitoringXHREnabled, false);
-    registerBoolean(ProfilerAlwaysEnabled, false);
-    registerBoolean(DebuggerAlwaysEnabled, false);
-}
-
-bool InspectorSettings::getBoolean(const String& name)
-{
-    String value;
-    m_client->populateSetting(name, &value);
-    if (value.isEmpty())
-        value = m_defaultValues.get(name);
-    return value == "true";
-}
-
-void InspectorSettings::setBoolean(const String& name, bool value)
-{
-    m_client->storeSetting(name, value ? "true" : "false");
-}
-
-long InspectorSettings::getLong(const String& name)
-{
-    String value;
-    m_client->populateSetting(name, &value);
-    if (value.isEmpty())
-        value = m_defaultValues.get(name);
-    return value.toInt();
-}
-
-void InspectorSettings::setLong(const String& name, long value)
-{
-    m_client->storeSetting(name, String::number(value));
-}
-
-void InspectorSettings::registerBoolean(const String& name, bool defaultValue)
-{
-    m_defaultValues.set(name, defaultValue ? "true" : "false");
-}
-
-void InspectorSettings::registerLong(const String& name, long defaultValue)
-{
-    m_defaultValues.set(name, String::number(defaultValue));
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
diff --git a/Source/WebCore/inspector/InspectorSettings.h b/Source/WebCore/inspector/InspectorSettings.h
deleted file mode 100644 (file)
index 0d48570..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorSettings_h
-#define InspectorSettings_h
-
-#if ENABLE(INSPECTOR)
-
-#include "PlatformString.h"
-
-#include <wtf/HashMap.h>
-#include <wtf/text/StringHash.h>
-
-namespace WebCore {
-
-class InspectorClient;
-
-class InspectorSettings {
-public:
-    static const char* MonitoringXHREnabled;
-    static const char* ProfilerAlwaysEnabled;
-    static const char* DebuggerAlwaysEnabled;
-
-    InspectorSettings(InspectorClient* client);
-
-    bool getBoolean(const String& name);
-    void setBoolean(const String& name, bool value);
-
-    long getLong(const String& name);
-    void setLong(const String& name, long value);
-
-private:
-    void registerBoolean(const String& name, bool defaultValue);
-    void registerLong(const String& name, long defaultValue);
-
-    typedef HashMap<String, String> Dictionary;
-    Dictionary m_defaultValues;
-    InspectorClient* m_client;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-#endif // !defined(InspectorSettings_h)
index c1b6821..779d464 100644 (file)
@@ -42,6 +42,8 @@ InspectorState::InspectorState(InspectorClient* client)
     registerBoolean(userInitiatedProfiling, false);
     registerBoolean(timelineProfilerEnabled, false);
     registerBoolean(searchingForNode, false);
+    registerBoolean(debuggerEnabled, false);
+    registerBoolean(profilerEnabled, false);
     registerObject(javaScriptBreakpoints);
     registerObject(browserBreakpoints);
     registerBoolean(consoleMessagesEnabled, false);
index 2017332..90a2c17 100644 (file)
@@ -48,7 +48,9 @@ public:
         timelineProfilerEnabled,
         searchingForNode,
         consoleMessagesEnabled,
+        profilerEnabled,
         userInitiatedProfiling,
+        debuggerEnabled,
         javaScriptBreakpoints,
         browserBreakpoints,
         resourceAgentEnabled,
index 7feb7ab..3aa5ef0 100644 (file)
@@ -150,11 +150,6 @@ WebInspector.ConsoleView.prototype = {
             {
                 console.clearMessages();
             },
-
-            monitoringXHRStateChanged: function(enabled)
-            {
-                console._monitoringXHREnabled = enabled;
-            }
         }
         InspectorBackend.registerDomainDispatcher("Console", dispatcher);
     },
@@ -418,9 +413,12 @@ WebInspector.ConsoleView.prototype = {
             return;
         }
 
-        var itemAction = InspectorBackend.setMonitoringXHREnabled.bind(InspectorBackend, !this._monitoringXHREnabled);
+        var itemAction = function () {
+            WebInspector.settings.monitoringXHREnabled = !WebInspector.settings.monitoringXHREnabled;
+            InspectorBackend.setMonitoringXHREnabled(WebInspector.settings.monitoringXHREnabled);
+        }.bind(this);
         var contextMenu = new WebInspector.ContextMenu();
-        contextMenu.appendCheckboxItem(WebInspector.UIString("XMLHttpRequest logging"), itemAction, this._monitoringXHREnabled);
+        contextMenu.appendCheckboxItem(WebInspector.UIString("XMLHttpRequest logging"), itemAction, WebInspector.settings.monitoringXHREnabled)
         contextMenu.appendItem(WebInspector.UIString("Clear Console"), this.requestClearMessages.bind(this));
         contextMenu.show(event);
     },
index bbe0c5e..176ddb2 100644 (file)
@@ -580,10 +580,13 @@ WebInspector.ProfilesPanel.prototype = {
 
     _toggleProfiling: function(optionalAlways)
     {
-        if (this._profilerEnabled)
+        if (this._profilerEnabled) {
+            WebInspector.settings.profilerEnabled = false;
             InspectorBackend.disableProfiler(true);
-        else
-            InspectorBackend.enableProfiler(!!optionalAlways);
+        } else {
+            WebInspector.settings.profilerEnabled = !!optionalAlways;
+            InspectorBackend.enableProfiler();
+        }
     },
 
     _populateProfiles: function()
index 88be663..ddc906a 100644 (file)
@@ -801,10 +801,13 @@ WebInspector.ScriptsPanel.prototype = {
         this._waitingToPause = false;
         this._stepping = false;
 
-        if (this._debuggerEnabled)
-            InspectorBackend.disableDebugger(true);
-        else
-            InspectorBackend.enableDebugger(!!optionalAlways);
+        if (this._debuggerEnabled) {
+            WebInspector.settings.debuggerEnabled = false;
+            InspectorBackend.disableDebugger();
+        } else {
+            WebInspector.settings.debuggerEnabled = !!optionalAlways;
+            InspectorBackend.enableDebugger();
+        }
     },
 
     _togglePauseOnExceptions: function()
index ef6b263..1cea5e1 100644 (file)
@@ -58,16 +58,19 @@ WebInspector.Settings = function()
 {
     this.installApplicationSetting("colorFormat", "hex");
     this.installApplicationSetting("consoleHistory", []);
+    this.installApplicationSetting("debuggerEnabled", false);
+    this.installApplicationSetting("profilerEnabled", false);
     this.installApplicationSetting("eventListenersFilter", "all");
+    this.installApplicationSetting("lastActivePanel", "elements");
     this.installApplicationSetting("lastViewedScriptFile", "application");
+    this.installApplicationSetting("monitoringXHREnabled", false);
+    this.installApplicationSetting("pauseOnExceptionState", WebInspector.ScriptsPanel.PauseOnExceptionsState.DontPauseOnExceptions);
     this.installApplicationSetting("resourcesLargeRows", true);
     this.installApplicationSetting("resourcesSortOptions", {timeOption: "responseTime", sizeOption: "transferSize"});
     this.installApplicationSetting("resourceViewTab", "content");
     this.installApplicationSetting("showInheritedComputedStyleProperties", false);
     this.installApplicationSetting("showUserAgentStyles", true);
     this.installApplicationSetting("watchExpressions", []);
-    this.installApplicationSetting("lastActivePanel", "elements");
-    this.installApplicationSetting("pauseOnExceptionState", WebInspector.ScriptsPanel.PauseOnExceptionsState.DontPauseOnExceptions);
 
     this.installProjectSetting("breakpoints", {});
     this.installProjectSetting("nativeBreakpoints", []);
index 344caea..c02fd6e 100644 (file)
@@ -601,6 +601,13 @@ WebInspector.doLoadedDone = function()
     }
     InspectorBackend.populateScriptObjects(onPopulateScriptObjects);
 
+    if (Preferences.debuggerAlwaysEnabled || WebInspector.settings.debuggerEnabled)
+        InspectorBackend.enableDebugger();
+    if (Preferences.profilerAlwaysEnabled || WebInspector.settings.profilerEnabled)
+        InspectorBackend.enableProfiler();
+    if (WebInspector.settings.monitoringXHREnabled)
+        InspectorBackend.setMonitoringXHREnabled(true);
+
     InspectorBackend.setConsoleMessagesEnabled(true);
 
     function propertyNamesCallback(names)