OLD | NEW |
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 4550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4561 // history entry, it means the user initiated the navigation and we should | 4561 // history entry, it means the user initiated the navigation and we should |
4562 // mark it as such. | 4562 // mark it as such. |
4563 if (commit_type == blink::WebStandardCommit) | 4563 if (commit_type == blink::WebStandardCommit) |
4564 params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; | 4564 params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; |
4565 else | 4565 else |
4566 params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; | 4566 params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; |
4567 | 4567 |
4568 DCHECK(!navigation_state->request_params().should_clear_history_list); | 4568 DCHECK(!navigation_state->request_params().should_clear_history_list); |
4569 params.history_list_was_cleared = false; | 4569 params.history_list_was_cleared = false; |
4570 params.report_type = FrameMsg_UILoadMetricsReportType::NO_REPORT; | 4570 params.report_type = FrameMsg_UILoadMetricsReportType::NO_REPORT; |
| 4571 // Subframes should match the zoom level of the main frame. |
| 4572 render_view_->webview()->setZoomLevel(render_view_->page_zoom_level()); |
4571 } | 4573 } |
4572 | 4574 |
4573 // This message needs to be sent before any of allowScripts(), | 4575 // This message needs to be sent before any of allowScripts(), |
4574 // allowImages(), allowPlugins() is called for the new page, so that when | 4576 // allowImages(), allowPlugins() is called for the new page, so that when |
4575 // these functions send a ViewHostMsg_ContentBlocked message, it arrives | 4577 // these functions send a ViewHostMsg_ContentBlocked message, it arrives |
4576 // after the FrameHostMsg_DidCommitProvisionalLoad message. | 4578 // after the FrameHostMsg_DidCommitProvisionalLoad message. |
4577 Send(new FrameHostMsg_DidCommitProvisionalLoad(routing_id_, params)); | 4579 Send(new FrameHostMsg_DidCommitProvisionalLoad(routing_id_, params)); |
4578 | 4580 |
4579 // If we end up reusing this WebRequest (for example, due to a #ref click), | 4581 // If we end up reusing this WebRequest (for example, due to a #ref click), |
4580 // we don't want the transition type to persist. Just clear it. | 4582 // we don't want the transition type to persist. Just clear it. |
(...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6033 int match_count, | 6035 int match_count, |
6034 int ordinal, | 6036 int ordinal, |
6035 const WebRect& selection_rect, | 6037 const WebRect& selection_rect, |
6036 bool final_status_update) { | 6038 bool final_status_update) { |
6037 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6039 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6038 selection_rect, ordinal, | 6040 selection_rect, ordinal, |
6039 final_status_update)); | 6041 final_status_update)); |
6040 } | 6042 } |
6041 | 6043 |
6042 } // namespace content | 6044 } // namespace content |
OLD | NEW |