content/browser/renderer_host/render_widget_host_view_mac.mm - 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.mm

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: rebase to master 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

« content/browser/gpu/gpu_process_host_ui_shim.cc ('K') | « content/browser/renderer_host/render_widget_host_view_mac.h ('k') | content/common/gpu/image_transport_surface_calayer_mac.mm » ('j') | ui/compositor/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac.mm

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

index 100d8b1a9d9ef79f5b3c3cf84f9da33b8ddf4bc6..b7f0f3ad2b8b8d049ba2d20983c401e3308e49a5 100644

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

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

@@ -30,22 +30,19 @@

#include "content/browser/accessibility/browser_accessibility_manager_mac.h"

#import "content/browser/cocoa/system_hotkey_helper_mac.h"

#import "content/browser/cocoa/system_hotkey_map.h"

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

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

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

#include "content/browser/frame_host/frame_tree.h"

#include "content/browser/frame_host/frame_tree_node.h"

#include "content/browser/frame_host/render_frame_host_impl.h"

#include "content/browser/gpu/compositor_util.h"

-#include "content/browser/renderer_host/render_widget_helper.h"

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

+#include "content/browser/renderer_host/render_widget_helper.h"

#import "content/browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h"

#import "content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h"

#import "content/browser/renderer_host/text_input_client_mac.h"

#include "content/common/accessibility_messages.h"

#include "content/common/edit_command.h"

#include "content/common/gpu/gpu_messages.h"

-#include "content/common/gpu/surface_handle_types_mac.h"

#include "content/common/input_messages.h"

#include "content/common/view_messages.h"

#include "content/common/webplugin_geometry.h"

@@ -66,10 +63,12 @@

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

#import "ui/base/cocoa/fullscreen_window_manager.h"

#import "ui/base/cocoa/underlay_opengl_hosting_window.h"

-#include "ui/events/keycodes/keyboard_codes.h"

#include "ui/base/layout.h"

#include "ui/compositor/compositor.h"

#include "ui/compositor/layer.h"

+#include "ui/compositor/mac/io_surface_layer_mac.h"

+#include "ui/compositor/mac/surface_handle_types_mac.h"

+#include "ui/events/keycodes/keyboard_codes.h"

#include "ui/gfx/display.h"

#include "ui/gfx/frame_time.h"

#include "ui/gfx/geometry/dip_util.h"