2009-12-07 Gyuyoung Kim <gyuyoung@gmail.com>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Dec 2009 19:22:48 +0000 (19:22 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Dec 2009 19:22:48 +0000 (19:22 +0000)
        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@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: https://svn.webkit.org/repository/webkit/trunk@51783 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/GNUmakefile.am
WebKit/gtk/ChangeLog
WebKit/gtk/webkit/webkitwebinspector.cpp

index f25a04e35f8b13a5accb1c8be896cffba6ae6eaf..f2cd7a1d7698b3e473865dc0d427a8461c995bb1 100644 (file)
@@ -1,3 +1,14 @@
+2009-12-07  Gyuyoung Kim  <gyuyoung@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@apple.com>
 
         Reviewed by Darin Adler.
 2009-12-07  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Darin Adler.
index 2d8eb2f8c28713afe84b3e60132e378ed38415b2..8a6a290c67fca3a462fc5e392899a20df4695cea 100644 (file)
@@ -2112,6 +2112,10 @@ FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
 webcore_cppflags += \
        -DENABLE_JAVASCRIPT_DEBUGGER=1
 
 webcore_cppflags += \
        -DENABLE_JAVASCRIPT_DEBUGGER=1
 
+else
+webcore_cppflags += \
+       -DENABLE_JAVASCRIPT_DEBUGGER=0
+
 endif # END ENABLE_JAVASCRIPT_DEBUGGER
 
 # ----
 endif # END ENABLE_JAVASCRIPT_DEBUGGER
 
 # ----
index d3e61bf8008de07aa4b6a0d4ad8d754366c6858e..5a142b56c75060a9580efa933756858f08f5ffbb 100644 (file)
@@ -1,3 +1,16 @@
+2009-12-07  Gyuyoung Kim  <gyuyoung@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@gmail.com>
 
         Reviewed by Xan Lopez.
 2009-12-07  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
 
         Reviewed by Xan Lopez.
index 68b03b21e09b662706886de8853b77f5ae7b2be7..2feb0644a73e111f41ac589dbc1206d6c918f46d 100644 (file)
@@ -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: {
 
     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();
         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: {
         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:
         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());
         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);
         break;
     case PROP_TIMELINE_PROFILING_ENABLED:
         g_value_set_boolean(value, priv->page->inspectorController()->timelineAgent() != 0);