Chromium Code Reviews| Index: extensions/renderer/console.cc |
| diff --git a/extensions/renderer/console.cc b/extensions/renderer/console.cc |
| index 245e14f9c24bef22fd58a154884b4f1cfaa2cbd3..8314e7b6cab73e001f50d4c41742b43e9c974dcc 100644 |
| --- a/extensions/renderer/console.cc |
| +++ b/extensions/renderer/console.cc |
| @@ -54,30 +54,28 @@ void BoundLogMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) { |
| ScriptContext* script_context = |
| ScriptContextSet::GetContextByV8Context(context); |
| // TODO(devlin): Consider (D)CHECK(script_context) |
| - content::RenderFrame* render_frame = |
| - script_context ? script_context->GetRenderFrame() : nullptr; |
| const auto level = static_cast<content::ConsoleMessageLevel>( |
| info.Data().As<v8::Int32>()->Value()); |
| - AddMessage(render_frame, level, message); |
| + AddMessage(script_context, level, message); |
| } |
| gin::WrapperInfo kWrapperInfo = {gin::kEmbedderNativeGin}; |
| } // namespace |
| -void Fatal(content::RenderFrame* render_frame, const std::string& message) { |
| - AddMessage(render_frame, content::CONSOLE_MESSAGE_LEVEL_ERROR, message); |
| +void Fatal(ScriptContext* context, const std::string& message) { |
| + AddMessage(context, content::CONSOLE_MESSAGE_LEVEL_ERROR, message); |
| CheckWithMinidump(message); |
| } |
| -void AddMessage(content::RenderFrame* render_frame, |
| +void AddMessage(ScriptContext* script_context, |
| content::ConsoleMessageLevel level, |
| const std::string& message) { |
| - if (!render_frame) { |
| + if (!script_context) { |
| LOG(WARNING) << "Could not log \"" << message |
| << "\": no render frame found"; |
|
jbroman
2017/04/19 17:45:04
nit: no script context found?
Devlin
2017/04/19 19:45:33
Done.
|
| } else { |
| - render_frame->AddMessageToConsole(level, message); |
| + script_context->AddMessageToConsole(level, message); |
| } |
| } |