diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/page/Console.idl | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/page/Console.idl')
| -rw-r--r-- | WebCore/page/Console.idl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/page/Console.idl b/WebCore/page/Console.idl index 1506210..52528f1 100644 --- a/WebCore/page/Console.idl +++ b/WebCore/page/Console.idl @@ -41,8 +41,8 @@ module window { [CustomArgumentHandling] void warn(); [CustomArgumentHandling] void dir(); [CustomArgumentHandling] void dirxml(); - [CustomArgumentHandling] void trace(); - [CustomArgumentHandling, ImplementationFunction=assertCondition] void assert(in boolean condition); + [V8Custom, CustomArgumentHandling] void trace(); + [V8Custom, CustomArgumentHandling, ImplementationFunction=assertCondition] void assert(in boolean condition); [CustomArgumentHandling] void count(); [CustomArgumentHandling] void markTimeline(); @@ -61,7 +61,7 @@ module window { [CustomArgumentHandling] void groupCollapsed(); void groupEnd(); - readonly attribute [CustomGetter] MemoryInfo memory; + readonly attribute MemoryInfo memory; }; } |