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

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

Issue 1370013003: OOPIF: Clear old focused frame when focus moves to a cross-process frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove !frame()->page() check from WebLocalFrameImpl::clearFocus() Created 5 years, 2 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 | « content/renderer/render_frame_impl.h ('k') | content/test/data/page_with_blur.html » ('j') | 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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) 1119 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload)
1120 IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest, 1120 IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest,
1121 OnTextSurroundingSelectionRequest) 1121 OnTextSurroundingSelectionRequest)
1122 IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode, 1122 IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode,
1123 OnSetAccessibilityMode) 1123 OnSetAccessibilityMode)
1124 IPC_MESSAGE_HANDLER(AccessibilityMsg_SnapshotTree, 1124 IPC_MESSAGE_HANDLER(AccessibilityMsg_SnapshotTree,
1125 OnSnapshotAccessibilityTree) 1125 OnSnapshotAccessibilityTree)
1126 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener) 1126 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener)
1127 IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation) 1127 IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation)
1128 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags) 1128 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags)
1129 IPC_MESSAGE_HANDLER(FrameMsg_ClearFocus, OnClearFocus)
1129 IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings, 1130 IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings,
1130 OnTextTrackSettingsChanged) 1131 OnTextTrackSettingsChanged)
1131 IPC_MESSAGE_HANDLER(FrameMsg_PostMessageEvent, OnPostMessageEvent) 1132 IPC_MESSAGE_HANDLER(FrameMsg_PostMessageEvent, OnPostMessageEvent)
1132 IPC_MESSAGE_HANDLER(FrameMsg_FailedNavigation, OnFailedNavigation) 1133 IPC_MESSAGE_HANDLER(FrameMsg_FailedNavigation, OnFailedNavigation)
1133 IPC_MESSAGE_HANDLER(FrameMsg_GetSavableResourceLinks, 1134 IPC_MESSAGE_HANDLER(FrameMsg_GetSavableResourceLinks,
1134 OnGetSavableResourceLinks) 1135 OnGetSavableResourceLinks)
1135 IPC_MESSAGE_HANDLER(FrameMsg_GetSerializedHtmlWithLocalLinks, 1136 IPC_MESSAGE_HANDLER(FrameMsg_GetSerializedHtmlWithLocalLinks,
1136 OnGetSerializedHtmlWithLocalLinks) 1137 OnGetSerializedHtmlWithLocalLinks)
1137 #if defined(OS_ANDROID) 1138 #if defined(OS_ANDROID)
1138 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) 1139 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems)
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
1675 1676
1676 void RenderFrameImpl::OnUpdateOpener(int opener_routing_id) { 1677 void RenderFrameImpl::OnUpdateOpener(int opener_routing_id) {
1677 WebFrame* opener = ResolveOpener(opener_routing_id, nullptr); 1678 WebFrame* opener = ResolveOpener(opener_routing_id, nullptr);
1678 frame_->setOpener(opener); 1679 frame_->setOpener(opener);
1679 } 1680 }
1680 1681
1681 void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) { 1682 void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) {
1682 frame_->setFrameOwnerSandboxFlags(flags); 1683 frame_->setFrameOwnerSandboxFlags(flags);
1683 } 1684 }
1684 1685
1686 void RenderFrameImpl::OnClearFocus() {
1687 frame_->clearFocus();
1688 }
1689
1685 void RenderFrameImpl::OnTextTrackSettingsChanged( 1690 void RenderFrameImpl::OnTextTrackSettingsChanged(
1686 const FrameMsg_TextTrackSettings_Params& params) { 1691 const FrameMsg_TextTrackSettings_Params& params) {
1687 DCHECK(!frame_->parent()); 1692 DCHECK(!frame_->parent());
1688 if (!render_view_->webview()) 1693 if (!render_view_->webview())
1689 return; 1694 return;
1690 1695
1691 if (params.text_tracks_enabled) { 1696 if (params.text_tracks_enabled) {
1692 render_view_->webview()->settings()->setTextTrackKindUserPreference( 1697 render_view_->webview()->settings()->setTextTrackKindUserPreference(
1693 WebSettings::TextTrackKindUserPreference::Captions); 1698 WebSettings::TextTrackKindUserPreference::Captions);
1694 } else { 1699 } else {
(...skipping 3479 matching lines...) Expand 10 before | Expand all | Expand 10 after
5174 mojo::ServiceProviderPtr service_provider; 5179 mojo::ServiceProviderPtr service_provider;
5175 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5180 mojo::URLRequestPtr request(mojo::URLRequest::New());
5176 request->url = mojo::String::From(url); 5181 request->url = mojo::String::From(url);
5177 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5182 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5178 nullptr, nullptr, 5183 nullptr, nullptr,
5179 base::Bind(&OnGotContentHandlerID)); 5184 base::Bind(&OnGotContentHandlerID));
5180 return service_provider.Pass(); 5185 return service_provider.Pass();
5181 } 5186 }
5182 5187
5183 } // namespace content 5188 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/data/page_with_blur.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698