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

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

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Account for the fact that OOPIF subframes don't have an InnerViewportScrollLayer. Created 3 years, 11 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 1330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1341 if (render_view()->webview()) 1341 if (render_view()->webview())
1342 active_url = render_view()->GetURLForGraphicsContext3D(); 1342 active_url = render_view()->GetURLForGraphicsContext3D();
1343 1343
1344 // Synchronous IPC to obtain a routing id for the fullscreen widget. 1344 // Synchronous IPC to obtain a routing id for the fullscreen widget.
1345 int32_t fullscreen_widget_routing_id = MSG_ROUTING_NONE; 1345 int32_t fullscreen_widget_routing_id = MSG_ROUTING_NONE;
1346 if (!RenderThreadImpl::current_render_message_filter() 1346 if (!RenderThreadImpl::current_render_message_filter()
1347 ->CreateFullscreenWidget(render_view()->routing_id(), 1347 ->CreateFullscreenWidget(render_view()->routing_id(),
1348 &fullscreen_widget_routing_id)) { 1348 &fullscreen_widget_routing_id)) {
1349 return nullptr; 1349 return nullptr;
1350 } 1350 }
1351 RenderWidget::ShowCallback show_callback = base::Bind( 1351 RenderWidget::ShowCallback show_callback =
1352 &RenderViewImpl::ShowCreatedFullscreenWidget, render_view()->AsWeakPtr()); 1352 base::Bind(&RenderViewImpl::ShowCreatedFullscreenWidget,
1353 render_view()->GetWeakPtr());
1353 1354
1354 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( 1355 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create(
1355 fullscreen_widget_routing_id, show_callback, 1356 fullscreen_widget_routing_id, show_callback,
1356 GetRenderWidget()->compositor_deps(), plugin, active_url, 1357 GetRenderWidget()->compositor_deps(), plugin, active_url,
1357 GetRenderWidget()->screen_info()); 1358 GetRenderWidget()->screen_info());
1358 // TODO(nick): The show() handshake seems like unnecessary complexity here, 1359 // TODO(nick): The show() handshake seems like unnecessary complexity here,
1359 // since there's no real delay between CreateFullscreenWidget and 1360 // since there's no real delay between CreateFullscreenWidget and
1360 // ShowCreatedFullscreenWidget. Would it be simpler to have the 1361 // ShowCreatedFullscreenWidget. Would it be simpler to have the
1361 // CreateFullscreenWidget mojo method implicitly show the window, and skip the 1362 // CreateFullscreenWidget mojo method implicitly show the window, and skip the
1362 // subsequent step? 1363 // subsequent step?
(...skipping 5511 matching lines...) Expand 10 before | Expand all | Expand 10 after
6874 // event target. Potentially a Pepper plugin will receive the event. 6875 // event target. Potentially a Pepper plugin will receive the event.
6875 // In order to tell whether a plugin gets the last mouse event and which it 6876 // In order to tell whether a plugin gets the last mouse event and which it
6876 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6877 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6877 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6878 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6878 // |pepper_last_mouse_event_target_|. 6879 // |pepper_last_mouse_event_target_|.
6879 pepper_last_mouse_event_target_ = nullptr; 6880 pepper_last_mouse_event_target_ = nullptr;
6880 #endif 6881 #endif
6881 } 6882 }
6882 6883
6883 } // namespace content 6884 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698