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 4533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4544 // history entry, it means the user initiated the navigation and we should | 4544 // history entry, it means the user initiated the navigation and we should |
4545 // mark it as such. | 4545 // mark it as such. |
4546 if (commit_type == blink::WebStandardCommit) | 4546 if (commit_type == blink::WebStandardCommit) |
4547 params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; | 4547 params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; |
4548 else | 4548 else |
4549 params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; | 4549 params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; |
4550 | 4550 |
4551 DCHECK(!navigation_state->request_params().should_clear_history_list); | 4551 DCHECK(!navigation_state->request_params().should_clear_history_list); |
4552 params.history_list_was_cleared = false; | 4552 params.history_list_was_cleared = false; |
4553 params.report_type = FrameMsg_UILoadMetricsReportType::NO_REPORT; | 4553 params.report_type = FrameMsg_UILoadMetricsReportType::NO_REPORT; |
| 4554 // Subframes should match the zoom level of the main frame. |
| 4555 render_view_->webview()->setZoomLevel(render_view_->page_zoom_level()); |
4554 } | 4556 } |
4555 | 4557 |
4556 // This message needs to be sent before any of allowScripts(), | 4558 // This message needs to be sent before any of allowScripts(), |
4557 // allowImages(), allowPlugins() is called for the new page, so that when | 4559 // allowImages(), allowPlugins() is called for the new page, so that when |
4558 // these functions send a ViewHostMsg_ContentBlocked message, it arrives | 4560 // these functions send a ViewHostMsg_ContentBlocked message, it arrives |
4559 // after the FrameHostMsg_DidCommitProvisionalLoad message. | 4561 // after the FrameHostMsg_DidCommitProvisionalLoad message. |
4560 Send(new FrameHostMsg_DidCommitProvisionalLoad(routing_id_, params)); | 4562 Send(new FrameHostMsg_DidCommitProvisionalLoad(routing_id_, params)); |
4561 | 4563 |
4562 // If we end up reusing this WebRequest (for example, due to a #ref click), | 4564 // If we end up reusing this WebRequest (for example, due to a #ref click), |
4563 // we don't want the transition type to persist. Just clear it. | 4565 // we don't want the transition type to persist. Just clear it. |
(...skipping 1456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6020 int match_count, | 6022 int match_count, |
6021 int ordinal, | 6023 int ordinal, |
6022 const WebRect& selection_rect, | 6024 const WebRect& selection_rect, |
6023 bool final_status_update) { | 6025 bool final_status_update) { |
6024 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6026 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6025 selection_rect, ordinal, | 6027 selection_rect, ordinal, |
6026 final_status_update)); | 6028 final_status_update)); |
6027 } | 6029 } |
6028 | 6030 |
6029 } // namespace content | 6031 } // namespace content |
OLD | NEW |