| 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 |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 HashMap<String, double>::iterator it = m_times.find(title); | 224 HashMap<String, double>::iterator it = m_times.find(title); |
| 225 if (it == m_times.end()) | 225 if (it == m_times.end()) |
| 226 return; | 226 return; |
| 227 | 227 |
| 228 double startTime = it->value; | 228 double startTime = it->value; |
| 229 m_times.remove(it); | 229 m_times.remove(it); |
| 230 | 230 |
| 231 double elapsed = monotonicallyIncreasingTime() - startTime; | 231 double elapsed = monotonicallyIncreasingTime() - startTime; |
| 232 String message = title + String::format(": %.3fms", elapsed * 1000); | 232 String message = title + String::format(": %.3fms", elapsed * 1000); |
| 233 | 233 |
| 234 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMes
sageSource, DebugMessageLevel, message); | 234 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(C
onsoleAPIMessageSource, DebugMessageLevel, message); |
| 235 consoleMessage->setType(LogMessageType); | 235 consoleMessage->setType(LogMessageType); |
| 236 consoleMessage->setScriptState(scriptState); | 236 consoleMessage->setScriptState(scriptState); |
| 237 addMessageToConsole(consoleMessage.get()); | 237 addMessageToConsole(consoleMessage.get()); |
| 238 } | 238 } |
| 239 | 239 |
| 240 void InspectorConsoleAgent::setTracingBasedTimeline(ErrorString*, bool enabled) | 240 void InspectorConsoleAgent::setTracingBasedTimeline(ErrorString*, bool enabled) |
| 241 { | 241 { |
| 242 m_state->setBoolean(ConsoleAgentState::tracingBasedTimeline, enabled); | 242 m_state->setBoolean(ConsoleAgentState::tracingBasedTimeline, enabled); |
| 243 } | 243 } |
| 244 | 244 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 266 // Follow Firebug's behavior of counting with null and undefined title in | 266 // Follow Firebug's behavior of counting with null and undefined title in |
| 267 // the same bucket as no argument | 267 // the same bucket as no argument |
| 268 String title; | 268 String title; |
| 269 arguments->getFirstArgumentAsString(title); | 269 arguments->getFirstArgumentAsString(title); |
| 270 String identifier = title.isEmpty() ? String(lastCaller.sourceURL() + ':' +
String::number(lastCaller.lineNumber())) | 270 String identifier = title.isEmpty() ? String(lastCaller.sourceURL() + ':' +
String::number(lastCaller.lineNumber())) |
| 271 : String(title + '@'); | 271 : String(title + '@'); |
| 272 | 272 |
| 273 HashCountedSet<String>::AddResult result = m_counts.add(identifier); | 273 HashCountedSet<String>::AddResult result = m_counts.add(identifier); |
| 274 String message = title + ": " + String::number(result.storedValue->value); | 274 String message = title + ": " + String::number(result.storedValue->value); |
| 275 | 275 |
| 276 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMes
sageSource, DebugMessageLevel, message); | 276 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(C
onsoleAPIMessageSource, DebugMessageLevel, message); |
| 277 consoleMessage->setType(LogMessageType); | 277 consoleMessage->setType(LogMessageType); |
| 278 consoleMessage->setScriptState(scriptState); | 278 consoleMessage->setScriptState(scriptState); |
| 279 addMessageToConsole(consoleMessage.get()); | 279 addMessageToConsole(consoleMessage.get()); |
| 280 } | 280 } |
| 281 | 281 |
| 282 void InspectorConsoleAgent::frameWindowDiscarded(LocalDOMWindow* window) | 282 void InspectorConsoleAgent::frameWindowDiscarded(LocalDOMWindow* window) |
| 283 { | 283 { |
| 284 size_t messageCount = m_consoleMessages.size(); | 284 size_t messageCount = m_consoleMessages.size(); |
| 285 for (size_t i = 0; i < messageCount; ++i) | 285 for (size_t i = 0; i < messageCount; ++i) |
| 286 m_consoleMessages[i]->windowCleared(window); | 286 m_consoleMessages[i]->windowCleared(window); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 private: | 361 private: |
| 362 int m_heapObjectId; | 362 int m_heapObjectId; |
| 363 }; | 363 }; |
| 364 | 364 |
| 365 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) | 365 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) |
| 366 { | 366 { |
| 367 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); | 367 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); |
| 368 } | 368 } |
| 369 | 369 |
| 370 } // namespace blink | 370 } // namespace blink |
| OLD | NEW |