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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2493293002: RenderWidget: make routing_id be a parameter of the ctor (Closed)
Patch Set: Tweak. Created 4 years, 1 month 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
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_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
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
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 RenderWidget::InitInputHandler();
lfg 2016/11/14 22:09:59 Why do you need to add this? I assume tests were f
ncarter (slow) 2016/11/14 23:33:56 It wasn't strictly necessary; I figured that so lo
701 702
702 int opener_view_routing_id = MSG_ROUTING_NONE; 703 int opener_view_routing_id = MSG_ROUTING_NONE;
703 WebFrame* opener_frame = RenderFrameImpl::ResolveOpener( 704 WebFrame* opener_frame = RenderFrameImpl::ResolveOpener(
704 params.opener_frame_route_id, &opener_view_routing_id); 705 params.opener_frame_route_id, &opener_view_routing_id);
705 if (!was_created_by_renderer) 706 if (!was_created_by_renderer)
706 opener_view_routing_id = MSG_ROUTING_NONE; 707 opener_view_routing_id = MSG_ROUTING_NONE;
707 708
708 display_mode_ = params.initial_size.display_mode; 709 display_mode_ = params.initial_size.display_mode;
709 710
710 webview_ = 711 webview_ =
(...skipping 2258 matching lines...) Expand 10 before | Expand all | Expand 10 after
2969 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 2970 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
2970 } 2971 }
2971 2972
2972 std::unique_ptr<InputEventAck> ack( 2973 std::unique_ptr<InputEventAck> ack(
2973 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type, 2974 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type,
2974 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); 2975 INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
2975 OnInputEventAck(std::move(ack)); 2976 OnInputEventAck(std::move(ack));
2976 } 2977 }
2977 2978
2978 } // namespace content 2979 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698