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

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

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Rebase to master@{#445291}. 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
« no previous file with comments | « content/renderer/input/input_handler_wrapper.cc ('k') | content/renderer/render_thread_impl.h » ('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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1331 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 if (render_view()->webview()) 1342 if (render_view()->webview())
1343 active_url = render_view()->GetURLForGraphicsContext3D(); 1343 active_url = render_view()->GetURLForGraphicsContext3D();
1344 1344
1345 // Synchronous IPC to obtain a routing id for the fullscreen widget. 1345 // Synchronous IPC to obtain a routing id for the fullscreen widget.
1346 int32_t fullscreen_widget_routing_id = MSG_ROUTING_NONE; 1346 int32_t fullscreen_widget_routing_id = MSG_ROUTING_NONE;
1347 if (!RenderThreadImpl::current_render_message_filter() 1347 if (!RenderThreadImpl::current_render_message_filter()
1348 ->CreateFullscreenWidget(render_view()->routing_id(), 1348 ->CreateFullscreenWidget(render_view()->routing_id(),
1349 &fullscreen_widget_routing_id)) { 1349 &fullscreen_widget_routing_id)) {
1350 return nullptr; 1350 return nullptr;
1351 } 1351 }
1352 RenderWidget::ShowCallback show_callback = base::Bind( 1352 RenderWidget::ShowCallback show_callback =
1353 &RenderViewImpl::ShowCreatedFullscreenWidget, render_view()->AsWeakPtr()); 1353 base::Bind(&RenderViewImpl::ShowCreatedFullscreenWidget,
1354 render_view()->GetWeakPtr());
1354 1355
1355 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( 1356 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create(
1356 fullscreen_widget_routing_id, show_callback, 1357 fullscreen_widget_routing_id, show_callback,
1357 GetRenderWidget()->compositor_deps(), plugin, active_url, 1358 GetRenderWidget()->compositor_deps(), plugin, active_url,
1358 GetRenderWidget()->screen_info()); 1359 GetRenderWidget()->screen_info());
1359 // TODO(nick): The show() handshake seems like unnecessary complexity here, 1360 // TODO(nick): The show() handshake seems like unnecessary complexity here,
1360 // since there's no real delay between CreateFullscreenWidget and 1361 // since there's no real delay between CreateFullscreenWidget and
1361 // ShowCreatedFullscreenWidget. Would it be simpler to have the 1362 // ShowCreatedFullscreenWidget. Would it be simpler to have the
1362 // CreateFullscreenWidget mojo method implicitly show the window, and skip the 1363 // CreateFullscreenWidget mojo method implicitly show the window, and skip the
1363 // subsequent step? 1364 // subsequent step?
(...skipping 5514 matching lines...) Expand 10 before | Expand all | Expand 10 after
6878 // event target. Potentially a Pepper plugin will receive the event. 6879 // event target. Potentially a Pepper plugin will receive the event.
6879 // In order to tell whether a plugin gets the last mouse event and which it 6880 // In order to tell whether a plugin gets the last mouse event and which it
6880 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6881 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6881 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6882 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6882 // |pepper_last_mouse_event_target_|. 6883 // |pepper_last_mouse_event_target_|.
6883 pepper_last_mouse_event_target_ = nullptr; 6884 pepper_last_mouse_event_target_ = nullptr;
6884 #endif 6885 #endif
6885 } 6886 }
6886 6887
6887 } // namespace content 6888 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/input/input_handler_wrapper.cc ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698