ui/compositor/mac/io_surface_context_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: ui/compositor/mac/io_surface_context_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: nit DEPS, deps and gn 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

« ui/compositor/mac/accelerated_widget_mac.mm ('K') | « ui/compositor/mac/io_surface_context_mac.h ('k') | ui/compositor/mac/io_surface_layer_mac.h » ('j') | ui/compositor/mac/io_surface_layer_mac.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/compositor/mac/io_surface_context_mac.mm

diff --git a/content/browser/compositor/io_surface_context_mac.mm b/ui/compositor/mac/io_surface_context_mac.mm

similarity index 97%

rename from content/browser/compositor/io_surface_context_mac.mm

rename to ui/compositor/mac/io_surface_context_mac.mm

index 82c81b1a9498ea7dc7071e30c4c45121a058dfec..86c760d0855583fd0b1e219c8cc7390b920c70a9 100644

--- a/content/browser/compositor/io_surface_context_mac.mm

+++ b/ui/compositor/mac/io_surface_context_mac.mm

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

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

#include <OpenGL/gl.h>

#include <OpenGL/OpenGL.h>

@@ -11,7 +11,6 @@

#include "base/command_line.h"

#include "base/debug/trace_event.h"

#include "base/logging.h"

-#include "ui/base/ui_base_switches.h"

#include "ui/gl/gl_switches.h"

#include "ui/gl/gpu_switching_manager.h"