OLD | NEW |
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 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
580 widget->CompleteInit(); | 580 widget->CompleteInit(); |
581 return widget.get(); | 581 return widget.get(); |
582 } | 582 } |
583 return nullptr; | 583 return nullptr; |
584 } | 584 } |
585 | 585 |
586 // static | 586 // static |
587 blink::WebWidget* RenderWidget::CreateWebFrameWidget( | 587 blink::WebWidget* RenderWidget::CreateWebFrameWidget( |
588 RenderWidget* render_widget, | 588 RenderWidget* render_widget, |
589 blink::WebLocalFrame* frame) { | 589 blink::WebLocalFrame* frame) { |
| 590 if (!frame->parent()) { |
| 591 // TODO(dcheng): The main frame widget currently has a special case. |
| 592 // Eliminate this once WebView is no longer a WebWidget. |
| 593 return blink::WebFrameWidget::create(render_widget, frame->view(), frame); |
| 594 } |
590 return blink::WebFrameWidget::create(render_widget, frame); | 595 return blink::WebFrameWidget::create(render_widget, frame); |
591 } | 596 } |
592 | 597 |
593 // static | 598 // static |
594 blink::WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) { | 599 blink::WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) { |
595 switch (render_widget->popup_type_) { | 600 switch (render_widget->popup_type_) { |
596 case blink::WebPopupTypeNone: // Nothing to create. | 601 case blink::WebPopupTypeNone: // Nothing to create. |
597 break; | 602 break; |
598 case blink::WebPopupTypePage: | 603 case blink::WebPopupTypePage: |
599 return WebPagePopup::create(render_widget); | 604 return WebPagePopup::create(render_widget); |
(...skipping 1842 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2442 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2447 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
2443 video_hole_frames_.AddObserver(frame); | 2448 video_hole_frames_.AddObserver(frame); |
2444 } | 2449 } |
2445 | 2450 |
2446 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2451 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
2447 video_hole_frames_.RemoveObserver(frame); | 2452 video_hole_frames_.RemoveObserver(frame); |
2448 } | 2453 } |
2449 #endif // defined(VIDEO_HOLE) | 2454 #endif // defined(VIDEO_HOLE) |
2450 | 2455 |
2451 } // namespace content | 2456 } // namespace content |
OLD | NEW |