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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 348 return rwhv->GetNativeViewAccessible(); | 348 return rwhv->GetNativeViewAccessible(); |
| 349 } | 349 } |
| 350 | 350 |
| 351 void RenderWidgetHostViewGuest::UpdateCursor(const WebCursor& cursor) { | 351 void RenderWidgetHostViewGuest::UpdateCursor(const WebCursor& cursor) { |
| 352 // InterstitialPages are not WebContents so we cannot intercept | 352 // InterstitialPages are not WebContents so we cannot intercept |
| 353 // ViewHostMsg_SetCursor for interstitial pages in BrowserPluginGuest. | 353 // ViewHostMsg_SetCursor for interstitial pages in BrowserPluginGuest. |
| 354 // All guest RenderViewHosts have RenderWidgetHostViewGuests however, | 354 // All guest RenderViewHosts have RenderWidgetHostViewGuests however, |
| 355 // and so we will always hit this code path. | 355 // and so we will always hit this code path. |
| 356 if (!guest_) | 356 if (!guest_) |
| 357 return; | 357 return; |
| 358 // TODO(creis): This is wrong. Should check for OOPIF webview mode instead. | |
|
alexmos
2017/02/04 02:03:01
I actually think this is ok. The description in t
Charlie Reis
2017/02/13 22:02:49
Acknowledged.
| |
| 358 if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { | 359 if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
| 359 RenderWidgetHostViewBase* rwhvb = GetOwnerRenderWidgetHostView(); | 360 RenderWidgetHostViewBase* rwhvb = GetOwnerRenderWidgetHostView(); |
| 360 if (rwhvb) | 361 if (rwhvb) |
| 361 rwhvb->UpdateCursor(cursor); | 362 rwhvb->UpdateCursor(cursor); |
| 362 } else { | 363 } else { |
| 363 guest_->SendMessageToEmbedder(base::MakeUnique<BrowserPluginMsg_SetCursor>( | 364 guest_->SendMessageToEmbedder(base::MakeUnique<BrowserPluginMsg_SetCursor>( |
| 364 guest_->browser_plugin_instance_id(), cursor)); | 365 guest_->browser_plugin_instance_id(), cursor)); |
| 365 } | 366 } |
| 366 } | 367 } |
| 367 | 368 |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 647 gesture_event.data.scrollUpdate.inertialPhase == | 648 gesture_event.data.scrollUpdate.inertialPhase == |
| 648 blink::WebGestureEvent::MomentumPhase) { | 649 blink::WebGestureEvent::MomentumPhase) { |
| 649 return; | 650 return; |
| 650 } | 651 } |
| 651 host_->ForwardGestureEvent(gesture_event); | 652 host_->ForwardGestureEvent(gesture_event); |
| 652 return; | 653 return; |
| 653 } | 654 } |
| 654 } | 655 } |
| 655 | 656 |
| 656 } // namespace content | 657 } // namespace content |
| OLD | NEW |