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

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

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 2 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 (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/renderer/render_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "content/renderer/gpu/mailbox_output_surface.h" 43 #include "content/renderer/gpu/mailbox_output_surface.h"
44 #include "content/renderer/gpu/queue_message_swap_promise.h" 44 #include "content/renderer/gpu/queue_message_swap_promise.h"
45 #include "content/renderer/gpu/render_widget_compositor.h" 45 #include "content/renderer/gpu/render_widget_compositor.h"
46 #include "content/renderer/ime_event_guard.h" 46 #include "content/renderer/ime_event_guard.h"
47 #include "content/renderer/input/input_handler_manager.h" 47 #include "content/renderer/input/input_handler_manager.h"
48 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 48 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
49 #include "content/renderer/render_frame_impl.h" 49 #include "content/renderer/render_frame_impl.h"
50 #include "content/renderer/render_frame_proxy.h" 50 #include "content/renderer/render_frame_proxy.h"
51 #include "content/renderer/render_process.h" 51 #include "content/renderer/render_process.h"
52 #include "content/renderer/render_thread_impl.h" 52 #include "content/renderer/render_thread_impl.h"
53 #include "content/renderer/render_view_impl.h"
53 #include "content/renderer/renderer_blink_platform_impl.h" 54 #include "content/renderer/renderer_blink_platform_impl.h"
54 #include "content/renderer/resizing_mode_selector.h" 55 #include "content/renderer/resizing_mode_selector.h"
55 #include "ipc/ipc_sync_message.h" 56 #include "ipc/ipc_sync_message.h"
56 #include "skia/ext/platform_canvas.h" 57 #include "skia/ext/platform_canvas.h"
57 #include "third_party/WebKit/public/platform/WebCursorInfo.h" 58 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
58 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" 59 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
59 #include "third_party/WebKit/public/platform/WebPoint.h" 60 #include "third_party/WebKit/public/platform/WebPoint.h"
60 #include "third_party/WebKit/public/platform/WebRect.h" 61 #include "third_party/WebKit/public/platform/WebRect.h"
61 #include "third_party/WebKit/public/platform/WebScreenInfo.h" 62 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
62 #include "third_party/WebKit/public/platform/WebSize.h" 63 #include "third_party/WebKit/public/platform/WebSize.h"
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 } 565 }
565 566
566 // static 567 // static
567 RenderWidget* RenderWidget::CreateForFrame( 568 RenderWidget* RenderWidget::CreateForFrame(
568 int routing_id, 569 int routing_id,
569 bool hidden, 570 bool hidden,
570 const blink::WebScreenInfo& screen_info, 571 const blink::WebScreenInfo& screen_info,
571 CompositorDependencies* compositor_deps, 572 CompositorDependencies* compositor_deps,
572 blink::WebLocalFrame* frame) { 573 blink::WebLocalFrame* frame) {
573 CHECK_NE(routing_id, MSG_ROUTING_NONE); 574 CHECK_NE(routing_id, MSG_ROUTING_NONE);
575 // TODO(avi): Before RenderViewImpl has-a RenderWidget, the browser passes the
576 // same routing ID for both the view routing ID and the main frame widget
577 // routing ID. https://crbug.com/545684
578 RenderViewImpl* view = RenderViewImpl::FromRoutingID(routing_id);
579 if (view) {
580 view->AttachWebFrameWidget(RenderWidget::CreateWebFrameWidget(view, frame));
581 return view;
582 }
574 scoped_refptr<RenderWidget> widget( 583 scoped_refptr<RenderWidget> widget(
575 new RenderWidget(compositor_deps, blink::WebPopupTypeNone, screen_info, 584 new RenderWidget(compositor_deps, blink::WebPopupTypeNone, screen_info,
576 false, hidden, false)); 585 false, hidden, false));
577 widget->routing_id_ = routing_id; 586 widget->routing_id_ = routing_id;
578 widget->for_oopif_ = true; 587 widget->for_oopif_ = true;
579 // DoInit increments the reference count on |widget|, keeping it alive after 588 // DoInit increments the reference count on |widget|, keeping it alive after
580 // this function returns. 589 // this function returns.
581 if (widget->DoInit(MSG_ROUTING_NONE, 590 if (widget->DoInit(MSG_ROUTING_NONE,
582 RenderWidget::CreateWebFrameWidget(widget.get(), frame), 591 RenderWidget::CreateWebFrameWidget(widget.get(), frame),
583 nullptr)) { 592 nullptr)) {
584 return widget.get(); 593 return widget.get();
585 } 594 }
586 return nullptr; 595 return nullptr;
587 } 596 }
588 597
589 // static 598 // static
590 blink::WebWidget* RenderWidget::CreateWebFrameWidget( 599 blink::WebWidget* RenderWidget::CreateWebFrameWidget(
591 RenderWidget* render_widget, 600 RenderWidget* render_widget,
592 blink::WebLocalFrame* frame) { 601 blink::WebLocalFrame* frame) {
602 if (!frame->parent()) {
603 // TODO(dcheng): The main frame widget currently has a special case.
604 // Eliminate this once WebView is no longer a WebWidget.
605 return blink::WebFrameWidget::create(render_widget, frame->view(), frame);
606 }
593 return blink::WebFrameWidget::create(render_widget, frame); 607 return blink::WebFrameWidget::create(render_widget, frame);
594 } 608 }
595 609
596 // static 610 // static
597 blink::WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) { 611 blink::WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) {
598 switch (render_widget->popup_type_) { 612 switch (render_widget->popup_type_) {
599 case blink::WebPopupTypeNone: // Nothing to create. 613 case blink::WebPopupTypeNone: // Nothing to create.
600 break; 614 break;
601 case blink::WebPopupTypePage: 615 case blink::WebPopupTypePage:
602 return WebPagePopup::create(render_widget); 616 return WebPagePopup::create(render_widget);
(...skipping 1794 matching lines...) Expand 10 before | Expand all | Expand 10 after
2397 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { 2411 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) {
2398 video_hole_frames_.AddObserver(frame); 2412 video_hole_frames_.AddObserver(frame);
2399 } 2413 }
2400 2414
2401 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { 2415 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) {
2402 video_hole_frames_.RemoveObserver(frame); 2416 video_hole_frames_.RemoveObserver(frame);
2403 } 2417 }
2404 #endif // defined(VIDEO_HOLE) 2418 #endif // defined(VIDEO_HOLE)
2405 2419
2406 } // namespace content 2420 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698