[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
eric at webkit.org
eric at webkit.org
Thu Dec 3 13:39:42 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit de5fd93f4e69ce3096e2c314e836e9202120435a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 19 00:26:58 2009 +0000
2009-11-18 Mikhail Naganov <mnaganov at chromium.org>
Reviewed by Eric Seidel.
Fix Qt build without JavaScript debugger.
https://bugs.webkit.org/show_bug.cgi?id=31575
* page/Console.idl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51153 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 48c60bd..2efef21 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-18 Mikhail Naganov <mnaganov at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Fix Qt build without JavaScript debugger.
+
+ https://bugs.webkit.org/show_bug.cgi?id=31575
+
+ * page/Console.idl:
+
2009-11-18 Daniel Bates <dbates at webkit.org>
Reviewed by Dave Hyatt.
diff --git a/WebCore/page/Console.idl b/WebCore/page/Console.idl
index 577dc7f..a31b605 100644
--- a/WebCore/page/Console.idl
+++ b/WebCore/page/Console.idl
@@ -50,8 +50,10 @@ module window {
[DontEnum] DOMString lastWMLErrorMessage();
#endif
+#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER || defined(V8_BINDING) && V8_BINDING
[Custom] void profile(in [ConvertUndefinedOrNullToNullString] DOMString title);
[Custom] void profileEnd(in [ConvertUndefinedOrNullToNullString] DOMString title);
+#endif
void time(in [ConvertUndefinedOrNullToNullString] DOMString title);
[CustomArgumentHandling] void timeEnd(in [ConvertUndefinedOrNullToNullString] DOMString title);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list