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

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

Issue 2174243002: Disable page ID vs PageState CHECK in release builds for now. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | no next file » | 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 5597 matching lines...) Expand 10 before | Expand all | Expand 10 after
5608 } 5608 }
5609 } 5609 }
5610 5610
5611 if (common_params.method == "POST" && !browser_side_navigation && 5611 if (common_params.method == "POST" && !browser_side_navigation &&
5612 common_params.post_data) { 5612 common_params.post_data) {
5613 request.setHTTPBody( 5613 request.setHTTPBody(
5614 GetWebHTTPBodyForRequestBody(common_params.post_data)); 5614 GetWebHTTPBodyForRequestBody(common_params.post_data));
5615 } 5615 }
5616 5616
5617 // A session history navigation should have been accompanied by state. 5617 // A session history navigation should have been accompanied by state.
5618 CHECK_EQ(request_params.page_id, -1); 5618 // TODO(creis): This is known to be failing in UseSubframeNavigationEntries
5619 // in https://crbug.com/568703, when the PageState on a FrameNavigationEntry
5620 // is unexpectedly empty. Until the cause is found, keep this as a DCHECK
5621 // and load the URL without PageState.
5622 DCHECK_EQ(request_params.page_id, -1);
5619 5623
5620 should_load_request = true; 5624 should_load_request = true;
5621 } 5625 }
5622 5626
5623 if (should_load_request) { 5627 if (should_load_request) {
5624 // Sanitize navigation start now that we know the load_type. 5628 // Sanitize navigation start now that we know the load_type.
5625 pending_navigation_params_->common_params.navigation_start = 5629 pending_navigation_params_->common_params.navigation_start =
5626 SanitizeNavigationTiming(load_type, common_params.navigation_start, 5630 SanitizeNavigationTiming(load_type, common_params.navigation_start,
5627 renderer_navigation_start); 5631 renderer_navigation_start);
5628 5632
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
6366 // event target. Potentially a Pepper plugin will receive the event. 6370 // event target. Potentially a Pepper plugin will receive the event.
6367 // In order to tell whether a plugin gets the last mouse event and which it 6371 // In order to tell whether a plugin gets the last mouse event and which it
6368 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6372 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6369 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6373 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6370 // |pepper_last_mouse_event_target_|. 6374 // |pepper_last_mouse_event_target_|.
6371 pepper_last_mouse_event_target_ = nullptr; 6375 pepper_last_mouse_event_target_ = nullptr;
6372 #endif 6376 #endif
6373 } 6377 }
6374 6378
6375 } // namespace content 6379 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698