Commit 0a8972d0 authored by timothy@apple.com's avatar timothy@apple.com
Browse files

Rename a few methods related to attaching and detaching the debugger. Also...

Rename a few methods related to attaching and detaching the debugger. Also adds stub methods for enabling and disabling the profiler.

WebCore:

2008-10-27  Timothy Hatcher  <timothy@apple.com>

        Rename a few methods related to attaching and detaching the debugger. Also
        adds stub methods for enabling and disabling the profiler.

        * Rename attachDebugger to enableDebugger.
        * Rename detachDebugger to disableDebugger.
        * Rename the debuggerAttached getter to debuggerEnabled.
        * Rename the debuggerAttached callback to debuggerWasEnabled.
        * Rename the debuggerDetached callback to debuggerWasDisabled.

        Reviewed by Darin Adler.

        * WebCore.base.exp:
        * inspector/InspectorController.cpp:
        (WebCore::InspectorController::InspectorController):
        (WebCore::InspectorController::setWindowVisible):
        (WebCore::InspectorController::windowScriptObjectAvailable):
        (WebCore::InspectorController::close):
        (WebCore::InspectorController::enableProfiler):
        (WebCore::InspectorController::disableProfiler):
        (WebCore::InspectorController::enableDebugger):
        (WebCore::InspectorController::disableDebugger):
        (WebCore::InspectorController::pauseInDebugger):
        (WebCore::InspectorController::resumeDebugger):
        (WebCore::InspectorController::stepOverStatementInDebugger):
        (WebCore::InspectorController::stepIntoStatementInDebugger):
        (WebCore::InspectorController::stepOutOfFunctionInDebugger):
        * inspector/InspectorController.h:
        (WebCore::InspectorController::profilerEnabled):
        (WebCore::InspectorController::debuggerEnabled):
        * inspector/front-end/BreakpointsSidebarPane.js:
        (WebInspector.BreakpointsSidebarPane.prototype.addBreakpoint):
        (WebInspector.BreakpointsSidebarPane.prototype.removeBreakpoint):
        (WebInspector.BreakpointsSidebarPane.prototype._breakpointEnableChanged):
        * inspector/front-end/Object.js:
        * inspector/front-end/ProfilesPanel.js:
        (WebInspector.ProfilesPanel):
        * inspector/front-end/ScriptsPanel.js:
        (WebInspector.ScriptsPanel):
        (WebInspector.ScriptsPanel.prototype.get statusBarItems):
        (WebInspector.ScriptsPanel.prototype.debuggerWasEnabled):
        (WebInspector.ScriptsPanel.prototype.debuggerWasDetached):
        (WebInspector.ScriptsPanel.prototype.reset):
        (WebInspector.ScriptsPanel.prototype.canShowResource):
        (WebInspector.ScriptsPanel.prototype._updatePauseOnExceptionsButton):
        (WebInspector.ScriptsPanel.prototype._updateDebuggerButtons):
        (WebInspector.ScriptsPanel.prototype._toggleDebugging):
        * inspector/front-end/View.js:
        * inspector/front-end/inspector.css:
        * inspector/front-end/inspector.html:
        * inspector/front-end/inspector.js:
        (WebInspector.addResource):
        (WebInspector.debuggerWasEnabled):
        (WebInspector.debuggerWasDisabled):

WebKit/mac:

2008-10-27  Timothy Hatcher  <timothy@apple.com>

        Rename a few methods related to attaching and detaching the debugger.

        * Rename attachDebugger to enableDebugger.
        * Rename detachDebugger to disableDebugger.
        * Rename the debuggerAttached getter to debuggerEnabled.

        Reviewed by Darin Adler.

        * WebInspector/WebInspector.mm:
        (-[WebInspector isDebuggingJavaScript]):
        (-[WebInspector startDebuggingJavaScript:]):
        (-[WebInspector stopDebuggingJavaScript:]):

