Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: webkit/port/page/inspector/InspectorController.cpp

Issue 8116: Add #if ENABLE(JAVASCRIPT_DEBUGGER), part 2. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/build/webkit_common_defines.vsprops ('k') | webkit/port/platform/chromium/TemporaryLinkStubs.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/port/page/inspector/InspectorController.cpp
===================================================================
--- webkit/port/page/inspector/InspectorController.cpp (revision 3790)
+++ webkit/port/page/inspector/InspectorController.cpp (working copy)
@@ -58,10 +58,6 @@
#include "InspectorClient.h"
#include "v8_proxy.h"
#include "v8_binding.h"
-// TODO(ojan): Import this and enable the JavaScriptDebugServer in the code below.
-// We need to do this once we start adding debugger hooks or when we do the next
-// full webkit merge, whichever comes first.
-// #include "JavaScriptDebugServer.h"
#include "Page.h"
#include "Range.h"
#include "ResourceRequest.h"
@@ -80,6 +76,10 @@
#include "JSDatabase.h"
#endif
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+#include "JavaScriptDebugServer.h"
+#endif
+
namespace WebCore {
// Maximum size of the console message cache.
@@ -614,8 +614,10 @@
, m_client(client)
, m_page(0)
, m_windowVisible(false)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
, m_debuggerAttached(false)
, m_attachDebuggerWhenShown(false)
+#endif
, m_recordingUserInitiatedProfile(false)
, m_showAfterVisible(ElementsPanel)
, m_nextIdentifier(-2)
@@ -757,12 +759,16 @@
populateScriptObjects();
if (m_nodeToFocus)
focusNode();
+#if ENABLE(JAVASCRIPT_DEBUGGER)
if (m_attachDebuggerWhenShown)
- startDebuggingAndReloadInspectedPage();
+ startDebuggingAndReloadInspectedPage();
+#endif
if (m_showAfterVisible != CurrentPanel)
showPanel(m_showAfterVisible);
} else {
- stopDebugging();
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+ stopDebugging();
+#endif
resetScriptObjects();
}
@@ -1003,7 +1009,9 @@
++bug1228513::g_totalNumClose;
- stopDebugging();
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+ stopDebugging();
+#endif
closeWindow();
if (m_page) {
v8::HandleScope handle_scope;
@@ -1617,16 +1625,6 @@
m_page->chrome()->setWindowRect(frameRect);
}
-void InspectorController::startDebuggingAndReloadInspectedPage()
-{
- notImplemented();
-}
-
-void InspectorController::stopDebugging()
-{
- notImplemented();
-}
-
static void drawOutlinedRect(GraphicsContext& context, const IntRect& rect, const Color& fillColor)
{
static const int outlineThickness = 1;
« no previous file with comments | « webkit/build/webkit_common_defines.vsprops ('k') | webkit/port/platform/chromium/TemporaryLinkStubs.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698