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

5 files changed, 17 insertions, 54 deletions

diff --git a/DEPS b/DEPS
index c8d5bea..0c479c8 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@63",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@3784",
+    "/trunk/deps/third_party/WebKit@3847",
 
   "src/third_party/cygwin":
     "/trunk/deps/third_party/cygwin@3248",
diff --git a/webkit/build/KJSBindings/KJSBindings.vcproj b/webkit/build/KJSBindings/KJSBindings.vcproj
index 595611c..aaf3ccfd 100644
--- a/webkit/build/KJSBindings/KJSBindings.vcproj
+++ b/webkit/build/KJSBindings/KJSBindings.vcproj
@@ -1029,14 +1029,6 @@
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\JSJavaScriptCallFrame.cpp"
-				>
-			</File>
-			<File
-				RelativePath="$(IntDir)\DerivedSources\JSJavaScriptCallFrame.h"
-				>
-			</File>
-			<File
 				RelativePath="$(IntDir)\DerivedSources\JSKeyboardEvent.cpp"
 				>
 			</File>
@@ -2581,26 +2573,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptCallFrame.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptCallFrame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptDebugListener.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptDebugServer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptDebugServer.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfile.cpp"
 				>
 			</File>
@@ -3010,10 +2982,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSJavaScriptCallFrameCustom.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSLocationCustom.cpp"
 			>
 		</File>
diff --git a/webkit/build/webkit_common_defines.vsprops b/webkit/build/webkit_common_defines.vsprops
index e95e4fe..7f42fc2 100644
--- a/webkit/build/webkit_common_defines.vsprops
+++ b/webkit/build/webkit_common_defines.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="ENABLE_DATABASE=0;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;WEBCORE_NAVIGATOR_PLATFORM=&quot;\&quot;Win32\&quot;&quot;;USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1;"
+		PreprocessorDefinitions="ENABLE_DATABASE=0;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JAVASCRIPT_DEBUGGER=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;WEBCORE_NAVIGATOR_PLATFORM=&quot;\&quot;Win32\&quot;&quot;;USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1;"
 	/>
 </VisualStudioPropertySheet>
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