WebKit/win:

2008-10-27  Timothy Hatcher  <timothy@apple.com>

        Rename a few methods related to attaching and detaching the debugger.

        * Rename attachDebugger to enableDebugger.
        * Rename detachDebugger to disableDebugger.
        * Rename the debuggerAttached getter to debuggerEnabled.

        Reviewed by Darin Adler.

        * WebInspector.cpp:
        (WebInspector::isDebuggingJavaScript):
        (WebInspector::toggleDebuggingJavaScript):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@37932 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ecd08c1e
2008-10-28 Timothy Hatcher <timothy@apple.com>
Rename a few methods related to attaching and detaching the debugger. Also
adds stub methods for enabling and disabling the profiler.
* Rename attachDebugger to enableDebugger.
* Rename detachDebugger to disableDebugger.
* Rename the debuggerAttached getter to debuggerEnabled.
* Rename the debuggerAttached callback to debuggerWasEnabled.
* Rename the debuggerDetached callback to debuggerWasDisabled.
Reviewed by Darin Adler.
* WebCore.base.exp:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::setWindowVisible):
(WebCore::InspectorController::windowScriptObjectAvailable):
(WebCore::InspectorController::close):
(WebCore::InspectorController::enableProfiler):
(WebCore::InspectorController::disableProfiler):
(WebCore::InspectorController::enableDebugger):
(WebCore::InspectorController::disableDebugger):
(WebCore::InspectorController::pauseInDebugger):
(WebCore::InspectorController::resumeDebugger):
(WebCore::InspectorController::stepOverStatementInDebugger):
(WebCore::InspectorController::stepIntoStatementInDebugger):
(WebCore::InspectorController::stepOutOfFunctionInDebugger):
* inspector/InspectorController.h:
(WebCore::InspectorController::profilerEnabled):
(WebCore::InspectorController::debuggerEnabled):
* inspector/front-end/BreakpointsSidebarPane.js:
(WebInspector.BreakpointsSidebarPane.prototype.addBreakpoint):
(WebInspector.BreakpointsSidebarPane.prototype.removeBreakpoint):
(WebInspector.BreakpointsSidebarPane.prototype._breakpointEnableChanged):
* inspector/front-end/Object.js:
* inspector/front-end/ProfilesPanel.js:
(WebInspector.ProfilesPanel):
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel):
(WebInspector.ScriptsPanel.prototype.get statusBarItems):
(WebInspector.ScriptsPanel.prototype.debuggerWasEnabled):
(WebInspector.ScriptsPanel.prototype.debuggerWasDetached):
(WebInspector.ScriptsPanel.prototype.reset):
(WebInspector.ScriptsPanel.prototype.canShowResource):
(WebInspector.ScriptsPanel.prototype._updatePauseOnExceptionsButton):
(WebInspector.ScriptsPanel.prototype._updateDebuggerButtons):
(WebInspector.ScriptsPanel.prototype._toggleDebugging):
* inspector/front-end/View.js:
* inspector/front-end/inspector.css:
* inspector/front-end/inspector.html:
* inspector/front-end/inspector.js:
(WebInspector.addResource):
(WebInspector.debuggerWasEnabled):
(WebInspector.debuggerWasDisabled):
2008-10-28 Timothy Hatcher <timothy@apple.com>
 
