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/browser/browser_plugin/browser_plugin_guest.h" | 5 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 | 10 |
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
652 guest_rwhv->TextInputStateChanged(*last_text_input_state_); | 652 guest_rwhv->TextInputStateChanged(*last_text_input_state_); |
653 } | 653 } |
654 | 654 |
655 void BrowserPluginGuest::DidFinishNavigation( | 655 void BrowserPluginGuest::DidFinishNavigation( |
656 NavigationHandle* navigation_handle) { | 656 NavigationHandle* navigation_handle) { |
657 if (navigation_handle->HasCommitted()) | 657 if (navigation_handle->HasCommitted()) |
658 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.DidNavigate")); | 658 RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.DidNavigate")); |
659 } | 659 } |
660 | 660 |
661 void BrowserPluginGuest::RenderViewReady() { | 661 void BrowserPluginGuest::RenderViewReady() { |
662 if (GuestMode::IsCrossProcessFrameGuest(GetWebContents())) | |
alexmos
2017/03/04 01:12:16
I'll defer to James or Lucas here, but in the CL d
wjmaclean
2017/03/14 16:13:37
I'm not sure I follow: in WebView+OOPIF mode aren'
alexmos
2017/03/15 00:16:07
Right, so my question is, if we are in webview+OOP
avallee
2017/03/15 02:55:20
We definitely need to skip the SetFocus message si
alexmos
2017/03/15 04:25:03
Ack. The hung_renderer_delay also seems like it's
| |
663 return; | |
664 | |
662 RenderViewHost* rvh = GetWebContents()->GetRenderViewHost(); | 665 RenderViewHost* rvh = GetWebContents()->GetRenderViewHost(); |
663 // TODO(fsamuel): Investigate whether it's possible to update state earlier | 666 // TODO(fsamuel): Investigate whether it's possible to update state earlier |
664 // here (see http://crbug.com/158151). | 667 // here (see http://crbug.com/158151). |
665 Send(new InputMsg_SetFocus(routing_id(), focused_)); | 668 Send(new InputMsg_SetFocus(routing_id(), focused_)); |
666 UpdateVisibility(); | 669 UpdateVisibility(); |
667 | 670 |
668 // In case we've created a new guest render process after a crash, let the | 671 // In case we've created a new guest render process after a crash, let the |
669 // associated BrowserPlugin know. We only need to send this if we're attached, | 672 // associated BrowserPlugin know. We only need to send this if we're attached, |
670 // as guest_crashed_ is cleared automatically on attach anyways. | 673 // as guest_crashed_ is cleared automatically on attach anyways. |
671 if (attached()) { | 674 if (attached()) { |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1065 range, character_bounds); | 1068 range, character_bounds); |
1066 } | 1069 } |
1067 #endif | 1070 #endif |
1068 | 1071 |
1069 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) { | 1072 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) { |
1070 if (delegate_) | 1073 if (delegate_) |
1071 delegate_->SetContextMenuPosition(position); | 1074 delegate_->SetContextMenuPosition(position); |
1072 } | 1075 } |
1073 | 1076 |
1074 } // namespace content | 1077 } // namespace content |
OLD | NEW |