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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
707 WebFrame* opener_frame = RenderFrameImpl::ResolveOpener( | 707 WebFrame* opener_frame = RenderFrameImpl::ResolveOpener( |
708 params.opener_frame_route_id, &opener_view_routing_id); | 708 params.opener_frame_route_id, &opener_view_routing_id); |
709 if (opener_view_routing_id != MSG_ROUTING_NONE && was_created_by_renderer) | 709 if (opener_view_routing_id != MSG_ROUTING_NONE && was_created_by_renderer) |
710 opener_id_ = opener_view_routing_id; | 710 opener_id_ = opener_view_routing_id; |
711 | 711 |
712 display_mode_ = params.initial_size.display_mode; | 712 display_mode_ = params.initial_size.display_mode; |
713 | 713 |
714 webview_ = | 714 webview_ = |
715 WebView::create(this, is_hidden() ? blink::WebPageVisibilityStateHidden | 715 WebView::create(this, is_hidden() ? blink::WebPageVisibilityStateHidden |
716 : blink::WebPageVisibilityStateVisible); | 716 : blink::WebPageVisibilityStateVisible); |
717 RenderWidget::DoInit(MSG_ROUTING_NONE, webview_->widget(), nullptr); | 717 RenderWidget::DoInit(MSG_ROUTING_NONE, webview_->widget(), |
| 718 CreateWidgetCallback()); |
718 | 719 |
719 g_view_map.Get().insert(std::make_pair(webview(), this)); | 720 g_view_map.Get().insert(std::make_pair(webview(), this)); |
720 g_routing_id_view_map.Get().insert(std::make_pair(GetRoutingID(), this)); | 721 g_routing_id_view_map.Get().insert(std::make_pair(GetRoutingID(), this)); |
721 | 722 |
722 const base::CommandLine& command_line = | 723 const base::CommandLine& command_line = |
723 *base::CommandLine::ForCurrentProcess(); | 724 *base::CommandLine::ForCurrentProcess(); |
724 | 725 |
725 if (command_line.HasSwitch(switches::kStatsCollectionController)) | 726 if (command_line.HasSwitch(switches::kStatsCollectionController)) |
726 stats_collection_observer_.reset(new StatsCollectionObserver(this)); | 727 stats_collection_observer_.reset(new StatsCollectionObserver(this)); |
727 | 728 |
(...skipping 2311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3039 NotifyInputEventHandled(input_event->type, | 3040 NotifyInputEventHandled(input_event->type, |
3040 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); | 3041 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
3041 } | 3042 } |
3042 | 3043 |
3043 std::unique_ptr<InputEventAck> ack( | 3044 std::unique_ptr<InputEventAck> ack( |
3044 new InputEventAck(input_event->type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); | 3045 new InputEventAck(input_event->type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); |
3045 OnInputEventAck(std::move(ack)); | 3046 OnInputEventAck(std::move(ack)); |
3046 } | 3047 } |
3047 | 3048 |
3048 } // namespace content | 3049 } // namespace content |
OLD | NEW |