content/browser/renderer_host/render_widget_host_view_mac.h - Issue 753933002: MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 753933002: MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20141124-MacViews-MoveSoftwareLayerMac-fromcl

Patch Set: gn check Created 6 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/gpu/gpu_process_host_ui_shim.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac.h

diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h

index 74317b058fb5d16215b4d7505c94040d3ff978f6..89b724053d4ad67f6bc28401956a791425a7aa84 100644

--- a/content/browser/renderer_host/render_widget_host_view_mac.h

+++ b/content/browser/renderer_host/render_widget_host_view_mac.h

@@ -17,10 +17,8 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "base/time/time.h"

-#include "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h"

#include "content/browser/compositor/browser_compositor_view_mac.h"

#include "content/browser/compositor/delegated_frame_host.h"

-#include "content/browser/compositor/io_surface_layer_mac.h"

#include "content/browser/renderer_host/display_link_mac.h"

#include "content/browser/renderer_host/render_widget_host_view_base.h"

#include "content/browser/renderer_host/software_frame_manager.h"

@@ -30,6 +28,8 @@

#import "content/public/browser/render_widget_host_view_mac_base.h"

#include "ipc/ipc_sender.h"

#include "third_party/WebKit/public/web/WebCompositionUnderline.h"

+#include "ui/accelerated_widget_mac/accelerated_widget_mac.h"

+#include "ui/accelerated_widget_mac/io_surface_layer.h"

#include "ui/base/cocoa/base_view.h"

#include "ui/base/cocoa/remote_layer_api.h"

#include "ui/gfx/display_observer.h"

@@ -205,7 +205,7 @@ class RenderWidgetHostImpl;

class CONTENT_EXPORT RenderWidgetHostViewMac

: public RenderWidgetHostViewBase,

public DelegatedFrameHostClient,

- public AcceleratedWidgetMacNSView,

+ public ui::AcceleratedWidgetMacNSView,

public IPC::Sender,

public gfx::DisplayObserver {

public:

« no previous file with comments | « content/browser/gpu/gpu_process_host_ui_shim.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »