[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
pfeldman at chromium.org
pfeldman at chromium.org
Sun Feb 20 23:06:08 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 78371b25b0cc8970652815c2121f86f53c228f8e
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 17 14:31:13 2011 +0000
2011-01-17 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: simplify debugger enabling routine.
https://bugs.webkit.org/show_bug.cgi?id=52472
* inspector/Inspector.idl:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::restoreDebugger):
(WebCore::InspectorController::showAndEnableDebugger):
(WebCore::InspectorController::enableDebugger):
* inspector/InspectorController.h:
* inspector/front-end/DebuggerModel.js:
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype.show):
(WebInspector.ScriptsPanel.prototype._toggleDebugging):
2011-01-17 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: simplify debugger enabling routine.
https://bugs.webkit.org/show_bug.cgi?id=52472
* WebInspector/WebInspector.mm:
(-[WebInspector startDebuggingJavaScript:]):
2011-01-17 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: simplify debugger enabling routine.
https://bugs.webkit.org/show_bug.cgi?id=52472
* WebInspector.cpp:
(WebInspector::toggleDebuggingJavaScript):
2011-01-17 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: simplify debugger enabling routine.
https://bugs.webkit.org/show_bug.cgi?id=52472
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::startJavaScriptDebugging):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75939 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ada7216..fb20e73 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-17 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: simplify debugger enabling routine.
+ https://bugs.webkit.org/show_bug.cgi?id=52472
+
+ * inspector/Inspector.idl:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::restoreDebugger):
+ (WebCore::InspectorController::showAndEnableDebugger):
+ (WebCore::InspectorController::enableDebugger):
+ * inspector/InspectorController.h:
+ * inspector/front-end/DebuggerModel.js:
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype.show):
+ (WebInspector.ScriptsPanel.prototype._toggleDebugging):
+
2011-01-17 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index a77730e..cac7485 100644
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1350,7 +1350,7 @@ __ZN7WebCore15InspectorClient31doDispatchMessageOnFrontendPageEPNS_4PageERKN3WTF
__ZN7WebCore19InspectorController12ConsolePanelE
__ZN7WebCore19InspectorController12ScriptsPanelE
__ZN7WebCore19InspectorController13ProfilesPanelE
-__ZN7WebCore19InspectorController14enableDebuggerEv
+__ZN7WebCore19InspectorController21showAndEnableDebuggerEv
__ZN7WebCore19InspectorController14enableProfilerEbb
__ZN7WebCore19InspectorController15disableDebuggerEb
__ZN7WebCore19InspectorController15disableProfilerEb
diff --git a/Source/WebCore/inspector/Inspector.idl b/Source/WebCore/inspector/Inspector.idl
index 05c8849..6563508 100644
--- a/Source/WebCore/inspector/Inspector.idl
+++ b/Source/WebCore/inspector/Inspector.idl
@@ -221,7 +221,7 @@ module core {
// Debugger API
///////////////////////////////////////////////////////////////////////
- [domain=Inspector] void enableDebuggerFromFrontend(in boolean always);
+ [domain=Inspector] void enableDebugger(in boolean always);
[domain=Inspector] void disableDebugger(in boolean always);
[domain=Inspector] void setStickyBreakpoints(in Object breakpoints);
@@ -229,8 +229,6 @@ module core {
[notify, domain=Debugger] void debuggerWasEnabled();
[notify, domain=Debugger] void debuggerWasDisabled();
- [notify, domain=Debugger] void attachDebuggerWhenShown(); // FIXME: do something with this eventually.
-
[notify, domain=Debugger] void parsedScriptSource(out String sourceID, out String url, out int lineOffset, out int columnOffset, out int scriptWorldType);
[notify, domain=Debugger] void failedToParseScriptSource(out String url, out String data, out int firstLine, out int errorLine, out String errorMessage);
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
index 4cf6b4b..aa0bec6 100644
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -582,11 +582,9 @@ void InspectorController::restoreDebugger()
{
ASSERT(m_frontend);
#if ENABLE(JAVASCRIPT_DEBUGGER)
- if (InspectorDebuggerAgent::isDebuggerAlwaysEnabled())
- enableDebuggerFromFrontend(false);
- else {
- if (m_settings->getBoolean(InspectorSettings::DebuggerAlwaysEnabled) || m_attachDebuggerWhenShown)
- enableDebugger();
+ if (InspectorDebuggerAgent::isDebuggerAlwaysEnabled() || m_attachDebuggerWhenShown || m_settings->getBoolean(InspectorSettings::DebuggerAlwaysEnabled)) {
+ enableDebugger(false);
+ m_attachDebuggerWhenShown = false;
}
#endif
}
@@ -1036,7 +1034,22 @@ void InspectorController::disableProfiler(bool always)
#endif
#if ENABLE(JAVASCRIPT_DEBUGGER)
-void InspectorController::enableDebuggerFromFrontend(bool always)
+void InspectorController::showAndEnableDebugger()
+{
+ if (!enabled())
+ return;
+
+ if (debuggerEnabled())
+ return;
+
+ if (!m_frontend) {
+ m_attachDebuggerWhenShown = true;
+ showPanel(ScriptsPanel);
+ } else
+ enableDebugger(false);
+}
+
+void InspectorController::enableDebugger(bool always)
{
ASSERT(!debuggerEnabled());
if (always)
@@ -1051,22 +1064,6 @@ void InspectorController::enableDebuggerFromFrontend(bool always)
m_frontend->debuggerWasEnabled();
}
-void InspectorController::enableDebugger()
-{
- if (!enabled())
- return;
-
- if (debuggerEnabled())
- return;
-
- if (!m_frontend)
- m_attachDebuggerWhenShown = true;
- else {
- m_frontend->attachDebuggerWhenShown();
- m_attachDebuggerWhenShown = false;
- }
-}
-
void InspectorController::disableDebugger(bool always)
{
if (!enabled())
diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h
index 39d7f90..37ba25b 100644
--- a/Source/WebCore/inspector/InspectorController.h
+++ b/Source/WebCore/inspector/InspectorController.h
@@ -215,7 +215,8 @@ public:
void disableProfiler(bool always = false);
bool profilerEnabled() const;
- void enableDebugger();
+ void showAndEnableDebugger();
+ void enableDebugger(bool always);
void disableDebugger(bool always = false);
bool debuggerEnabled() const { return m_debuggerAgent; }
void resume();
@@ -273,7 +274,6 @@ private:
#if ENABLE(JAVASCRIPT_DEBUGGER)
void toggleRecordButton(bool);
- void enableDebuggerFromFrontend(bool always);
void restoreStickyBreakpoints();
void restoreStickyBreakpoint(PassRefPtr<InspectorObject> breakpoint);
#endif
diff --git a/Source/WebCore/inspector/front-end/DebuggerModel.js b/Source/WebCore/inspector/front-end/DebuggerModel.js
index b056e30..8f5bcf7 100644
--- a/Source/WebCore/inspector/front-end/DebuggerModel.js
+++ b/Source/WebCore/inspector/front-end/DebuggerModel.js
@@ -224,11 +224,6 @@ WebInspector.DebuggerDispatcher.prototype = {
this._debuggerModel._resumedScript();
},
- attachDebuggerWhenShown: function()
- {
- WebInspector.panels.scripts.attachDebuggerWhenShown();
- },
-
debuggerWasEnabled: function()
{
WebInspector.panels.scripts.debuggerWasEnabled();
diff --git a/Source/WebCore/inspector/front-end/ScriptsPanel.js b/Source/WebCore/inspector/front-end/ScriptsPanel.js
index 82c1b39..32212d4 100644
--- a/Source/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/Source/WebCore/inspector/front-end/ScriptsPanel.js
@@ -218,11 +218,6 @@ WebInspector.ScriptsPanel.prototype = {
if (this.visibleView)
this.visibleView.show(this.viewsContainerElement);
-
- if (this._attachDebuggerWhenShown) {
- InspectorBackend.enableDebuggerFromFrontend(false);
- delete this._attachDebuggerWhenShown;
- }
},
hide: function()
@@ -395,15 +390,6 @@ WebInspector.ScriptsPanel.prototype = {
this._clearInterface();
},
- attachDebuggerWhenShown: function()
- {
- if (this.element.parentElement) {
- InspectorBackend.enableDebuggerFromFrontend(false);
- } else {
- this._attachDebuggerWhenShown = true;
- }
- },
-
debuggerWasEnabled: function()
{
if (this._debuggerEnabled)
@@ -863,7 +849,7 @@ WebInspector.ScriptsPanel.prototype = {
if (this._debuggerEnabled)
InspectorBackend.disableDebugger(true);
else
- InspectorBackend.enableDebuggerFromFrontend(!!optionalAlways);
+ InspectorBackend.enableDebugger(!!optionalAlways);
},
_togglePauseOnExceptions: function()
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 9169abb..0646b13 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-17 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: simplify debugger enabling routine.
+ https://bugs.webkit.org/show_bug.cgi?id=52472
+
+ * WebInspector/WebInspector.mm:
+ (-[WebInspector startDebuggingJavaScript:]):
+
2011-01-16 Dan Bernstein <mitz at apple.com>
Reviewed by Simon Fraser.
diff --git a/Source/WebKit/mac/WebInspector/WebInspector.mm b/Source/WebKit/mac/WebInspector/WebInspector.mm
index f109e15..8ab049f 100644
--- a/Source/WebKit/mac/WebInspector/WebInspector.mm
+++ b/Source/WebKit/mac/WebInspector/WebInspector.mm
@@ -96,8 +96,7 @@ using namespace WebCore;
Page* page = core(_webView);
if (!page)
return;
- page->inspectorController()->showPanel(InspectorController::ScriptsPanel);
- page->inspectorController()->enableDebugger();
+ page->inspectorController()->showAndEnableDebugger();
}
- (void)stopDebuggingJavaScript:(id)sender
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 318ae95..1c30ba1 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-17 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: simplify debugger enabling routine.
+ https://bugs.webkit.org/show_bug.cgi?id=52472
+
+ * WebInspector.cpp:
+ (WebInspector::toggleDebuggingJavaScript):
+
2011-01-16 Adam Barth <abarth at webkit.org>
Rubber-stamped by Eric Seidel.
diff --git a/Source/WebKit/win/WebInspector.cpp b/Source/WebKit/win/WebInspector.cpp
index 0337711..c3823b2 100644
--- a/Source/WebKit/win/WebInspector.cpp
+++ b/Source/WebKit/win/WebInspector.cpp
@@ -170,10 +170,8 @@ HRESULT STDMETHODCALLTYPE WebInspector::toggleDebuggingJavaScript()
if (inspector->debuggerEnabled())
inspector->disableDebugger();
- else {
- inspector->showPanel(InspectorController::ScriptsPanel);
- inspector->enableDebugger();
- }
+ else
+ inspector->showAndEnableDebugger();
return S_OK;
}
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index ef94588..a8c5a20 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-17 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: simplify debugger enabling routine.
+ https://bugs.webkit.org/show_bug.cgi?id=52472
+
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::startJavaScriptDebugging):
+
2011-01-17 Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Andreas Kling.
diff --git a/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp b/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp
index ad294f6..559b8b6 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp
@@ -99,8 +99,7 @@ void WebInspector::showConsole()
void WebInspector::startJavaScriptDebugging()
{
#if ENABLE(JAVASCRIPT_DEBUGGER)
- m_page->corePage()->inspectorController()->showPanel(InspectorController::ScriptsPanel);
- m_page->corePage()->inspectorController()->enableDebugger();
+ m_page->corePage()->inspectorController()->showAndEnableDebugger();
#endif
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list