[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4da257937ad9a99bbf899b933f5654ef03d1ee21
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 12:05:37 2010 +0000

    2010-02-05  Mikhail Naganov  <mnaganov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Enable JAVASCRIPT_DEBUGGER in chromium port.
    
            https://bugs.webkit.org/show_bug.cgi?id=34638
    
            * page/Console.cpp:
            * page/Console.h:
            * page/Console.idl:
    2010-02-05  Mikhail Naganov  <mnaganov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Enable JAVASCRIPT_DEBUGGER in chromium port.
    
            https://bugs.webkit.org/show_bug.cgi?id=34638
    
            * features.gypi:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54417 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fbe8796..f52c9c5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-05  Mikhail Naganov  <mnaganov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Enable JAVASCRIPT_DEBUGGER in chromium port.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34638
+
+        * page/Console.cpp:
+        * page/Console.h:
+        * page/Console.idl:
+
 2010-02-05  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/page/Console.cpp b/WebCore/page/Console.cpp
index 8f55c78..13595a1 100644
--- a/WebCore/page/Console.cpp
+++ b/WebCore/page/Console.cpp
@@ -312,9 +312,7 @@ String Console::lastWMLErrorMessage() const
 }
 #endif
 
-// FIXME: "USE(V8)" and "USE(JSC)" below are temporary measures until JAVASCRIPT_DEBUGGER is
-// enabled when building Chromium.
-#if ENABLE(JAVASCRIPT_DEBUGGER) || USE(V8)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
 
 void Console::profile(const String& title, ScriptCallStack* callStack)
 {
diff --git a/WebCore/page/Console.h b/WebCore/page/Console.h
index bbf2ac7..9a6d88c 100644
--- a/WebCore/page/Console.h
+++ b/WebCore/page/Console.h
@@ -38,9 +38,7 @@
 
 namespace WebCore {
 
-// FIXME: "USE(V8)" and "USE(JSC)" below are temporary measures until JAVASCRIPT_DEBUGGER is
-// enabled when building Chromium.
-#if ENABLE(JAVASCRIPT_DEBUGGER) || USE(V8)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
 typedef Vector<RefPtr<ScriptProfile> > ProfilesArray;
 #endif
 
@@ -99,7 +97,7 @@ public:
 #if ENABLE(WML)
     String lastWMLErrorMessage() const;
 #endif
-#if ENABLE(JAVASCRIPT_DEBUGGER) || USE(V8)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
     void profile(const String&, ScriptCallStack*);
     void profileEnd(const String&, ScriptCallStack*);
 #endif
@@ -122,7 +120,7 @@ private:
     Console(Frame*);
 
     Frame* m_frame;
-#if ENABLE(JAVASCRIPT_DEBUGGER) || USE(V8)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
     ProfilesArray m_profiles;
 #endif
 };
diff --git a/WebCore/page/Console.idl b/WebCore/page/Console.idl
index 290235b..b3c0c24 100644
--- a/WebCore/page/Console.idl
+++ b/WebCore/page/Console.idl
@@ -50,7 +50,7 @@ module window {
         [DontEnum] DOMString lastWMLErrorMessage();
 #endif
 
-#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER || defined(V8_BINDING) && V8_BINDING
+#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
         [CustomArgumentHandling] void profile(in [ConvertUndefinedOrNullToNullString] DOMString title);
         [CustomArgumentHandling] void profileEnd(in [ConvertUndefinedOrNullToNullString] DOMString title);
 #endif
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 7396b4a..607c4fb 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-05  Mikhail Naganov  <mnaganov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Enable JAVASCRIPT_DEBUGGER in chromium port.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34638
+
+        * features.gypi:
+
 2010-02-04  Yaar Schnitman  <yaar at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index da2386b..7465fb1 100644
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -47,7 +47,6 @@
         'ENABLE_DASHBOARD_SUPPORT=0',
         'ENABLE_DOM_STORAGE=1',
         'ENABLE_GEOLOCATION=1',
-        'ENABLE_JAVASCRIPT_DEBUGGER=0',
         'ENABLE_JSC_MULTIPLE_THREADS=0',
         'ENABLE_ICONDATABASE=0',
         'ENABLE_INDEXED_DATABASE=1',

-- 
WebKit Debian packaging