Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/browser/frame_host/render_widget_host_view_guest.h" | 5 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 551 gfx::NativeViewAccessible accessible_parent) { | 551 gfx::NativeViewAccessible accessible_parent) { |
| 552 } | 552 } |
| 553 | 553 |
| 554 gfx::NativeViewId RenderWidgetHostViewGuest::GetParentForWindowlessPlugin() | 554 gfx::NativeViewId RenderWidgetHostViewGuest::GetParentForWindowlessPlugin() |
| 555 const { | 555 const { |
| 556 return NULL; | 556 return NULL; |
| 557 } | 557 } |
| 558 #endif | 558 #endif |
| 559 | 559 |
| 560 void RenderWidgetHostViewGuest::DestroyGuestView() { | 560 void RenderWidgetHostViewGuest::DestroyGuestView() { |
| 561 UnregisterSurfaceNamespaceId(); | |
|
wjmaclean
2016/01/27 21:39:28
So this eventually calls back to WebContentsImpl:
| |
| 561 host_->SetView(NULL); | 562 host_->SetView(NULL); |
| 562 host_ = NULL; | 563 host_ = NULL; |
| 563 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); | 564 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); |
| 564 } | 565 } |
| 565 | 566 |
| 566 bool RenderWidgetHostViewGuest::ForwardGestureEventToRenderer( | 567 bool RenderWidgetHostViewGuest::ForwardGestureEventToRenderer( |
| 567 ui::GestureEvent* gesture) { | 568 ui::GestureEvent* gesture) { |
| 568 #if defined(USE_AURA) | 569 #if defined(USE_AURA) |
| 569 if (!host_) | 570 if (!host_) |
| 570 return false; | 571 return false; |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 703 if (gesture_event.type == blink::WebInputEvent::GestureScrollUpdate && | 704 if (gesture_event.type == blink::WebInputEvent::GestureScrollUpdate && |
| 704 gesture_event.data.scrollUpdate.inertial) { | 705 gesture_event.data.scrollUpdate.inertial) { |
| 705 return; | 706 return; |
| 706 } | 707 } |
| 707 host_->ForwardGestureEvent(gesture_event); | 708 host_->ForwardGestureEvent(gesture_event); |
| 708 return; | 709 return; |
| 709 } | 710 } |
| 710 } | 711 } |
| 711 | 712 |
| 712 } // namespace content | 713 } // namespace content |
| OLD | NEW |