Fix an exception when searching the Resources panel while there
......
......@@ -379,8 +379,8 @@ __ZN7WebCore18isStartOfParagraphERKNS_15VisiblePositionE
__ZN7WebCore19CSSStyleDeclaration11setPropertyERKNS_6StringES3_Ri
__ZN7WebCore19InspectorController12attachWindowEv
__ZN7WebCore19InspectorController12detachWindowEv
__ZN7WebCore19InspectorController13stopDebuggingEv
__ZN7WebCore19InspectorController14startDebuggingEv
__ZN7WebCore19InspectorController14enableDebuggerEv
__ZN7WebCore19InspectorController15disableDebuggerEv
__ZN7WebCore19InspectorController16setWindowVisibleEbb
__ZN7WebCore19InspectorController26stopUserInitiatedProfilingEv
__ZN7WebCore19InspectorController27startUserInitiatedProfilingEv
......
......@@ -435,8 +435,8 @@ SIMPLE_INSPECTOR_CALLBACK(unloading, close);
SIMPLE_INSPECTOR_CALLBACK(attach, attachWindow);
SIMPLE_INSPECTOR_CALLBACK(detach, detachWindow);
#if ENABLE(JAVASCRIPT_DEBUGGER)
SIMPLE_INSPECTOR_CALLBACK(startDebugging, startDebugging);
SIMPLE_INSPECTOR_CALLBACK(stopDebugging, stopDebugging);
SIMPLE_INSPECTOR_CALLBACK(enableDebugger, enableDebugger);
SIMPLE_INSPECTOR_CALLBACK(disableDebugger, disableDebugger);
SIMPLE_INSPECTOR_CALLBACK(pauseInDebugger, pauseInDebugger);
SIMPLE_INSPECTOR_CALLBACK(resumeDebugger, resumeDebugger);
SIMPLE_INSPECTOR_CALLBACK(stepOverStatementInDebugger, stepOverStatementInDebugger);
......@@ -447,6 +447,8 @@ SIMPLE_INSPECTOR_CALLBACK(closeWindow, closeWindow);
SIMPLE_INSPECTOR_CALLBACK(clearMessages, clearConsoleMessages);
SIMPLE_INSPECTOR_CALLBACK(startProfiling, startUserInitiatedProfiling);
SIMPLE_INSPECTOR_CALLBACK(stopProfiling, stopUserInitiatedProfiling);
SIMPLE_INSPECTOR_CALLBACK(enableProfiler, enableProfiler);
SIMPLE_INSPECTOR_CALLBACK(disableProfiler, disableProfiler);
SIMPLE_INSPECTOR_CALLBACK(toggleNodeSearch, toggleSearchForNodeInPage);
#define BOOL_INSPECTOR_CALLBACK(jsFunction, inspectorControllerMethod) \
......@@ -458,9 +460,10 @@ static JSValueRef jsFunction(JSContextRef ctx, JSObjectRef, JSObjectRef thisObje
}
#if ENABLE(JAVASCRIPT_DEBUGGER)
BOOL_INSPECTOR_CALLBACK(debuggerAttached, debuggerAttached);
BOOL_INSPECTOR_CALLBACK(debuggerEnabled, debuggerEnabled);
BOOL_INSPECTOR_CALLBACK(pauseOnExceptions, pauseOnExceptions);
#endif
BOOL_INSPECTOR_CALLBACK(profilerEnabled, profilerEnabled);
BOOL_INSPECTOR_CALLBACK(isWindowVisible, windowVisible);
BOOL_INSPECTOR_CALLBACK(searchingForNode, searchingForNodeInPage);
......@@ -1065,9 +1068,10 @@ InspectorController::InspectorController(Page* page, InspectorClient* client)
, m_scriptContext(0)
, m_windowVisible(false)
#if ENABLE(JAVASCRIPT_DEBUGGER)
, m_debuggerAttached(false)
, m_debuggerEnabled(false)
, m_attachDebuggerWhenShown(false)
#endif
, m_profilerEnabled(false)
, m_recordingUserInitiatedProfile(false)
, m_showAfterVisible(ElementsPanel)
, m_nextIdentifier(-2)
......@@ -1280,13 +1284,13 @@ void InspectorController::setWindowVisible(bool visible, bool attached)
focusNode();
#if ENABLE(JAVASCRIPT_DEBUGGER)
if (m_attachDebuggerWhenShown)
startDebugging();
enableDebugger();
#endif
if (m_showAfterVisible != CurrentPanel)
showPanel(m_showAfterVisible);
} else {
#if ENABLE(JAVASCRIPT_DEBUGGER)
stopDebugging();
disableDebugger();
#endif
resetScriptObjects();
}
......@@ -1491,8 +1495,8 @@ void InspectorController::windowScriptObjectAvailable()
{ "attach", WebCore::attach, kJSPropertyAttributeNone },
{ "detach", WebCore::detach, kJSPropertyAttributeNone },
#if ENABLE(JAVASCRIPT_DEBUGGER)
{ "startDebugging", WebCore::startDebugging, kJSPropertyAttributeNone },
{ "stopDebugging", WebCore::stopDebugging, kJSPropertyAttributeNone },
{ "enableDebugger", WebCore::enableDebugger, kJSPropertyAttributeNone },
{ "disableDebugger", WebCore::disableDebugger, kJSPropertyAttributeNone },
{ "pauseInDebugger", WebCore::pauseInDebugger, kJSPropertyAttributeNone },
{ "resumeDebugger", WebCore::resumeDebugger, kJSPropertyAttributeNone },
{ "stepOverStatementInDebugger", WebCore::stepOverStatementInDebugger, kJSPropertyAttributeNone },
......@@ -1503,13 +1507,16 @@ void InspectorController::windowScriptObjectAvailable()
{ "clearMessages", WebCore::clearMessages, kJSPropertyAttributeNone },
{ "startProfiling", WebCore::startProfiling, kJSPropertyAttributeNone },
{ "stopProfiling", WebCore::stopProfiling, kJSPropertyAttributeNone },
{ "enableProfiler", WebCore::enableProfiler, kJSPropertyAttributeNone },
{ "disableProfiler", WebCore::disableProfiler, kJSPropertyAttributeNone },
{ "toggleNodeSearch", WebCore::toggleNodeSearch, kJSPropertyAttributeNone },
// BOOL_INSPECTOR_CALLBACK
#if ENABLE(JAVASCRIPT_DEBUGGER)
{ "debuggerAttached", WebCore::debuggerAttached, kJSPropertyAttributeNone },
{ "debuggerEnabled", WebCore::debuggerEnabled, kJSPropertyAttributeNone },
{ "pauseOnExceptions", WebCore::pauseOnExceptions, kJSPropertyAttributeNone },
#endif
{ "profilerEnabled", WebCore::profilerEnabled, kJSPropertyAttributeNone },
{ "isWindowVisible", WebCore::isWindowVisible, kJSPropertyAttributeNone },
{ "searchingForNode", WebCore::searchingForNode, kJSPropertyAttributeNone },
......@@ -1654,7 +1661,7 @@ void InspectorController::close()
stopUserInitiatedProfiling();
#if ENABLE(JAVASCRIPT_DEBUGGER)
stopDebugging();
disableDebugger();
#endif
closeWindow();
......@@ -1709,6 +1716,15 @@ void InspectorController::stopUserInitiatedProfiling()
toggleRecordButton(false);
}
void InspectorController::enableProfiler()
{
m_profilerEnabled = true;
}
void InspectorController::disableProfiler()
{
m_profilerEnabled = false;
}
static void addHeaders(JSContextRef context, JSObjectRef object, const HTTPHeaderMap& headers, JSValueRef* exception)
{
......@@ -2492,7 +2508,7 @@ void InspectorController::moveWindowBy(float x, float y) const
}
#if ENABLE(JAVASCRIPT_DEBUGGER)
void InspectorController::startDebugging()
void InspectorController::enableDebugger()
{
if (!enabled())
return;
......@@ -2507,13 +2523,13 @@ void InspectorController::startDebugging()
JavaScriptDebugServer::shared().addListener(this, m_inspectedPage);
JavaScriptDebugServer::shared().clearBreakpoints();
m_debuggerAttached = true;
m_debuggerEnabled = true;
m_attachDebuggerWhenShown = false;
callSimpleFunction(m_scriptContext, m_scriptObject, "debuggerAttached");
callSimpleFunction(m_scriptContext, m_scriptObject, "debuggerWasEnabled");
}
void InspectorController::stopDebugging()
void InspectorController::disableDebugger()
{
if (!enabled())
return;
......@@ -2521,10 +2537,10 @@ void InspectorController::stopDebugging()
ASSERT(m_inspectedPage);
JavaScriptDebugServer::shared().removeListener(this, m_inspectedPage);
m_debuggerAttached = false;
m_debuggerEnabled = false;
if (m_scriptContext && m_scriptObject)
callSimpleFunction(m_scriptContext, m_scriptObject, "debuggerDetached");
callSimpleFunction(m_scriptContext, m_scriptObject, "debuggerWasDisabled");
}
JavaScriptCallFrame* InspectorController::currentCallFrame() const
......@@ -2544,35 +2560,35 @@ void InspectorController::setPauseOnExceptions(bool pause)
void InspectorController::pauseInDebugger()
{
if (!m_debuggerAttached)
if (!m_debuggerEnabled)
return;
JavaScriptDebugServer::shared().pauseProgram();
}
void InspectorController::resumeDebugger()
{
if (!m_debuggerAttached)
if (!m_debuggerEnabled)
return;
JavaScriptDebugServer::shared().continueProgram();
}
void InspectorController::stepOverStatementInDebugger()
{
if (!m_debuggerAttached)
if (!m_debuggerEnabled)
return;
JavaScriptDebugServer::shared().stepOverStatement();
}
void InspectorController::stepIntoStatementInDebugger()
{
if (!m_debuggerAttached)
if (!m_debuggerEnabled)
return;
JavaScriptDebugServer::shared().stepIntoStatement();
}
void InspectorController::stepOutOfFunctionInDebugger()
{
if (!m_debuggerAttached)
if (!m_debuggerEnabled)
return;
JavaScriptDebugServer::shared().stepOutOfFunction();
}
......
......@@ -149,6 +149,10 @@ public:
void startUserInitiatedProfiling();
void stopUserInitiatedProfiling();
void enableProfiler();
void disableProfiler();
bool profilerEnabled() const { return m_profilerEnabled; }
bool windowVisible();
void setWindowVisible(bool visible = true, bool attached = false);
......@@ -207,9 +211,9 @@ public:
void closeWindow();
#if ENABLE(JAVASCRIPT_DEBUGGER)
void startDebugging();
void stopDebugging();
bool debuggerAttached() const { return m_debuggerAttached; }
void enableDebugger();
void disableDebugger();
bool debuggerEnabled() const { return m_debuggerEnabled; }
JavaScriptCallFrame* currentCallFrame() const;
......@@ -298,9 +302,10 @@ private:
JSContextRef m_scriptContext;
bool m_windowVisible;
#if ENABLE(JAVASCRIPT_DEBUGGER)
bool m_debuggerAttached;
bool m_debuggerEnabled;
bool m_attachDebuggerWhenShown;
#endif
bool m_profilerEnabled;
bool m_recordingUserInitiatedProfile;
SpecialPanels m_showAfterVisible;
long long m_nextIdentifier;
......
......@@ -45,7 +45,7 @@ WebInspector.BreakpointsSidebarPane.prototype = {
// FIXME: add to the breakpoints UI.
if (!InspectorController.debuggerAttached() || !breakpoint.sourceID)
if (!InspectorController.debuggerEnabled() || !breakpoint.sourceID)
return;
if (breakpoint.enabled)
......@@ -60,7 +60,7 @@ WebInspector.BreakpointsSidebarPane.prototype = {
// FIXME: remove from the breakpoints UI.
if (!InspectorController.debuggerAttached() || !breakpoint.sourceID)
if (!InspectorController.debuggerEnabled() || !breakpoint.sourceID)
return;
InspectorController.removeBreakpoint(breakpoint.sourceID, breakpoint.line);
......@@ -72,7 +72,7 @@ WebInspector.BreakpointsSidebarPane.prototype = {
// FIXME: change the breakpoint checkbox state in the UI.
if (!InspectorController.debuggerAttached() || !breakpoint.sourceID)
if (!InspectorController.debuggerEnabled() || !breakpoint.sourceID)
return;
if (breakpoint.enabled)
......
......@@ -158,10 +158,10 @@ WebInspector.ScriptsPanel = function()
this.debuggingButton.className = "status-bar-item";
this.debuggingButton.addEventListener("click", this._toggleDebugging.bind(this), false);
this.pauseOnExceptionButtons = document.createElement("button");
this.pauseOnExceptionButtons.id = "scripts-pause-on-exceptions-status-bar-item";
this.pauseOnExceptionButtons.className = "status-bar-item";
this.pauseOnExceptionButtons.addEventListener("click", this._togglePauseOnExceptions.bind(this), false);
this.pauseOnExceptionButton = document.createElement("button");
this.pauseOnExceptionButton.id = "scripts-pause-on-exceptions-status-bar-item";
this.pauseOnExceptionButton.className = "status-bar-item";
this.pauseOnExceptionButton.addEventListener("click", this._togglePauseOnExceptions.bind(this), false);
this._breakpointsURLMap = {};
......@@ -178,7 +178,7 @@ WebInspector.ScriptsPanel.prototype = {
get statusBarItems()
{
return [this.debuggingButton, this.pauseOnExceptionButtons];
return [this.debuggingButton, this.pauseOnExceptionButton];
},
get paused()
......@@ -361,12 +361,12 @@ WebInspector.ScriptsPanel.prototype = {
window.focus();
},
debuggerAttached: function()
debuggerWasEnabled: function()
{
this.reset();
},
debuggerDetached: function()
debuggerWasDisabled: function()
{
this.reset();
},
......@@ -378,7 +378,7 @@ WebInspector.ScriptsPanel.prototype = {
delete this.currentQuery;
this.searchCanceled();
if (!InspectorController.debuggerAttached()) {
if (!InspectorController.debuggerEnabled()) {
this._paused = false;
this._waitingToPause = false;
this._stepping = false;
......@@ -427,7 +427,7 @@ WebInspector.ScriptsPanel.prototype = {
canShowResource: function(resource)
{
return resource && resource.scripts.length && InspectorController.debuggerAttached();
return resource && resource.scripts.length && InspectorController.debuggerEnabled();
},
showScript: function(script, line)
......@@ -643,17 +643,17 @@ WebInspector.ScriptsPanel.prototype = {
_updatePauseOnExceptionsButton: function()
{
if (InspectorController.pauseOnExceptions()) {
this.pauseOnExceptionButtons.title = WebInspector.UIString("Don't pause on exceptions.");
this.pauseOnExceptionButtons.addStyleClass("toggled-on");
this.pauseOnExceptionButton.title = WebInspector.UIString("Don't pause on exceptions.");
this.pauseOnExceptionButton.addStyleClass("toggled-on");
} else {
this.pauseOnExceptionButtons.title = WebInspector.UIString("Pause on exceptions.");
this.pauseOnExceptionButtons.removeStyleClass("toggled-on");
this.pauseOnExceptionButton.title = WebInspector.UIString("Pause on exceptions.");
this.pauseOnExceptionButton.removeStyleClass("toggled-on");
}
},
_updateDebuggerButtons: function()
{
if (InspectorController.debuggerAttached()) {
if (InspectorController.debuggerEnabled()) {
this.debuggingButton.title = WebInspector.UIString("Stop debugging.");
this.debuggingButton.addStyleClass("toggled-on");
this.pauseButton.disabled = false;
......@@ -739,10 +739,10 @@ WebInspector.ScriptsPanel.prototype = {
this._waitingToPause = false;
this._stepping = false;
if (InspectorController.debuggerAttached())
InspectorController.stopDebugging();
if (InspectorController.debuggerEnabled())
InspectorController.disableDebugger();
else
InspectorController.startDebugging();
InspectorController.enableDebugger();
this._clearInterface();
},
......
......@@ -793,14 +793,14 @@ WebInspector.addDatabase = function(database)
this.panels.databases.addDatabase(database);
}
WebInspector.debuggerAttached = function()
WebInspector.debuggerWasEnabled = function()
{
this.panels.scripts.debuggerAttached();
this.panels.scripts.debuggerWasEnabled();
}
WebInspector.debuggerDetached = function()
WebInspector.debuggerWasDisabled = function()
{
this.panels.scripts.debuggerDetached();
this.panels.scripts.debuggerWasDisabled();
}
WebInspector.parsedScriptSource = function(sourceID, sourceURL, source, startingLine)
......
2008-10-27 Timothy Hatcher <timothy@apple.com>
Rename a few methods related to attaching and detaching the debugger.
* Rename attachDebugger to enableDebugger.
* Rename detachDebugger to disableDebugger.
* Rename the debuggerAttached getter to debuggerEnabled.
Reviewed by Darin Adler.
* WebInspector/WebInspector.mm:
(-[WebInspector isDebuggingJavaScript]):
(-[WebInspector startDebuggingJavaScript:]):
(-[WebInspector stopDebuggingJavaScript:]):
2008-10-27 Anders Carlsson <andersca@apple.com>
Reviewed by Maciej Stachowiak.
......
......@@ -70,7 +70,7 @@ using namespace WebCore;
- (BOOL)isDebuggingJavaScript
{
if (Page* page = core(_webView))
return page->inspectorController()->debuggerAttached();
return page->inspectorController()->debuggerEnabled();
return NO;
}
......@@ -88,13 +88,13 @@ using namespace WebCore;
if (!page)
return;
page->inspectorController()->showPanel(InspectorController::ScriptsPanel);
page->inspectorController()->startDebugging();
page->inspectorController()->enableDebugger();
}
- (void)stopDebuggingJavaScript:(id)sender
{
if (Page* page = core(_webView))
page->inspectorController()->stopDebugging();
page->inspectorController()->disableDebugger();
}
- (BOOL)isProfilingJavaScript
......
2008-10-27 Timothy Hatcher <timothy@apple.com>
Rename a few methods related to attaching and detaching the debugger.
* Rename attachDebugger to enableDebugger.
* Rename detachDebugger to disableDebugger.
* Rename the debuggerAttached getter to debuggerEnabled.
Reviewed by Darin Adler.
* WebInspector.cpp:
(WebInspector::isDebuggingJavaScript):
(WebInspector::toggleDebuggingJavaScript):
2008-10-24 Sam Weinig <sam@webkit.org>
 
Yet another windows build fix.
......
......@@ -159,7 +159,7 @@ HRESULT STDMETHODCALLTYPE WebInspector::isDebuggingJavaScript(BOOL* isDebugging)
if (!page)
return S_OK;
*isDebugging = page->inspectorController()->debuggerAttached();
*isDebugging = page->inspectorController()->debuggerEnabled();
return S_OK;
}
......@@ -174,11 +174,11 @@ HRESULT STDMETHODCALLTYPE WebInspector::toggleDebuggingJavaScript()
InspectorController* inspector = page->inspectorController();
if (inspector->debuggerAttached())
inspector->stopDebugging();
if (inspector->debuggerEnabled())
inspector->disableDebugger();
else {
inspector->showPanel(InspectorController::ScriptsPanel);
inspector->startDebugging();
inspector->enableDebugger();
}
return S_OK;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment