| Index: content/renderer/browser_plugin/browser_plugin.cc
|
| diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
|
| index 75d15c837cc3f8fddb32c19cad62b2d8b60d3bc7..79b007a843ee87354b1c9d606ceca8ece4ad579e 100644
|
| --- a/content/renderer/browser_plugin/browser_plugin.cc
|
| +++ b/content/renderer/browser_plugin/browser_plugin.cc
|
| @@ -183,8 +183,9 @@ void BrowserPlugin::DidCommitCompositorFrame() {
|
|
|
| void BrowserPlugin::OnAdvanceFocus(int browser_plugin_instance_id,
|
| bool reverse) {
|
| - auto render_frame = RenderFrameImpl::FromRoutingID(render_frame_routing_id());
|
| - auto render_view = render_frame ? render_frame->GetRenderView() : nullptr;
|
| + auto* render_frame =
|
| + RenderFrameImpl::FromRoutingID(render_frame_routing_id());
|
| + auto* render_view = render_frame ? render_frame->GetRenderView() : nullptr;
|
| if (!render_view)
|
| return;
|
| render_view->GetWebView()->advanceFocus(reverse);
|
| @@ -204,8 +205,9 @@ void BrowserPlugin::OnSetCursor(int browser_plugin_instance_id,
|
|
|
| void BrowserPlugin::OnSetMouseLock(int browser_plugin_instance_id,
|
| bool enable) {
|
| - auto render_frame = RenderFrameImpl::FromRoutingID(render_frame_routing_id());
|
| - auto render_view = static_cast<RenderViewImpl*>(
|
| + auto* render_frame =
|
| + RenderFrameImpl::FromRoutingID(render_frame_routing_id());
|
| + auto* render_view = static_cast<RenderViewImpl*>(
|
| render_frame ? render_frame->GetRenderView() : nullptr);
|
| if (enable) {
|
| if (mouse_locked_ || !render_view)
|
| @@ -259,8 +261,9 @@ void BrowserPlugin::UpdateGuestFocusState(blink::WebFocusType focus_type) {
|
|
|
| bool BrowserPlugin::ShouldGuestBeFocused() const {
|
| bool embedder_focused = false;
|
| - auto render_frame = RenderFrameImpl::FromRoutingID(render_frame_routing_id());
|
| - auto render_view = static_cast<RenderViewImpl*>(
|
| + auto* render_frame =
|
| + RenderFrameImpl::FromRoutingID(render_frame_routing_id());
|
| + auto* render_view = static_cast<RenderViewImpl*>(
|
| render_frame ? render_frame->GetRenderView() : nullptr);
|
| if (render_view)
|
| embedder_focused = render_view->has_focus();
|
| @@ -320,8 +323,9 @@ void BrowserPlugin::destroy() {
|
|
|
| container_ = nullptr;
|
| // Will be a no-op if the mouse is not currently locked.
|
| - auto render_frame = RenderFrameImpl::FromRoutingID(render_frame_routing_id());
|
| - auto render_view = static_cast<RenderViewImpl*>(
|
| + auto* render_frame =
|
| + RenderFrameImpl::FromRoutingID(render_frame_routing_id());
|
| + auto* render_view = static_cast<RenderViewImpl*>(
|
| render_frame ? render_frame->GetRenderView() : nullptr);
|
| if (render_view)
|
| render_view->mouse_lock_dispatcher()->OnLockTargetDestroyed(this);
|
|
|