summaryrefslogtreecommitdiffstats
path: root/chromium/extensions/browser/extension_function.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <[email protected]>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <[email protected]>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/extensions/browser/extension_function.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <[email protected]>
Diffstat (limited to 'chromium/extensions/browser/extension_function.cc')
-rw-r--r--chromium/extensions/browser/extension_function.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/extensions/browser/extension_function.cc b/chromium/extensions/browser/extension_function.cc
index d77b5be02c8..42b36d79a71 100644
--- a/chromium/extensions/browser/extension_function.cc
+++ b/chromium/extensions/browser/extension_function.cc
@@ -617,6 +617,10 @@ bool ExtensionFunction::HasOptionalArgument(size_t index) {
void ExtensionFunction::WriteToConsole(blink::mojom::ConsoleMessageLevel level,
const std::string& message) {
+ // TODO(crbug.com/1096166): Service Worker-based extensions don't have a
+ // RenderFrameHost.
+ if (!render_frame_host_)
+ return;
// Only the main frame handles dev tools messages.
WebContents::FromRenderFrameHost(render_frame_host_)
->GetMainFrame()