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

Side by Side Diff: Source/core/page/PageConsole.cpp

Issue 18822004: Extension Error Piping - Blink: WebKit Side (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Consolidate [did]AddMessageToConsole() and reportDetailedMessage() Created 7 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 return; 84 return;
85 85
86 if (callStack) 86 if (callStack)
87 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageTy pe, level, message, callStack, requestIdentifier); 87 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageTy pe, level, message, callStack, requestIdentifier);
88 else 88 else
89 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageTy pe, level, message, url, lineNumber, columnNumber, state, requestIdentifier); 89 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageTy pe, level, message, url, lineNumber, columnNumber, state, requestIdentifier);
90 90
91 if (source == CSSMessageSource) 91 if (source == CSSMessageSource)
92 return; 92 return;
93 93
94 page->chrome().client()->addMessageToConsole(source, level, message, lineNum ber, url); 94 String stackTrace;
95 if (page->chrome().client()->shouldReportDetailedMessage(url)) {
96 if (callStack) {
97 stackTrace = callStack->buildInspectorArray()->toJSONString();
pfeldman 2013/07/17 09:09:38 You should instead format stack trace here, toJSON
Devlin 2013/07/17 22:14:13 Done.
Matt Perry 2013/07/18 20:20:34 I'm starting to think that we should add a callsta
98 } else {
99 RefPtr<JSONObject> simpleStackFrame = JSONObject::create();
100 simpleStackFrame->setNumber("lineNumber", lineNumber);
101 simpleStackFrame->setNumber("columnNumber", columnNumber);
102 simpleStackFrame->setString("url", url);
103 RefPtr<JSONArray> simpleStackTrace = JSONArray::create();
104 simpleStackTrace->pushObject(simpleStackFrame);
105 stackTrace = simpleStackTrace->toJSONString();
106 }
107 }
108 page->chrome().client()->addMessageToConsole(source, level, message, lineNum ber, url, stackTrace);
95 } 109 }
96 110
97 // static 111 // static
98 void PageConsole::mute() 112 void PageConsole::mute()
99 { 113 {
100 muteCount++; 114 muteCount++;
101 } 115 }
102 116
103 // static 117 // static
104 void PageConsole::unmute() 118 void PageConsole::unmute()
105 { 119 {
106 ASSERT(muteCount > 0); 120 ASSERT(muteCount > 0);
107 muteCount--; 121 muteCount--;
108 } 122 }
109 123
110 } // namespace WebCore 124 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698