[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0b1ae099bafc9996f415e8bf61b12b53d280bb26
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 22 16:57:45 2010 +0000

    Make WebKit2 compile with ENABLE_JAVASCRIPT_DEBUGGER=0
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2010-11-22
    Reviewed by Andreas Kling.
    
    * WebProcess/WebPage/WebInspector.cpp: Add missing ENABLE(JAVASCRIPT_DEBUGGER) guards.
    (WebKit::WebInspector::startJavaScriptDebugging):
    (WebKit::WebInspector::stopJavaScriptDebugging):
    (WebKit::WebInspector::startJavaScriptProfiling):
    (WebKit::WebInspector::stopJavaScriptProfiling):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72532 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ee282af..57a90eb 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-22  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Make WebKit2 compile with ENABLE_JAVASCRIPT_DEBUGGER=0
+
+        * WebProcess/WebPage/WebInspector.cpp: Add missing ENABLE(JAVASCRIPT_DEBUGGER) guards.
+        (WebKit::WebInspector::startJavaScriptDebugging):
+        (WebKit::WebInspector::stopJavaScriptDebugging):
+        (WebKit::WebInspector::startJavaScriptProfiling):
+        (WebKit::WebInspector::stopJavaScriptProfiling):
+
 2010-11-21  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit2/WebProcess/WebPage/WebInspector.cpp b/WebKit2/WebProcess/WebPage/WebInspector.cpp
index 028de08..a7374dd 100644
--- a/WebKit2/WebProcess/WebPage/WebInspector.cpp
+++ b/WebKit2/WebProcess/WebPage/WebInspector.cpp
@@ -91,24 +91,32 @@ void WebInspector::showConsole()
 
 void WebInspector::startJavaScriptDebugging()
 {
+#if ENABLE(JAVASCRIPT_DEBUGGER)
     m_page->corePage()->inspectorController()->showPanel(InspectorController::ScriptsPanel);
     m_page->corePage()->inspectorController()->enableDebugger();
+#endif
 }
 
 void WebInspector::stopJavaScriptDebugging()
 {
+#if ENABLE(JAVASCRIPT_DEBUGGER)
     m_page->corePage()->inspectorController()->disableDebugger();
+#endif
 }
 
 void WebInspector::startJavaScriptProfiling()
 {
+#if ENABLE(JAVASCRIPT_DEBUGGER)
     m_page->corePage()->inspectorController()->startUserInitiatedProfiling();
+#endif
 }
 
 void WebInspector::stopJavaScriptProfiling()
 {
+#if ENABLE(JAVASCRIPT_DEBUGGER)
     m_page->corePage()->inspectorController()->stopUserInitiatedProfiling();
     m_page->corePage()->inspectorController()->showPanel(InspectorController::ProfilesPanel);
+#endif
 }
 
 void WebInspector::startPageProfiling()

-- 
WebKit Debian packaging