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

Unified Diff: chrome/renderer/chrome_render_frame_observer.cc

Issue 321453003: Mark ChromeViewHostMsg_DetailedConsoleMessageAdded as extensions-only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/chrome_render_frame_observer.cc
diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/chrome_render_frame_observer.cc
index 6fe91ca173486419398011c4163b576e3b43cd9d..bbe81c2c696e8d4da17a03e4c9580950be3a06b1 100644
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -4,7 +4,6 @@
#include "chrome/renderer/chrome_render_frame_observer.h"
-#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/prerender_messages.h"
#include "chrome/common/print_messages.h"
@@ -12,7 +11,6 @@
#include "chrome/renderer/prerender/prerender_helper.h"
#include "chrome/renderer/printing/print_web_view_helper.h"
#include "content/public/renderer/render_frame.h"
-#include "extensions/common/stack_frame.h"
#include "skia/ext/image_operations.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/public/platform/WebImage.h"
@@ -24,61 +22,6 @@ using blink::WebElement;
using blink::WebNode;
namespace {
-// The delimiter for a stack trace provided by WebKit.
-const char kStackFrameDelimiter[] = "\n at ";
-
-// Get a stack trace from a WebKit console message.
-// There are three possible scenarios:
-// 1. WebKit gives us a stack trace in |stack_trace|.
-// 2. The stack trace is embedded in the error |message| by an internal
-// script. This will be more useful than |stack_trace|, since |stack_trace|
-// will include the internal bindings trace, instead of a developer's code.
-// 3. No stack trace is included. In this case, we should mock one up from
-// the given line number and source.
-// |message| will be populated with the error message only (i.e., will not
-// include any stack trace).
-extensions::StackTrace GetStackTraceFromMessage(
- base::string16* message,
- const base::string16& source,
- const base::string16& stack_trace,
- int32 line_number) {
- extensions::StackTrace result;
- std::vector<base::string16> pieces;
- size_t index = 0;
-
- if (message->find(base::UTF8ToUTF16(kStackFrameDelimiter)) !=
- base::string16::npos) {
- base::SplitStringUsingSubstr(*message,
- base::UTF8ToUTF16(kStackFrameDelimiter),
- &pieces);
- *message = pieces[0];
- index = 1;
- } else if (!stack_trace.empty()) {
- base::SplitStringUsingSubstr(stack_trace,
- base::UTF8ToUTF16(kStackFrameDelimiter),
- &pieces);
- }
-
- // If we got a stack trace, parse each frame from the text.
- if (index < pieces.size()) {
- for (; index < pieces.size(); ++index) {
- scoped_ptr<extensions::StackFrame> frame =
- extensions::StackFrame::CreateFromText(pieces[index]);
- if (frame.get())
- result.push_back(*frame);
- }
- }
-
- if (result.empty()) { // If we don't have a stack trace, mock one up.
- result.push_back(
- extensions::StackFrame(line_number,
- 1u, // column number
- source,
- base::string16() /* no function name */ ));
- }
-
- return result;
-}
// If the source image is null or occupies less area than
// |thumbnail_min_area_pixels|, we return the image unmodified. Otherwise, we
@@ -155,22 +98,6 @@ void ChromeRenderFrameObserver::DidChangeName(
base::UTF16ToUTF8(name)));
}
-void ChromeRenderFrameObserver::DetailedConsoleMessageAdded(
- const base::string16& message,
- const base::string16& source,
- const base::string16& stack_trace_string,
- int32 line_number,
- int32 severity_level) {
- base::string16 trimmed_message = message;
- extensions::StackTrace stack_trace = GetStackTraceFromMessage(
- &trimmed_message,
- source,
- stack_trace_string,
- line_number);
- Send(new ChromeViewHostMsg_DetailedConsoleMessageAdded(
- routing_id(), trimmed_message, source, stack_trace, severity_level));
-}
-
void ChromeRenderFrameObserver::OnSetIsPrerendering(bool is_prerendering) {
if (is_prerendering) {
// If the PrerenderHelper for this frame already exists, don't create it. It

Powered by Google App Engine
This is Rietveld 408576698