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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1920873002: Enable error pages for layout tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TEST. Created 4 years, 7 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
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/dom/null-document-location-assign-crash.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 5751 matching lines...) Expand 10 before | Expand all | Expand 10 after
5762 render_view_->renderer_preferences_.disable_client_blocked_error_page) { 5762 render_view_->renderer_preferences_.disable_client_blocked_error_page) {
5763 return false; 5763 return false;
5764 } 5764 }
5765 5765
5766 // Allow the embedder to suppress an error page. 5766 // Allow the embedder to suppress an error page.
5767 if (GetContentClient()->renderer()->ShouldSuppressErrorPage( 5767 if (GetContentClient()->renderer()->ShouldSuppressErrorPage(
5768 this, unreachable_url)) { 5768 this, unreachable_url)) {
5769 return false; 5769 return false;
5770 } 5770 }
5771 5771
5772 if (RenderThreadImpl::current() &&
5773 RenderThreadImpl::current()->layout_test_mode()) {
5774 return false;
5775 }
5776
5777 return true; 5772 return true;
5778 } 5773 }
5779 5774
5780 GURL RenderFrameImpl::GetLoadingUrl() const { 5775 GURL RenderFrameImpl::GetLoadingUrl() const {
5781 WebDataSource* ds = frame_->dataSource(); 5776 WebDataSource* ds = frame_->dataSource();
5782 5777
5783 GURL overriden_url; 5778 GURL overriden_url;
5784 if (MaybeGetOverriddenURL(ds, &overriden_url)) 5779 if (MaybeGetOverriddenURL(ds, &overriden_url))
5785 return overriden_url; 5780 return overriden_url;
5786 5781
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
6038 int match_count, 6033 int match_count,
6039 int ordinal, 6034 int ordinal,
6040 const WebRect& selection_rect, 6035 const WebRect& selection_rect,
6041 bool final_status_update) { 6036 bool final_status_update) {
6042 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6037 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6043 selection_rect, ordinal, 6038 selection_rect, ordinal,
6044 final_status_update)); 6039 final_status_update));
6045 } 6040 }
6046 6041
6047 } // namespace content 6042 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/dom/null-document-location-assign-crash.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698