Add #if ENABLE(JAVASCRIPT_DEBUGGER), part 2.

webkit/port/page/inspector/InspectorController.cpp

 /*
  * Copyright (C) 2007 Google Inc. All rights reserved.
  * Authors: Collin Jackson, Adam Barth
  *
  * This is the V8 version of the KJS InspectorController, which is located in
  * webkit/pending.
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 40 matching lines @@
 #include "FloatRect.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "HTMLFrameOwnerElement.h"
 #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"
 #include "ResourceResponse.h"
 #include "ScriptCallContext.h"
 #include "ScriptController.h"
 #include "Settings.h"
 #include "SharedBuffer.h"
 #include "SystemTime.h"
 #include "TextEncoding.h"
 #include "TextIterator.h"
 #include <wtf/RefCounted.h>
 
 #if ENABLE(DATABASE)
 #include "Database.h"
 #include "JSDatabase.h"
 #endif
 
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+#include "JavaScriptDebugServer.h"
+#endif
+
 namespace WebCore {
 
 // Maximum size of the console message cache.
 static const size_t MAX_CONSOLE_MESSAGES = 250;
 
 namespace bug1228513 {
   // TODO(ericroman): Temporary hacks to help diagnose http://b/1228513
 
   // To remove all these hacks, search for "bug1228513"
   // in InspectorController.{cpp,h}
@@ skipping 514 matching lines @@
       // version uses an OwnPtr (http://b/904340).  However, since we're not
       // using a create method to initialize the InspectorController, we need
       // to start the RefCount at 0.
       RefCounted<InspectorController>(0)
     , m_bug1228513_inspectorState(bug1228513::VALID)
     , m_trackResources(false)
     , m_inspectedPage(page)
     , 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)
     , m_groupLevel(0)
 {
     ASSERT_ARG(page, page);
     ASSERT_ARG(client, client);
 }
 
 InspectorController::~InspectorController()
@@ skipping 121 matching lines @@
     m_windowVisible = visible;
 
     if (!hasScriptObject())
         return;
 
     if (m_windowVisible) {
         setAttachedWindow(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();
     }
 
     m_showAfterVisible = CurrentPanel;
 }
 
 void InspectorController::enableTrackResources(bool trackResources)
 {
     if (m_trackResources == trackResources)
         return;
@@ skipping 220 matching lines @@
     }
 }
 
 void InspectorController::close()
 {
     if (!enabled())
         return;
 
     ++bug1228513::g_totalNumClose;
 
-    stopDebugging(); 
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+    stopDebugging();
+#endif
     closeWindow();
     if (m_page) {
         v8::HandleScope handle_scope;
         v8::Handle<v8::Context> context = V8Proxy::GetContext(m_page->mainFrame());
         v8::Context::Scope scope(context);
         setScriptObject(v8::Handle<v8::Object>());
     }
 
     m_page = 0;
 }
@@ skipping 593 matching lines @@
 void InspectorController::moveWindowBy(float x, float y) const
 {
     if (!m_page || !enabled())
         return;
 
     FloatRect frameRect = m_page->chrome()->windowRect();
     frameRect.move(x, y);
     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;
     static const Color outlineColor(62, 86, 180, 228);
 
     IntRect outline = rect;
     outline.inflate(outlineThickness);
 
     context.clearRect(outline);
 
@@ skipping 87 matching lines @@
         element->scrollIntoViewIfNeeded();
         overlayRect = view->visibleContentRect();
     }
 
     context.translate(-overlayRect.x(), -overlayRect.y());
 
     drawHighlightForBoxes(context, lineBoxRects, contentBox, paddingBox, borderBox, marginBox);
 }
 
 } // namespace WebCore