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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4ab1de6351689b63bff9d73309023271a3950656
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 17:56:33 2010 +0000

    2010-11-17  Tenghui Zhu  <ztenghui at google.com>
    
            Reviewed by Jeremy Orlow.
    
            profileCallback and profileEndCallback  should be guarded with ENABLE_JAVASCRIPT_DEBUGGER
            https://bugs.webkit.org/show_bug.cgi?id=49623
    
            No new tests. Just a compiling error fix.
    
            * bindings/v8/custom/V8ConsoleCustom.cpp:
              Add the guard ENABLE_JAVA_SCRIPT_DEBUGGER to profileCallback and profileEndCallback
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4cb79e1..7a232a4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-17  Tenghui Zhu  <ztenghui at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        profileCallback and profileEndCallback  should be guarded with ENABLE_JAVASCRIPT_DEBUGGER
+        https://bugs.webkit.org/show_bug.cgi?id=49623
+
+        No new tests. Just a compiling error fix.
+
+        * bindings/v8/custom/V8ConsoleCustom.cpp:
+          Add the guard ENABLE_JAVA_SCRIPT_DEBUGGER to profileCallback and profileEndCallback
+
 2010-11-17  John Knottenbelt  <jknotten at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp b/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp
index b17b8e9..9142ad7 100644
--- a/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp
@@ -82,6 +82,7 @@ v8::Handle<v8::Value> V8Console::assertCallback(const v8::Arguments& args)
     return v8::Handle<v8::Value>();
 }
 
+#if ENABLE(JAVASCRIPT_DEBUGGER)
 v8::Handle<v8::Value> V8Console::profileCallback(const v8::Arguments& args)
 {
     INC_STATS("DOM.Console.profile");
@@ -105,5 +106,6 @@ v8::Handle<v8::Value> V8Console::profileEndCallback(const v8::Arguments& args)
     imp->profileEnd(title, ScriptState::current(), callStack.release());
     return v8::Handle<v8::Value>();
 }
+#endif
 
 } // namespace WebCore

-- 
WebKit Debian packaging