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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.cc

Issue 1382593004: Allow out-of-process iframes to update the mouse cursor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits addressed Created 5 years, 2 months 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
OLDNEW
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_child_frame.h" 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
6 6
7 #include "cc/surfaces/surface.h" 7 #include "cc/surfaces/surface.h"
8 #include "cc/surfaces/surface_factory.h" 8 #include "cc/surfaces/surface_factory.h"
9 #include "cc/surfaces/surface_manager.h" 9 #include "cc/surfaces/surface_manager.h"
10 #include "cc/surfaces/surface_sequence.h" 10 #include "cc/surfaces/surface_sequence.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 const gfx::Range& range, 155 const gfx::Range& range,
156 const std::vector<gfx::Rect>& character_bounds) { 156 const std::vector<gfx::Rect>& character_bounds) {
157 // TODO(kenrb): Fix OOPIF Ime. 157 // TODO(kenrb): Fix OOPIF Ime.
158 } 158 }
159 159
160 void RenderWidgetHostViewChildFrame::MovePluginWindows( 160 void RenderWidgetHostViewChildFrame::MovePluginWindows(
161 const std::vector<WebPluginGeometry>& moves) { 161 const std::vector<WebPluginGeometry>& moves) {
162 } 162 }
163 163
164 void RenderWidgetHostViewChildFrame::UpdateCursor(const WebCursor& cursor) { 164 void RenderWidgetHostViewChildFrame::UpdateCursor(const WebCursor& cursor) {
165 if (frame_connector_)
166 frame_connector_->UpdateCursor(cursor);
165 } 167 }
166 168
167 void RenderWidgetHostViewChildFrame::SetIsLoading(bool is_loading) { 169 void RenderWidgetHostViewChildFrame::SetIsLoading(bool is_loading) {
168 // It is valid for an inner WebContents's SetIsLoading() to end up here. 170 // It is valid for an inner WebContents's SetIsLoading() to end up here.
169 // This is because an inner WebContents's main frame's RenderWidgetHostView 171 // This is because an inner WebContents's main frame's RenderWidgetHostView
170 // is a RenderWidgetHostViewChildFrame. In contrast, when there is no 172 // is a RenderWidgetHostViewChildFrame. In contrast, when there is no
171 // inner/outer WebContents, only subframe's RenderWidgetHostView can be a 173 // inner/outer WebContents, only subframe's RenderWidgetHostView can be a
172 // RenderWidgetHostViewChildFrame which do not get a SetIsLoading() call. 174 // RenderWidgetHostViewChildFrame which do not get a SetIsLoading() call.
173 if (BrowserPluginGuestMode::UseCrossProcessFramesForGuests() && 175 if (BrowserPluginGuestMode::UseCrossProcessFramesForGuests() &&
174 BrowserPluginGuest::IsGuest( 176 BrowserPluginGuest::IsGuest(
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 BrowserAccessibilityManager::GetEmptyDocument(), delegate); 468 BrowserAccessibilityManager::GetEmptyDocument(), delegate);
467 } 469 }
468 470
469 void RenderWidgetHostViewChildFrame::ClearCompositorSurfaceIfNecessary() { 471 void RenderWidgetHostViewChildFrame::ClearCompositorSurfaceIfNecessary() {
470 if (surface_factory_ && !surface_id_.is_null()) 472 if (surface_factory_ && !surface_id_.is_null())
471 surface_factory_->Destroy(surface_id_); 473 surface_factory_->Destroy(surface_id_);
472 surface_id_ = cc::SurfaceId(); 474 surface_id_ = cc::SurfaceId();
473 } 475 }
474 476
475 } // namespace content 477 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/cross_process_frame_connector.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698