Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Side by Side Diff: Source/core/inspector/ConsoleMessage.cpp

Issue 300393002: Merge DevTools Refactor CL to Blink36 (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/1985
Patch Set: PTAL Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/AsyncCallStackTracker.cpp ('k') | Source/core/inspector/InjectedScript.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
4 * Copyright (C) 2009, 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 jsonObj->setType(messageTypeValue(m_type)); 198 jsonObj->setType(messageTypeValue(m_type));
199 jsonObj->setLine(static_cast<int>(m_line)); 199 jsonObj->setLine(static_cast<int>(m_line));
200 jsonObj->setColumn(static_cast<int>(m_column)); 200 jsonObj->setColumn(static_cast<int>(m_column));
201 jsonObj->setUrl(m_url); 201 jsonObj->setUrl(m_url);
202 ScriptState* scriptState = m_scriptState.get(); 202 ScriptState* scriptState = m_scriptState.get();
203 if (scriptState && scriptState->executionContext()->isDocument()) 203 if (scriptState && scriptState->executionContext()->isDocument())
204 jsonObj->setExecutionContextId(injectedScriptManager->injectedScriptIdFo r(scriptState)); 204 jsonObj->setExecutionContextId(injectedScriptManager->injectedScriptIdFo r(scriptState));
205 if (m_source == NetworkMessageSource && !m_requestId.isEmpty()) 205 if (m_source == NetworkMessageSource && !m_requestId.isEmpty())
206 jsonObj->setNetworkRequestId(m_requestId); 206 jsonObj->setNetworkRequestId(m_requestId);
207 if (m_arguments && m_arguments->argumentCount()) { 207 if (m_arguments && m_arguments->argumentCount()) {
208 InjectedScript injectedScript = injectedScriptManager->injectedScriptFor (m_arguments->scriptState()); 208 InjectedScript& injectedScript = injectedScriptManager->injectedScriptFo r(m_arguments->scriptState());
209 if (!injectedScript.isEmpty()) { 209 if (!injectedScript.isEmpty()) {
210 RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::RemoteObject> > json Args = TypeBuilder::Array<TypeBuilder::Runtime::RemoteObject>::create(); 210 RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::RemoteObject> > json Args = TypeBuilder::Array<TypeBuilder::Runtime::RemoteObject>::create();
211 if (m_type == TableMessageType && generatePreview && m_arguments->ar gumentCount()) { 211 if (m_type == TableMessageType && generatePreview && m_arguments->ar gumentCount()) {
212 ScriptValue table = m_arguments->argumentAt(0); 212 ScriptValue table = m_arguments->argumentAt(0);
213 ScriptValue columns = m_arguments->argumentCount() > 1 ? m_argum ents->argumentAt(1) : ScriptValue(); 213 ScriptValue columns = m_arguments->argumentCount() > 1 ? m_argum ents->argumentAt(1) : ScriptValue();
214 RefPtr<TypeBuilder::Runtime::RemoteObject> inspectorValue = inje ctedScript.wrapTable(table, columns); 214 RefPtr<TypeBuilder::Runtime::RemoteObject> inspectorValue = inje ctedScript.wrapTable(table, columns);
215 if (!inspectorValue) { 215 if (!inspectorValue) {
216 ASSERT_NOT_REACHED(); 216 ASSERT_NOT_REACHED();
217 return; 217 return;
218 } 218 }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 unsigned ConsoleMessage::argumentCount() 253 unsigned ConsoleMessage::argumentCount()
254 { 254 {
255 if (m_arguments) 255 if (m_arguments)
256 return m_arguments->argumentCount(); 256 return m_arguments->argumentCount();
257 return 0; 257 return 0;
258 } 258 }
259 259
260 } // namespace WebCore 260 } // namespace WebCore
261 261
OLDNEW
« no previous file with comments | « Source/core/inspector/AsyncCallStackTracker.cpp ('k') | Source/core/inspector/InjectedScript.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698