| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y | 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y |
| 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N | 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N |
| 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
| 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "InspectorConsoleAgent.h" | 27 #include "InspectorConsoleAgent.h" |
| 28 | 28 |
| 29 #include "InstrumentingAgents.h" | |
| 30 #include "Console.h" | 29 #include "Console.h" |
| 31 #include "ConsoleMessage.h" | 30 #include "ConsoleMessage.h" |
| 32 #include "DOMWindow.h" | 31 #include "DOMWindow.h" |
| 33 #include "InjectedScriptHost.h" | 32 #include "InjectedScriptHost.h" |
| 34 #include "InjectedScriptManager.h" | 33 #include "InjectedScriptManager.h" |
| 35 #include "InspectorFrontend.h" | 34 #include "InspectorFrontend.h" |
| 36 #include "InspectorState.h" | 35 #include "InspectorState.h" |
| 37 #include "ResourceError.h" | 36 #include "InstrumentingAgents.h" |
| 38 #include "ResourceResponse.h" | |
| 39 #include "ScriptArguments.h" | 37 #include "ScriptArguments.h" |
| 40 #include "ScriptCallFrame.h" | 38 #include "ScriptCallFrame.h" |
| 41 #include "ScriptCallStack.h" | 39 #include "ScriptCallStack.h" |
| 42 #include "ScriptCallStackFactory.h" | 40 #include "ScriptCallStackFactory.h" |
| 43 #include "ScriptController.h" | 41 #include "ScriptController.h" |
| 44 #include "ScriptObject.h" | 42 #include "ScriptObject.h" |
| 45 #include "ScriptProfiler.h" | 43 #include "ScriptProfiler.h" |
| 44 #include "core/platform/network/ResourceError.h" |
| 45 #include "core/platform/network/ResourceResponse.h" |
| 46 #include <wtf/CurrentTime.h> | 46 #include <wtf/CurrentTime.h> |
| 47 #include <wtf/OwnPtr.h> | 47 #include <wtf/OwnPtr.h> |
| 48 #include <wtf/PassOwnPtr.h> | 48 #include <wtf/PassOwnPtr.h> |
| 49 #include <wtf/text/StringBuilder.h> | 49 #include <wtf/text/StringBuilder.h> |
| 50 #include <wtf/text/WTFString.h> | 50 #include <wtf/text/WTFString.h> |
| 51 | 51 |
| 52 namespace WebCore { | 52 namespace WebCore { |
| 53 | 53 |
| 54 static const unsigned maximumConsoleMessages = 1000; | 54 static const unsigned maximumConsoleMessages = 1000; |
| 55 static const int expireConsoleMessagesStep = 100; | 55 static const int expireConsoleMessagesStep = 100; |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 int m_heapObjectId; | 331 int m_heapObjectId; |
| 332 }; | 332 }; |
| 333 | 333 |
| 334 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) | 334 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) |
| 335 { | 335 { |
| 336 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); | 336 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); |
| 337 } | 337 } |
| 338 | 338 |
| 339 } // namespace WebCore | 339 } // namespace WebCore |
| 340 | 340 |
| OLD | NEW |