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

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

Issue 1804023002: Fix page zoom to be frame-centric for out-of-process frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Convert to use PageMsg instead of FrameMsg. Created 4 years, 8 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
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 4548 matching lines...) Expand 10 before | Expand all | Expand 10 after
4559 // history entry, it means the user initiated the navigation and we should 4559 // history entry, it means the user initiated the navigation and we should
4560 // mark it as such. 4560 // mark it as such.
4561 if (commit_type == blink::WebStandardCommit) 4561 if (commit_type == blink::WebStandardCommit)
4562 params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME; 4562 params.transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME;
4563 else 4563 else
4564 params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME; 4564 params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
4565 4565
4566 DCHECK(!navigation_state->request_params().should_clear_history_list); 4566 DCHECK(!navigation_state->request_params().should_clear_history_list);
4567 params.history_list_was_cleared = false; 4567 params.history_list_was_cleared = false;
4568 params.report_type = FrameMsg_UILoadMetricsReportType::NO_REPORT; 4568 params.report_type = FrameMsg_UILoadMetricsReportType::NO_REPORT;
4569 render_view_->webview()->setZoomLevel(
4570 render_view_->preferred_subframe_zoom_level());
4569 } 4571 }
4570 4572
4571 // This message needs to be sent before any of allowScripts(), 4573 // This message needs to be sent before any of allowScripts(),
4572 // allowImages(), allowPlugins() is called for the new page, so that when 4574 // allowImages(), allowPlugins() is called for the new page, so that when
4573 // these functions send a ViewHostMsg_ContentBlocked message, it arrives 4575 // these functions send a ViewHostMsg_ContentBlocked message, it arrives
4574 // after the FrameHostMsg_DidCommitProvisionalLoad message. 4576 // after the FrameHostMsg_DidCommitProvisionalLoad message.
4575 Send(new FrameHostMsg_DidCommitProvisionalLoad(routing_id_, params)); 4577 Send(new FrameHostMsg_DidCommitProvisionalLoad(routing_id_, params));
4576 4578
4577 // If we end up reusing this WebRequest (for example, due to a #ref click), 4579 // If we end up reusing this WebRequest (for example, due to a #ref click),
4578 // we don't want the transition type to persist. Just clear it. 4580 // we don't want the transition type to persist. Just clear it.
(...skipping 1453 matching lines...) Expand 10 before | Expand all | Expand 10 after
6032 int match_count, 6034 int match_count,
6033 int ordinal, 6035 int ordinal,
6034 const WebRect& selection_rect, 6036 const WebRect& selection_rect,
6035 bool final_status_update) { 6037 bool final_status_update) {
6036 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6038 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6037 selection_rect, ordinal, 6039 selection_rect, ordinal,
6038 final_status_update)); 6040 final_status_update));
6039 } 6041 }
6040 6042
6041 } // namespace content 6043 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698