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

Unified Diff: third_party/WebKit/public/web/WebLocalFrame.h

Issue 2783743002: Fix nullptr deref in maybeRenderFallbackContent() (Closed)
Patch Set: enum-ify MaybeRenderFallbackContent Created 3 years, 8 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: third_party/WebKit/public/web/WebLocalFrame.h
diff --git a/third_party/WebKit/public/web/WebLocalFrame.h b/third_party/WebKit/public/web/WebLocalFrame.h
index 5242affddc5bbb0181c92b587b46240297465f3b..4837dc464f30b4033061a807bf1d17faf4d32f8e 100644
--- a/third_party/WebKit/public/web/WebLocalFrame.h
+++ b/third_party/WebKit/public/web/WebLocalFrame.h
@@ -153,9 +153,14 @@ class WebLocalFrame : public WebFrame {
WebHistoryLoadType = kWebHistoryDifferentDocumentLoad,
bool is_client_redirect = false) = 0;
- // On load failure, attempts to make frame's parent rendering fallback content
- // and stop this frame loading.
- virtual bool MaybeRenderFallbackContent(const WebURLError&) const = 0;
+ // On load failure, attempts to make frame's parent render fallback content.
+ enum FallbackContentResult {
+ NoFallbackContent,
Charlie Reis 2017/04/12 22:05:22 Comment: An error page should be shown instead of
Nate Chapin 2017/04/13 17:32:22 Done.
+ NoLoadInProgress,
Charlie Reis 2017/04/12 22:05:22 Comment: Something else committed instead, so no e
Nate Chapin 2017/04/13 17:32:21 Done.
+ FallbackRendered
Charlie Reis 2017/04/12 22:05:22 Comment: Fallback content was shown so no error pa
Nate Chapin 2017/04/13 17:32:21 Done.
+ };
+ virtual FallbackContentResult MaybeRenderFallbackContent(
+ const WebURLError&) const = 0;
// Called when a navigation is blocked because a Content Security Policy (CSP)
// is infringed.

Powered by Google App Engine
This is Rietveld 408576698