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

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

Issue 2649573003: Revert of Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: 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 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 = 1351 RenderWidget::ShowCallback show_callback = base::Bind(
1352 base::Bind(&RenderViewImpl::ShowCreatedFullscreenWidget, 1352 &RenderViewImpl::ShowCreatedFullscreenWidget, render_view()->AsWeakPtr());
1353 render_view()->GetWeakPtr());
1354 1353
1355 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( 1354 RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create(
1356 fullscreen_widget_routing_id, show_callback, 1355 fullscreen_widget_routing_id, show_callback,
1357 GetRenderWidget()->compositor_deps(), plugin, active_url, 1356 GetRenderWidget()->compositor_deps(), plugin, active_url,
1358 GetRenderWidget()->screen_info()); 1357 GetRenderWidget()->screen_info());
1359 // TODO(nick): The show() handshake seems like unnecessary complexity here, 1358 // TODO(nick): The show() handshake seems like unnecessary complexity here,
1360 // since there's no real delay between CreateFullscreenWidget and 1359 // since there's no real delay between CreateFullscreenWidget and
1361 // ShowCreatedFullscreenWidget. Would it be simpler to have the 1360 // ShowCreatedFullscreenWidget. Would it be simpler to have the
1362 // CreateFullscreenWidget mojo method implicitly show the window, and skip the 1361 // CreateFullscreenWidget mojo method implicitly show the window, and skip the
1363 // subsequent step? 1362 // subsequent step?
(...skipping 5515 matching lines...) Expand 10 before | Expand all | Expand 10 after
6879 // event target. Potentially a Pepper plugin will receive the event. 6878 // event target. Potentially a Pepper plugin will receive the event.
6880 // In order to tell whether a plugin gets the last mouse event and which it 6879 // In order to tell whether a plugin gets the last mouse event and which it
6881 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6880 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6882 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6881 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6883 // |pepper_last_mouse_event_target_|. 6882 // |pepper_last_mouse_event_target_|.
6884 pepper_last_mouse_event_target_ = nullptr; 6883 pepper_last_mouse_event_target_ = nullptr;
6885 #endif 6884 #endif
6886 } 6885 }
6887 6886
6888 } // namespace content 6887 } // 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