| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 // this function returns. | 547 // this function returns. |
| 548 if (widget->DoInit(MSG_ROUTING_NONE, | 548 if (widget->DoInit(MSG_ROUTING_NONE, |
| 549 RenderWidget::CreateWebFrameWidget(widget.get(), frame), | 549 RenderWidget::CreateWebFrameWidget(widget.get(), frame), |
| 550 nullptr)) { | 550 nullptr)) { |
| 551 return widget.get(); | 551 return widget.get(); |
| 552 } | 552 } |
| 553 return nullptr; | 553 return nullptr; |
| 554 } | 554 } |
| 555 | 555 |
| 556 // static | 556 // static |
| 557 blink::WebWidget* RenderWidget::CreateWebFrameWidget( | 557 blink::WebFrameWidget* RenderWidget::CreateWebFrameWidget( |
| 558 RenderWidget* render_widget, | 558 RenderWidget* render_widget, |
| 559 blink::WebLocalFrame* frame) { | 559 blink::WebLocalFrame* frame) { |
| 560 if (!frame->parent()) { | 560 if (!frame->parent()) { |
| 561 // TODO(dcheng): The main frame widget currently has a special case. | 561 // TODO(dcheng): The main frame widget currently has a special case. |
| 562 // Eliminate this once WebView is no longer a WebWidget. | 562 // Eliminate this once WebView is no longer a WebWidget. |
| 563 return blink::WebFrameWidget::create(render_widget, frame->view(), frame); | 563 return blink::WebFrameWidget::create(render_widget, frame->view(), frame); |
| 564 } | 564 } |
| 565 return blink::WebFrameWidget::create(render_widget, frame); | 565 return blink::WebFrameWidget::create(render_widget, frame); |
| 566 } | 566 } |
| 567 | 567 |
| (...skipping 1726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2294 video_hole_frames_.RemoveObserver(frame); | 2294 video_hole_frames_.RemoveObserver(frame); |
| 2295 } | 2295 } |
| 2296 #endif // defined(VIDEO_HOLE) | 2296 #endif // defined(VIDEO_HOLE) |
| 2297 | 2297 |
| 2298 void RenderWidget::OnWaitNextFrameForTests(int routing_id) { | 2298 void RenderWidget::OnWaitNextFrameForTests(int routing_id) { |
| 2299 QueueMessage(new ViewHostMsg_WaitForNextFrameForTests_ACK(routing_id), | 2299 QueueMessage(new ViewHostMsg_WaitForNextFrameForTests_ACK(routing_id), |
| 2300 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); | 2300 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); |
| 2301 } | 2301 } |
| 2302 | 2302 |
| 2303 } // namespace content | 2303 } // namespace content |
| OLD | NEW |