OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/bind_helpers.h" | 13 #include "base/bind_helpers.h" |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/debug/trace_event.h" |
16 #include "base/json/json_reader.h" | 17 #include "base/json/json_reader.h" |
17 #include "base/json/json_writer.h" | 18 #include "base/json/json_writer.h" |
18 #include "base/lazy_instance.h" | 19 #include "base/lazy_instance.h" |
19 #include "base/message_loop_proxy.h" | 20 #include "base/message_loop_proxy.h" |
20 #include "base/metrics/histogram.h" | 21 #include "base/metrics/histogram.h" |
21 #include "base/path_service.h" | 22 #include "base/path_service.h" |
22 #include "base/process_util.h" | 23 #include "base/process_util.h" |
23 #include "base/string_number_conversions.h" | 24 #include "base/string_number_conversions.h" |
24 #include "base/string_piece.h" | 25 #include "base/string_piece.h" |
25 #include "base/string_split.h" | 26 #include "base/string_split.h" |
(...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1197 ¶ms.browser_initiated_post_data.front()), | 1198 ¶ms.browser_initiated_post_data.front()), |
1198 params.browser_initiated_post_data.size())); | 1199 params.browser_initiated_post_data.size())); |
1199 request.setHTTPBody(http_body); | 1200 request.setHTTPBody(http_body); |
1200 } | 1201 } |
1201 | 1202 |
1202 main_frame->loadRequest(request); | 1203 main_frame->loadRequest(request); |
1203 } | 1204 } |
1204 | 1205 |
1205 // In case LoadRequest failed before DidCreateDataSource was called. | 1206 // In case LoadRequest failed before DidCreateDataSource was called. |
1206 pending_navigation_params_.reset(); | 1207 pending_navigation_params_.reset(); |
| 1208 |
| 1209 UNSHIPPED_TRACE_EVENT_INSTANT0("test_tracing", "RenderViewImpl::OnNavigate"); |
1207 } | 1210 } |
1208 | 1211 |
1209 bool RenderViewImpl::IsBackForwardToStaleEntry( | 1212 bool RenderViewImpl::IsBackForwardToStaleEntry( |
1210 const ViewMsg_Navigate_Params& params, | 1213 const ViewMsg_Navigate_Params& params, |
1211 bool is_reload) { | 1214 bool is_reload) { |
1212 // Make sure this isn't a back/forward to an entry we have already cropped | 1215 // Make sure this isn't a back/forward to an entry we have already cropped |
1213 // or replaced from our history, before the browser knew about it. If so, | 1216 // or replaced from our history, before the browser knew about it. If so, |
1214 // a new navigation has committed in the mean time, and we can ignore this. | 1217 // a new navigation has committed in the mean time, and we can ignore this. |
1215 bool is_back_forward = !is_reload && !params.state.empty(); | 1218 bool is_back_forward = !is_reload && !params.state.empty(); |
1216 | 1219 |
(...skipping 4829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6046 | 6049 |
6047 updating_frame_tree_ = true; | 6050 updating_frame_tree_ = true; |
6048 active_frame_id_map_.clear(); | 6051 active_frame_id_map_.clear(); |
6049 | 6052 |
6050 target_process_id_ = process_id; | 6053 target_process_id_ = process_id; |
6051 target_routing_id_ = route_id; | 6054 target_routing_id_ = route_id; |
6052 CreateFrameTree(webview()->mainFrame(), frames); | 6055 CreateFrameTree(webview()->mainFrame(), frames); |
6053 | 6056 |
6054 updating_frame_tree_ = false; | 6057 updating_frame_tree_ = false; |
6055 } | 6058 } |
OLD | NEW |