| 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 22 matching lines...) Expand all Loading... |
| 33 #include "core/frame/ConsoleTypes.h" | 33 #include "core/frame/ConsoleTypes.h" |
| 34 #include "core/frame/FrameConsole.h" | 34 #include "core/frame/FrameConsole.h" |
| 35 #include "core/frame/FrameHost.h" | 35 #include "core/frame/FrameHost.h" |
| 36 #include "core/frame/LocalFrame.h" | 36 #include "core/frame/LocalFrame.h" |
| 37 #include "core/inspector/ConsoleAPITypes.h" | 37 #include "core/inspector/ConsoleAPITypes.h" |
| 38 #include "core/inspector/ConsoleMessage.h" | 38 #include "core/inspector/ConsoleMessage.h" |
| 39 #include "core/inspector/ScriptArguments.h" | 39 #include "core/inspector/ScriptArguments.h" |
| 40 #include "core/inspector/ScriptCallStack.h" | 40 #include "core/inspector/ScriptCallStack.h" |
| 41 #include "core/page/Chrome.h" | 41 #include "core/page/Chrome.h" |
| 42 #include "core/page/ChromeClient.h" | 42 #include "core/page/ChromeClient.h" |
| 43 #include "core/timing/MemoryInfo.h" | |
| 44 #include "platform/TraceEvent.h" | 43 #include "platform/TraceEvent.h" |
| 45 #include "wtf/text/CString.h" | 44 #include "wtf/text/CString.h" |
| 46 #include "wtf/text/WTFString.h" | 45 #include "wtf/text/WTFString.h" |
| 47 | 46 |
| 48 namespace blink { | 47 namespace blink { |
| 49 | 48 |
| 50 Console::Console(LocalFrame* frame) | 49 Console::Console(LocalFrame* frame) |
| 51 : DOMWindowProperty(frame) | 50 : DOMWindowProperty(frame) |
| 52 { | 51 { |
| 53 } | 52 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 70 } | 69 } |
| 71 | 70 |
| 72 void Console::reportMessageToConsole(PassRefPtrWillBeRawPtr<ConsoleMessage> cons
oleMessage) | 71 void Console::reportMessageToConsole(PassRefPtrWillBeRawPtr<ConsoleMessage> cons
oleMessage) |
| 73 { | 72 { |
| 74 if (!frame()) | 73 if (!frame()) |
| 75 return; | 74 return; |
| 76 | 75 |
| 77 frame()->console().addMessage(consoleMessage); | 76 frame()->console().addMessage(consoleMessage); |
| 78 } | 77 } |
| 79 | 78 |
| 80 PassRefPtrWillBeRawPtr<MemoryInfo> Console::memory() const | |
| 81 { | |
| 82 // FIXME: Because we create a new object here each time, | |
| 83 // console.memory !== console.memory, which seems wrong. | |
| 84 return MemoryInfo::create(); | |
| 85 } | |
| 86 | |
| 87 } // namespace blink | 79 } // namespace blink |
| OLD | NEW |