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

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 all the tests. Probably. 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "content/renderer/gpu/mailbox_output_surface.h" 42 #include "content/renderer/gpu/mailbox_output_surface.h"
43 #include "content/renderer/gpu/queue_message_swap_promise.h" 43 #include "content/renderer/gpu/queue_message_swap_promise.h"
44 #include "content/renderer/gpu/render_widget_compositor.h" 44 #include "content/renderer/gpu/render_widget_compositor.h"
45 #include "content/renderer/ime_event_guard.h" 45 #include "content/renderer/ime_event_guard.h"
46 #include "content/renderer/input/input_handler_manager.h" 46 #include "content/renderer/input/input_handler_manager.h"
47 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 47 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
48 #include "content/renderer/render_frame_impl.h" 48 #include "content/renderer/render_frame_impl.h"
49 #include "content/renderer/render_frame_proxy.h" 49 #include "content/renderer/render_frame_proxy.h"
50 #include "content/renderer/render_process.h" 50 #include "content/renderer/render_process.h"
51 #include "content/renderer/render_thread_impl.h" 51 #include "content/renderer/render_thread_impl.h"
52 #include "content/renderer/render_view_impl.h"
52 #include "content/renderer/renderer_blink_platform_impl.h" 53 #include "content/renderer/renderer_blink_platform_impl.h"
53 #include "content/renderer/resizing_mode_selector.h" 54 #include "content/renderer/resizing_mode_selector.h"
54 #include "ipc/ipc_sync_message.h" 55 #include "ipc/ipc_sync_message.h"
55 #include "skia/ext/platform_canvas.h" 56 #include "skia/ext/platform_canvas.h"
56 #include "third_party/WebKit/public/platform/WebCursorInfo.h" 57 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
57 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" 58 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
58 #include "third_party/WebKit/public/platform/WebPoint.h" 59 #include "third_party/WebKit/public/platform/WebPoint.h"
59 #include "third_party/WebKit/public/platform/WebRect.h" 60 #include "third_party/WebKit/public/platform/WebRect.h"
60 #include "third_party/WebKit/public/platform/WebScreenInfo.h" 61 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
61 #include "third_party/WebKit/public/platform/WebSize.h" 62 #include "third_party/WebKit/public/platform/WebSize.h"
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 } 555 }
555 556
556 // static 557 // static
557 RenderWidget* RenderWidget::CreateForFrame( 558 RenderWidget* RenderWidget::CreateForFrame(
558 int routing_id, 559 int routing_id,
559 bool hidden, 560 bool hidden,
560 const blink::WebScreenInfo& screen_info, 561 const blink::WebScreenInfo& screen_info,
561 CompositorDependencies* compositor_deps, 562 CompositorDependencies* compositor_deps,
562 blink::WebLocalFrame* frame) { 563 blink::WebLocalFrame* frame) {
563 CHECK_NE(routing_id, MSG_ROUTING_NONE); 564 CHECK_NE(routing_id, MSG_ROUTING_NONE);
565 // TODO(avi): Before RenderViewImpl has-a RenderWidget, the browser passes the
566 // same routing ID for both the view routing ID and the main frame widget
567 // routing ID. https://crbug.com/545684
568 RenderViewImpl* view = RenderViewImpl::FromRoutingID(routing_id);
569 if (view) {
570 view->AttachWebFrameWidget(RenderWidget::CreateWebFrameWidget(view, frame));
571 return view;
572 }
564 scoped_refptr<RenderWidget> widget( 573 scoped_refptr<RenderWidget> widget(
565 new RenderWidget(compositor_deps, blink::WebPopupTypeNone, screen_info, 574 new RenderWidget(compositor_deps, blink::WebPopupTypeNone, screen_info,
566 false, hidden, false)); 575 false, hidden, false));
567 widget->routing_id_ = routing_id; 576 widget->routing_id_ = routing_id;
568 widget->for_oopif_ = true; 577 widget->for_oopif_ = true;
569 // DoInit increments the reference count on |widget|, keeping it alive after 578 // DoInit increments the reference count on |widget|, keeping it alive after
570 // this function returns. 579 // this function returns.
571 if (widget->DoInit(MSG_ROUTING_NONE, 580 if (widget->DoInit(MSG_ROUTING_NONE,
572 RenderWidget::CreateWebFrameWidget(widget.get(), frame), 581 RenderWidget::CreateWebFrameWidget(widget.get(), frame),
573 nullptr)) { 582 nullptr)) {
574 return widget.get(); 583 return widget.get();
575 } 584 }
576 return nullptr; 585 return nullptr;
577 } 586 }
578 587
579 // static 588 // static
580 blink::WebWidget* RenderWidget::CreateWebFrameWidget( 589 blink::WebWidget* RenderWidget::CreateWebFrameWidget(
581 RenderWidget* render_widget, 590 RenderWidget* render_widget,
582 blink::WebLocalFrame* frame) { 591 blink::WebLocalFrame* frame) {
592 if (!frame->parent()) {
593 // TODO(dcheng): The main frame widget currently has a special case.
594 // Eliminate this once WebView is no longer a WebWidget.
595 return blink::WebFrameWidget::create(render_widget, frame->view(), frame);
596 }
583 return blink::WebFrameWidget::create(render_widget, frame); 597 return blink::WebFrameWidget::create(render_widget, frame);
584 } 598 }
585 599
586 // static 600 // static
587 blink::WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) { 601 blink::WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) {
588 switch (render_widget->popup_type_) { 602 switch (render_widget->popup_type_) {
589 case blink::WebPopupTypeNone: // Nothing to create. 603 case blink::WebPopupTypeNone: // Nothing to create.
590 break; 604 break;
591 case blink::WebPopupTypePage: 605 case blink::WebPopupTypePage:
592 return WebPagePopup::create(render_widget); 606 return WebPagePopup::create(render_widget);
(...skipping 1789 matching lines...) Expand 10 before | Expand all | Expand 10 after
2382 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { 2396 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) {
2383 video_hole_frames_.AddObserver(frame); 2397 video_hole_frames_.AddObserver(frame);
2384 } 2398 }
2385 2399
2386 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { 2400 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) {
2387 video_hole_frames_.RemoveObserver(frame); 2401 video_hole_frames_.RemoveObserver(frame);
2388 } 2402 }
2389 #endif // defined(VIDEO_HOLE) 2403 #endif // defined(VIDEO_HOLE)
2390 2404
2391 } // namespace content 2405 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698