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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
489 is_fullscreen_granted_(false), | 489 is_fullscreen_granted_(false), |
490 display_mode_(blink::WebDisplayModeUndefined), | 490 display_mode_(blink::WebDisplayModeUndefined), |
491 has_focus_(false), | 491 has_focus_(false), |
492 handling_input_event_(false), | 492 handling_input_event_(false), |
493 handling_ime_event_(false), | 493 handling_ime_event_(false), |
494 handling_event_type_(WebInputEvent::Undefined), | 494 handling_event_type_(WebInputEvent::Undefined), |
495 ignore_ack_for_mouse_move_from_debugger_(false), | 495 ignore_ack_for_mouse_move_from_debugger_(false), |
496 closing_(false), | 496 closing_(false), |
497 host_closing_(false), | 497 host_closing_(false), |
498 is_swapped_out_(swapped_out), | 498 is_swapped_out_(swapped_out), |
| 499 for_subframe_(false), |
499 input_method_is_active_(false), | 500 input_method_is_active_(false), |
500 text_input_type_(ui::TEXT_INPUT_TYPE_NONE), | 501 text_input_type_(ui::TEXT_INPUT_TYPE_NONE), |
501 text_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT), | 502 text_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT), |
502 text_input_flags_(0), | 503 text_input_flags_(0), |
503 can_compose_inline_(true), | 504 can_compose_inline_(true), |
504 popup_type_(popup_type), | 505 popup_type_(popup_type), |
505 pending_window_rect_count_(0), | 506 pending_window_rect_count_(0), |
506 suppress_next_char_events_(false), | 507 suppress_next_char_events_(false), |
507 screen_info_(screen_info), | 508 screen_info_(screen_info), |
508 device_scale_factor_(screen_info_.deviceScaleFactor), | 509 device_scale_factor_(screen_info_.deviceScaleFactor), |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
553 bool hidden, | 554 bool hidden, |
554 const blink::WebScreenInfo& screen_info, | 555 const blink::WebScreenInfo& screen_info, |
555 CompositorDependencies* compositor_deps, | 556 CompositorDependencies* compositor_deps, |
556 blink::WebLocalFrame* frame) { | 557 blink::WebLocalFrame* frame) { |
557 CHECK_NE(routing_id, MSG_ROUTING_NONE); | 558 CHECK_NE(routing_id, MSG_ROUTING_NONE); |
558 scoped_refptr<RenderWidget> widget(new RenderWidget( | 559 scoped_refptr<RenderWidget> widget(new RenderWidget( |
559 blink::WebPopupTypeNone, screen_info, false, hidden, false)); | 560 blink::WebPopupTypeNone, screen_info, false, hidden, false)); |
560 widget->routing_id_ = routing_id; | 561 widget->routing_id_ = routing_id; |
561 widget->surface_id_ = surface_id; | 562 widget->surface_id_ = surface_id; |
562 widget->compositor_deps_ = compositor_deps; | 563 widget->compositor_deps_ = compositor_deps; |
| 564 widget->for_subframe_ = true; |
563 // DoInit increments the reference count on |widget|, keeping it alive after | 565 // DoInit increments the reference count on |widget|, keeping it alive after |
564 // this function returns. | 566 // this function returns. |
565 if (widget->DoInit(MSG_ROUTING_NONE, compositor_deps, | 567 if (widget->DoInit(MSG_ROUTING_NONE, compositor_deps, |
566 RenderWidget::CreateWebFrameWidget(widget.get(), frame), | 568 RenderWidget::CreateWebFrameWidget(widget.get(), frame), |
567 nullptr)) { | 569 nullptr)) { |
568 widget->CompleteInit(); | 570 widget->CompleteInit(); |
569 return widget.get(); | 571 return widget.get(); |
570 } | 572 } |
571 return nullptr; | 573 return nullptr; |
572 } | 574 } |
(...skipping 1865 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2438 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2440 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
2439 video_hole_frames_.AddObserver(frame); | 2441 video_hole_frames_.AddObserver(frame); |
2440 } | 2442 } |
2441 | 2443 |
2442 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2444 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
2443 video_hole_frames_.RemoveObserver(frame); | 2445 video_hole_frames_.RemoveObserver(frame); |
2444 } | 2446 } |
2445 #endif // defined(VIDEO_HOLE) | 2447 #endif // defined(VIDEO_HOLE) |
2446 | 2448 |
2447 } // namespace content | 2449 } // namespace content |
OLD | NEW |