Add #if ENABLE(JAVASCRIPT_DEBUGGER), part 2.

Review URL: http://codereview.chromium.org/8116

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3850 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 20 deletions

diff --git a/webkit/port/page/inspector/InspectorController.cpp b/webkit/port/page/inspector/InspectorController.cpp
index ede3b0b..901a97d 100644
--- a/webkit/port/page/inspector/InspectorController.cpp
+++ b/webkit/port/page/inspector/InspectorController.cpp
@@ -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 @@ InspectorController::InspectorController(Page* page, InspectorClient* client)
     , 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 @@ void InspectorController::setWindowVisible(bool visible, bool attached)
         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 @@ void InspectorController::close()
 
     ++bug1228513::g_totalNumClose;
 
-    stopDebugging(); 
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+    stopDebugging();
+#endif
     closeWindow();
     if (m_page) {
         v8::HandleScope handle_scope;
@@ -1617,16 +1625,6 @@ void InspectorController::moveWindowBy(float x, float y) const
     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;
diff --git a/webkit/port/platform/chromium/TemporaryLinkStubs.cpp b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
index 022eb81..5ac7c3a 100644
--- a/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
+++ b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp
@@ -57,9 +57,6 @@ void scheduleDispatchFunctionsOnMainThread() { notImplemented(); }
 
 #if USE(JSC)
 #include "EventLoop.h"
-#include "PluginView.h"
 
 void EventLoop::cycle() { notImplemented(); }
-
-void PluginView::setJavaScriptPaused(bool) { notImplemented(); }
 #endif