| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #include "core/frame/Console.h" | 30 #include "core/frame/Console.h" |
| 31 | 31 |
| 32 #include "bindings/v8/ScriptCallStackFactory.h" | 32 #include "bindings/v8/ScriptCallStackFactory.h" |
| 33 #include "bindings/v8/ScriptProfiler.h" | 33 #include "bindings/v8/ScriptProfiler.h" |
| 34 #include "core/frame/ConsoleBase.h" | |
| 35 #include "core/frame/ConsoleTypes.h" | 34 #include "core/frame/ConsoleTypes.h" |
| 36 #include "core/inspector/ConsoleAPITypes.h" | 35 #include "core/inspector/ConsoleAPITypes.h" |
| 37 #include "core/inspector/InspectorConsoleInstrumentation.h" | 36 #include "core/inspector/InspectorConsoleInstrumentation.h" |
| 38 #include "core/inspector/ScriptArguments.h" | 37 #include "core/inspector/ScriptArguments.h" |
| 39 #include "core/inspector/ScriptCallStack.h" | 38 #include "core/inspector/ScriptCallStack.h" |
| 40 #include "core/inspector/ScriptProfile.h" | 39 #include "core/inspector/ScriptProfile.h" |
| 41 #include "core/page/Chrome.h" | 40 #include "core/page/Chrome.h" |
| 42 #include "core/page/ChromeClient.h" | 41 #include "core/page/ChromeClient.h" |
| 43 #include "core/frame/Frame.h" | 42 #include "core/frame/Frame.h" |
| 44 #include "core/page/Page.h" | 43 #include "core/page/Page.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 } | 83 } |
| 85 | 84 |
| 86 PassRefPtr<MemoryInfo> Console::memory() const | 85 PassRefPtr<MemoryInfo> Console::memory() const |
| 87 { | 86 { |
| 88 // FIXME: Because we create a new object here each time, | 87 // FIXME: Because we create a new object here each time, |
| 89 // console.memory !== console.memory, which seems wrong. | 88 // console.memory !== console.memory, which seems wrong. |
| 90 return MemoryInfo::create(m_frame); | 89 return MemoryInfo::create(m_frame); |
| 91 } | 90 } |
| 92 | 91 |
| 93 } // namespace WebCore | 92 } // namespace WebCore |
| OLD | NEW |