| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 2518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2529 return &associated_interfaces_; | 2529 return &associated_interfaces_; |
| 2530 } | 2530 } |
| 2531 | 2531 |
| 2532 AssociatedInterfaceProvider* | 2532 AssociatedInterfaceProvider* |
| 2533 RenderFrameImpl::GetRemoteAssociatedInterfaces() { | 2533 RenderFrameImpl::GetRemoteAssociatedInterfaces() { |
| 2534 if (!remote_associated_interfaces_) { | 2534 if (!remote_associated_interfaces_) { |
| 2535 ChildThreadImpl* thread = ChildThreadImpl::current(); | 2535 ChildThreadImpl* thread = ChildThreadImpl::current(); |
| 2536 if (thread) { | 2536 if (thread) { |
| 2537 mojom::AssociatedInterfaceProviderAssociatedPtr remote_interfaces; | 2537 mojom::AssociatedInterfaceProviderAssociatedPtr remote_interfaces; |
| 2538 thread->GetRemoteRouteProvider()->GetRoute( | 2538 thread->GetRemoteRouteProvider()->GetRoute( |
| 2539 routing_id_, | 2539 routing_id_, mojo::MakeRequest(&remote_interfaces)); |
| 2540 mojo::MakeRequest(&remote_interfaces, | |
| 2541 thread->channel()->GetAssociatedGroup())); | |
| 2542 remote_associated_interfaces_.reset( | 2540 remote_associated_interfaces_.reset( |
| 2543 new AssociatedInterfaceProviderImpl(std::move(remote_interfaces))); | 2541 new AssociatedInterfaceProviderImpl(std::move(remote_interfaces))); |
| 2544 } else { | 2542 } else { |
| 2545 // In some tests the thread may be null, | 2543 // In some tests the thread may be null, |
| 2546 // so set up a self-contained interface provider instead. | 2544 // so set up a self-contained interface provider instead. |
| 2547 remote_associated_interfaces_.reset( | 2545 remote_associated_interfaces_.reset( |
| 2548 new AssociatedInterfaceProviderImpl()); | 2546 new AssociatedInterfaceProviderImpl()); |
| 2549 } | 2547 } |
| 2550 } | 2548 } |
| 2551 return remote_associated_interfaces_.get(); | 2549 return remote_associated_interfaces_.get(); |
| (...skipping 4298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6850 // event target. Potentially a Pepper plugin will receive the event. | 6848 // event target. Potentially a Pepper plugin will receive the event. |
| 6851 // In order to tell whether a plugin gets the last mouse event and which it | 6849 // In order to tell whether a plugin gets the last mouse event and which it |
| 6852 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6850 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6853 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6851 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6854 // |pepper_last_mouse_event_target_|. | 6852 // |pepper_last_mouse_event_target_|. |
| 6855 pepper_last_mouse_event_target_ = nullptr; | 6853 pepper_last_mouse_event_target_ = nullptr; |
| 6856 #endif | 6854 #endif |
| 6857 } | 6855 } |
| 6858 | 6856 |
| 6859 } // namespace content | 6857 } // namespace content |
| OLD | NEW |