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

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

Issue 972313002: Make <webview> use out-of-process iframe architecture. (Closed) Base URL: ssh://saopaulo.wat/mnt/dev/shared/src@testoopif2z-better-chrome
Patch Set: address comments from creis@ Created 5 years, 6 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 "base/command_line.h"
7 #include "cc/surfaces/surface.h" 8 #include "cc/surfaces/surface.h"
8 #include "cc/surfaces/surface_factory.h" 9 #include "cc/surfaces/surface_factory.h"
9 #include "cc/surfaces/surface_manager.h" 10 #include "cc/surfaces/surface_manager.h"
10 #include "cc/surfaces/surface_sequence.h" 11 #include "cc/surfaces/surface_sequence.h"
11 #include "content/browser/accessibility/browser_accessibility_manager.h" 12 #include "content/browser/accessibility/browser_accessibility_manager.h"
13 #include "content/browser/browser_plugin/browser_plugin_guest.h"
12 #include "content/browser/frame_host/cross_process_frame_connector.h" 14 #include "content/browser/frame_host/cross_process_frame_connector.h"
13 #include "content/browser/gpu/compositor_util.h" 15 #include "content/browser/gpu/compositor_util.h"
16 #include "content/browser/renderer_host/render_view_host_impl.h"
14 #include "content/browser/renderer_host/render_widget_host_impl.h" 17 #include "content/browser/renderer_host/render_widget_host_impl.h"
15 #include "content/common/gpu/gpu_messages.h" 18 #include "content/common/gpu/gpu_messages.h"
16 #include "content/common/view_messages.h" 19 #include "content/common/view_messages.h"
17 #include "content/public/browser/render_process_host.h" 20 #include "content/public/browser/render_process_host.h"
21 #include "content/public/common/content_switches.h"
18 22
19 namespace content { 23 namespace content {
20 24
21 RenderWidgetHostViewChildFrame::RenderWidgetHostViewChildFrame( 25 RenderWidgetHostViewChildFrame::RenderWidgetHostViewChildFrame(
22 RenderWidgetHost* widget_host) 26 RenderWidgetHost* widget_host)
23 : host_(RenderWidgetHostImpl::From(widget_host)), 27 : host_(RenderWidgetHostImpl::From(widget_host)),
24 use_surfaces_(UseSurfacesEnabled()), 28 use_surfaces_(UseSurfacesEnabled()),
25 next_surface_sequence_(1u), 29 next_surface_sequence_(1u),
26 last_output_surface_id_(0), 30 last_output_surface_id_(0),
27 current_surface_scale_factor_(1.f), 31 current_surface_scale_factor_(1.f),
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 } 151 }
148 152
149 void RenderWidgetHostViewChildFrame::MovePluginWindows( 153 void RenderWidgetHostViewChildFrame::MovePluginWindows(
150 const std::vector<WebPluginGeometry>& moves) { 154 const std::vector<WebPluginGeometry>& moves) {
151 } 155 }
152 156
153 void RenderWidgetHostViewChildFrame::UpdateCursor(const WebCursor& cursor) { 157 void RenderWidgetHostViewChildFrame::UpdateCursor(const WebCursor& cursor) {
154 } 158 }
155 159
156 void RenderWidgetHostViewChildFrame::SetIsLoading(bool is_loading) { 160 void RenderWidgetHostViewChildFrame::SetIsLoading(bool is_loading) {
161 // Inner WebContents reaches this, so skip the NOTREACHED() check below.
162 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
163 switches::kSitePerProcess) &&
164 BrowserPluginGuest::IsGuest(
165 static_cast<RenderViewHostImpl*>(RenderViewHost::From(host_)))) {
166 return;
167 }
168
157 NOTREACHED(); 169 NOTREACHED();
158 } 170 }
159 171
160 void RenderWidgetHostViewChildFrame::TextInputTypeChanged( 172 void RenderWidgetHostViewChildFrame::TextInputTypeChanged(
161 ui::TextInputType type, 173 ui::TextInputType type,
162 ui::TextInputMode input_mode, 174 ui::TextInputMode input_mode,
163 bool can_compose_inline, 175 bool can_compose_inline,
164 int flags) { 176 int flags) {
165 // TODO(kenrb): Implement. 177 // TODO(kenrb): Implement.
166 } 178 }
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 } 429 }
418 430
419 BrowserAccessibilityManager* 431 BrowserAccessibilityManager*
420 RenderWidgetHostViewChildFrame::CreateBrowserAccessibilityManager( 432 RenderWidgetHostViewChildFrame::CreateBrowserAccessibilityManager(
421 BrowserAccessibilityDelegate* delegate) { 433 BrowserAccessibilityDelegate* delegate) {
422 return BrowserAccessibilityManager::Create( 434 return BrowserAccessibilityManager::Create(
423 BrowserAccessibilityManager::GetEmptyDocument(), delegate); 435 BrowserAccessibilityManager::GetEmptyDocument(), delegate);
424 } 436 }
425 437
426 } // namespace content 438 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698