| 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 |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of | 13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of |
| 14 * its contributors may be used to endorse or promote products derived | 14 * its contributors may be used to endorse or promote products derived |
| 15 * from this software without specific prior written permission. | 15 * from this software without specific prior written permission. |
| 16 * | 16 * |
| 17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
| 18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
| 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 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/page/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/inspector/ConsoleAPITypes.h" | 36 #include "core/inspector/ConsoleAPITypes.h" |
| 35 #include "core/inspector/InspectorConsoleInstrumentation.h" | 37 #include "core/inspector/InspectorConsoleInstrumentation.h" |
| 36 #include "core/inspector/ScriptArguments.h" | 38 #include "core/inspector/ScriptArguments.h" |
| 37 #include "core/inspector/ScriptCallStack.h" | 39 #include "core/inspector/ScriptCallStack.h" |
| 38 #include "core/inspector/ScriptProfile.h" | 40 #include "core/inspector/ScriptProfile.h" |
| 39 #include "core/page/Chrome.h" | 41 #include "core/page/Chrome.h" |
| 40 #include "core/page/ChromeClient.h" | 42 #include "core/page/ChromeClient.h" |
| 41 #include "core/page/ConsoleBase.h" | |
| 42 #include "core/page/ConsoleTypes.h" | |
| 43 #include "core/page/Frame.h" | 43 #include "core/page/Frame.h" |
| 44 #include "core/page/MemoryInfo.h" | |
| 45 #include "core/page/Page.h" | 44 #include "core/page/Page.h" |
| 46 #include "core/page/PageConsole.h" | 45 #include "core/page/PageConsole.h" |
| 46 #include "core/timing/MemoryInfo.h" |
| 47 #include "wtf/text/CString.h" | 47 #include "wtf/text/CString.h" |
| 48 #include "wtf/text/WTFString.h" | 48 #include "wtf/text/WTFString.h" |
| 49 | 49 |
| 50 #include "platform/TraceEvent.h" | 50 #include "platform/TraceEvent.h" |
| 51 | 51 |
| 52 namespace WebCore { | 52 namespace WebCore { |
| 53 | 53 |
| 54 Console::Console(Frame* frame) | 54 Console::Console(Frame* frame) |
| 55 : DOMWindowProperty(frame) | 55 : DOMWindowProperty(frame) |
| 56 { | 56 { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 84 } | 84 } |
| 85 | 85 |
| 86 PassRefPtr<MemoryInfo> Console::memory() const | 86 PassRefPtr<MemoryInfo> Console::memory() const |
| 87 { | 87 { |
| 88 // FIXME: Because we create a new object here each time, | 88 // FIXME: Because we create a new object here each time, |
| 89 // console.memory !== console.memory, which seems wrong. | 89 // console.memory !== console.memory, which seems wrong. |
| 90 return MemoryInfo::create(m_frame); | 90 return MemoryInfo::create(m_frame); |
| 91 } | 91 } |
| 92 | 92 |
| 93 } // namespace WebCore | 93 } // namespace WebCore |
| OLD | NEW |