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

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

Issue 884753003: Fix template angle bracket syntax in inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Some more fixes Created 5 years, 10 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
« no previous file with comments | « Source/core/inspector/InjectedScript.cpp ('k') | Source/core/inspector/InjectedScriptHost.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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 if (object->getNumber("line", &line)) 58 if (object->getNumber("line", &line))
59 exceptionDetails->setLine(line); 59 exceptionDetails->setLine(line);
60 int column = 0; 60 int column = 0;
61 if (object->getNumber("column", &column)) 61 if (object->getNumber("column", &column))
62 exceptionDetails->setColumn(column); 62 exceptionDetails->setColumn(column);
63 int originScriptId = 0; 63 int originScriptId = 0;
64 object->getNumber("scriptId", &originScriptId); 64 object->getNumber("scriptId", &originScriptId);
65 65
66 RefPtr<JSONArray> stackTrace = object->getArray("stackTrace"); 66 RefPtr<JSONArray> stackTrace = object->getArray("stackTrace");
67 if (stackTrace && stackTrace->length() > 0) { 67 if (stackTrace && stackTrace->length() > 0) {
68 RefPtr<TypeBuilder::Array<TypeBuilder::Console::CallFrame> > frames = Ty peBuilder::Array<TypeBuilder::Console::CallFrame>::create(); 68 RefPtr<TypeBuilder::Array<TypeBuilder::Console::CallFrame>> frames = Typ eBuilder::Array<TypeBuilder::Console::CallFrame>::create();
69 for (unsigned i = 0; i < stackTrace->length(); ++i) { 69 for (unsigned i = 0; i < stackTrace->length(); ++i) {
70 RefPtr<JSONObject> stackFrame = stackTrace->get(i)->asObject(); 70 RefPtr<JSONObject> stackFrame = stackTrace->get(i)->asObject();
71 int lineNumber = 0; 71 int lineNumber = 0;
72 stackFrame->getNumber("lineNumber", &lineNumber); 72 stackFrame->getNumber("lineNumber", &lineNumber);
73 int column = 0; 73 int column = 0;
74 stackFrame->getNumber("column", &column); 74 stackFrame->getNumber("column", &column);
75 int scriptId = 0; 75 int scriptId = 0;
76 stackFrame->getNumber("scriptId", &scriptId); 76 stackFrame->getNumber("scriptId", &scriptId);
77 if (i == 0 && scriptId == originScriptId) 77 if (i == 0 && scriptId == originScriptId)
78 originScriptId = 0; 78 originScriptId = 0;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 if (wasThrownVal) { 202 if (wasThrownVal) {
203 RefPtr<JSONObject> objectExceptionDetails = resultPair->getObject("excep tionDetails"); 203 RefPtr<JSONObject> objectExceptionDetails = resultPair->getObject("excep tionDetails");
204 if (objectExceptionDetails) 204 if (objectExceptionDetails)
205 *exceptionDetails = toExceptionDetails(objectExceptionDetails.releas e()); 205 *exceptionDetails = toExceptionDetails(objectExceptionDetails.releas e());
206 } 206 }
207 *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj); 207 *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj);
208 *wasThrown = wasThrownVal; 208 *wasThrown = wasThrownVal;
209 } 209 }
210 210
211 } // namespace blink 211 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/InjectedScript.cpp ('k') | Source/core/inspector/InjectedScriptHost.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698