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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WebLocalFrame_h 5 #ifndef WebLocalFrame_h
6 #define WebLocalFrame_h 6 #define WebLocalFrame_h
7 7
8 #include <set> 8 #include <set>
9 #include "WebCompositionUnderline.h" 9 #include "WebCompositionUnderline.h"
10 #include "WebFrame.h" 10 #include "WebFrame.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 const WebString& mime_type, 146 const WebString& mime_type,
147 const WebString& text_encoding, 147 const WebString& text_encoding,
148 const WebURL& base_url, 148 const WebURL& base_url,
149 const WebURL& unreachable_url = WebURL(), 149 const WebURL& unreachable_url = WebURL(),
150 bool replace = false, 150 bool replace = false,
151 WebFrameLoadType = WebFrameLoadType::kStandard, 151 WebFrameLoadType = WebFrameLoadType::kStandard,
152 const WebHistoryItem& = WebHistoryItem(), 152 const WebHistoryItem& = WebHistoryItem(),
153 WebHistoryLoadType = kWebHistoryDifferentDocumentLoad, 153 WebHistoryLoadType = kWebHistoryDifferentDocumentLoad,
154 bool is_client_redirect = false) = 0; 154 bool is_client_redirect = false) = 0;
155 155
156 // On load failure, attempts to make frame's parent rendering fallback content 156 // On load failure, attempts to make frame's parent render fallback content.
157 // and stop this frame loading. 157 enum FallbackContentResult {
158 virtual bool MaybeRenderFallbackContent(const WebURLError&) const = 0; 158 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.
159 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.
160 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.
161 };
162 virtual FallbackContentResult MaybeRenderFallbackContent(
163 const WebURLError&) const = 0;
159 164
160 // Called when a navigation is blocked because a Content Security Policy (CSP) 165 // Called when a navigation is blocked because a Content Security Policy (CSP)
161 // is infringed. 166 // is infringed.
162 virtual void ReportContentSecurityPolicyViolation( 167 virtual void ReportContentSecurityPolicyViolation(
163 const blink::WebContentSecurityPolicyViolation&) = 0; 168 const blink::WebContentSecurityPolicyViolation&) = 0;
164 169
165 // Navigation State ------------------------------------------------------- 170 // Navigation State -------------------------------------------------------
166 171
167 // Returns true if the current frame's load event has not completed. 172 // Returns true if the current frame's load event has not completed.
168 virtual bool IsLoading() const = 0; 173 virtual bool IsLoading() const = 0;
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 // to call these on a WebLocalFrame. 542 // to call these on a WebLocalFrame.
538 bool IsWebLocalFrame() const override = 0; 543 bool IsWebLocalFrame() const override = 0;
539 WebLocalFrame* ToWebLocalFrame() override = 0; 544 WebLocalFrame* ToWebLocalFrame() override = 0;
540 bool IsWebRemoteFrame() const override = 0; 545 bool IsWebRemoteFrame() const override = 0;
541 WebRemoteFrame* ToWebRemoteFrame() override = 0; 546 WebRemoteFrame* ToWebRemoteFrame() override = 0;
542 }; 547 };
543 548
544 } // namespace blink 549 } // namespace blink
545 550
546 #endif // WebLocalFrame_h 551 #endif // WebLocalFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698