[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2c6aa742319d6fc6337f4636514cbf5b6f39aaf5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 7 19:22:48 2009 +0000

    2009-12-07  Gyuyoung Kim  <gyuyoung at gmail.com>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=32024
            [GTK] WebKit does not compile without JAVASCRIPT_DEBUGGER
    
            Fix build errors when javascript-debugger is disabled on GTK
    
            * GNUmakefile.am:
    2009-12-07  Gyuyoung Kim  <gyuyoung at gmail.com>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=32024
            [GTK] WebKit does not compile without JAVASCRIPT_DEBUGGER
    
            Fix build errors when javascript-debugger is disabled on GTK
    
            * webkit/webkitwebinspector.cpp:
            (webkit_web_inspector_set_property):
            (webkit_web_inspector_get_property):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51783 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f25a04e..f2cd7a1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-07  Gyuyoung Kim  <gyuyoung at gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32024
+        [GTK] WebKit does not compile without JAVASCRIPT_DEBUGGER
+
+        Fix build errors when javascript-debugger is disabled on GTK
+
+        * GNUmakefile.am:
+
 2009-12-07  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 2d8eb2f..8a6a290 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2112,6 +2112,10 @@ FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
 webcore_cppflags += \
 	-DENABLE_JAVASCRIPT_DEBUGGER=1
 
+else
+webcore_cppflags += \
+	-DENABLE_JAVASCRIPT_DEBUGGER=0
+
 endif # END ENABLE_JAVASCRIPT_DEBUGGER
 
 # ----
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index d3e61bf..5a142b5 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-07  Gyuyoung Kim  <gyuyoung at gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32024
+        [GTK] WebKit does not compile without JAVASCRIPT_DEBUGGER
+
+        Fix build errors when javascript-debugger is disabled on GTK
+
+        * webkit/webkitwebinspector.cpp:
+        (webkit_web_inspector_set_property):
+        (webkit_web_inspector_get_property):
+
 2009-12-07  Joanmarie Diggs  <joanmarie.diggs at gmail.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebinspector.cpp b/WebKit/gtk/webkit/webkitwebinspector.cpp
index 68b03b2..2feb064 100644
--- a/WebKit/gtk/webkit/webkitwebinspector.cpp
+++ b/WebKit/gtk/webkit/webkitwebinspector.cpp
@@ -346,12 +346,16 @@ static void webkit_web_inspector_set_property(GObject* object, guint prop_id, co
 
     switch(prop_id) {
     case PROP_JAVASCRIPT_PROFILING_ENABLED: {
+#if ENABLE(JAVASCRIPT_DEBUGGER)
         bool enabled = g_value_get_boolean(value);
         WebCore::InspectorController* controller = priv->page->inspectorController();
         if (enabled)
             controller->enableProfiler();
         else
             controller->disableProfiler();
+#else
+        g_message("PROP_JAVASCRIPT_PROFILING_ENABLED is not work because of the javascript debugger is disabled\n");
+#endif
         break;
     }
     case PROP_TIMELINE_PROFILING_ENABLED: {
@@ -382,7 +386,11 @@ static void webkit_web_inspector_get_property(GObject* object, guint prop_id, GV
         g_value_set_string(value, priv->inspected_uri);
         break;
     case PROP_JAVASCRIPT_PROFILING_ENABLED:
+#if ENABLE(JAVASCRIPT_DEBUGGER)
         g_value_set_boolean(value, priv->page->inspectorController()->profilerEnabled());
+#else
+        g_message("PROP_JAVASCRIPT_PROFILING_ENABLED is not work because of the javascript debugger is disabled\n");
+#endif
         break;
     case PROP_TIMELINE_PROFILING_ENABLED:
         g_value_set_boolean(value, priv->page->inspectorController()->timelineAgent() != 0);

-- 
WebKit Debian packaging