| 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 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 int64_t TraceId() const override { return latency_info_.trace_id(); } | 651 int64_t TraceId() const override { return latency_info_.trace_id(); } |
| 652 | 652 |
| 653 private: | 653 private: |
| 654 ui::LatencyInfo latency_info_; | 654 ui::LatencyInfo latency_info_; |
| 655 }; | 655 }; |
| 656 | 656 |
| 657 } // namespace | 657 } // namespace |
| 658 | 658 |
| 659 RenderViewImpl::RenderViewImpl(CompositorDependencies* compositor_deps, | 659 RenderViewImpl::RenderViewImpl(CompositorDependencies* compositor_deps, |
| 660 const mojom::CreateViewParams& params) | 660 const mojom::CreateViewParams& params) |
| 661 : RenderWidget(compositor_deps, | 661 : RenderWidget(params.view_id, |
| 662 compositor_deps, |
| 662 blink::WebPopupTypeNone, | 663 blink::WebPopupTypeNone, |
| 663 params.initial_size.screen_info, | 664 params.initial_size.screen_info, |
| 664 params.swapped_out, | 665 params.swapped_out, |
| 665 params.hidden, | 666 params.hidden, |
| 666 params.never_visible), | 667 params.never_visible), |
| 667 webkit_preferences_(params.web_preferences), | 668 webkit_preferences_(params.web_preferences), |
| 668 send_content_state_immediately_(false), | 669 send_content_state_immediately_(false), |
| 669 enabled_bindings_(0), | 670 enabled_bindings_(0), |
| 670 send_preferred_size_changes_(false), | 671 send_preferred_size_changes_(false), |
| 671 navigation_gesture_(NavigationGestureUnknown), | 672 navigation_gesture_(NavigationGestureUnknown), |
| (...skipping 18 matching lines...) Expand all Loading... |
| 690 expected_content_intent_id_(0), | 691 expected_content_intent_id_(0), |
| 691 #endif | 692 #endif |
| 692 enumeration_completion_id_(0), | 693 enumeration_completion_id_(0), |
| 693 session_storage_namespace_id_(params.session_storage_namespace_id), | 694 session_storage_namespace_id_(params.session_storage_namespace_id), |
| 694 has_added_input_handler_(false) { | 695 has_added_input_handler_(false) { |
| 695 GetWidget()->set_owner_delegate(this); | 696 GetWidget()->set_owner_delegate(this); |
| 696 } | 697 } |
| 697 | 698 |
| 698 void RenderViewImpl::Initialize(const mojom::CreateViewParams& params, | 699 void RenderViewImpl::Initialize(const mojom::CreateViewParams& params, |
| 699 bool was_created_by_renderer) { | 700 bool was_created_by_renderer) { |
| 700 RenderWidget::InitRoutingID(params.view_id); | |
| 701 | |
| 702 int opener_view_routing_id = MSG_ROUTING_NONE; | 701 int opener_view_routing_id = MSG_ROUTING_NONE; |
| 703 WebFrame* opener_frame = RenderFrameImpl::ResolveOpener( | 702 WebFrame* opener_frame = RenderFrameImpl::ResolveOpener( |
| 704 params.opener_frame_route_id, &opener_view_routing_id); | 703 params.opener_frame_route_id, &opener_view_routing_id); |
| 705 if (!was_created_by_renderer) | 704 if (!was_created_by_renderer) |
| 706 opener_view_routing_id = MSG_ROUTING_NONE; | 705 opener_view_routing_id = MSG_ROUTING_NONE; |
| 707 | 706 |
| 708 display_mode_ = params.initial_size.display_mode; | 707 display_mode_ = params.initial_size.display_mode; |
| 709 | 708 |
| 710 webview_ = | 709 webview_ = |
| 711 WebView::create(this, is_hidden() ? blink::WebPageVisibilityStateHidden | 710 WebView::create(this, is_hidden() ? blink::WebPageVisibilityStateHidden |
| (...skipping 2257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2969 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); | 2968 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2970 } | 2969 } |
| 2971 | 2970 |
| 2972 std::unique_ptr<InputEventAck> ack( | 2971 std::unique_ptr<InputEventAck> ack( |
| 2973 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type, | 2972 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type, |
| 2974 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); | 2973 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); |
| 2975 OnInputEventAck(std::move(ack)); | 2974 OnInputEventAck(std::move(ack)); |
| 2976 } | 2975 } |
| 2977 | 2976 |
| 2978 } // namespace content | 2977 } // namespace content |
| OLD | NEW |