content/browser/renderer_host/accelerated_surface_container_manager_mac.h - Issue 6718027: Refactor: Move app/surface to ui/gfx/surface.

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/accelerated_surface_container_manager_mac.h

Issue 6718027: Refactor: Move app/surface to ui/gfx/surface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 9 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/accelerated_surface_container_mac.cc ('k') | content/browser/renderer_host/backing_store.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/accelerated_surface_container_manager_mac.h

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

index e3a4e0ed53699664a79b1ad5b6fe9aab29c9fb05..8e5cd22cdc6507a9f2b652e04cecff53de8b8b85 100644

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

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

@@ -1,18 +1,18 @@

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

// found in the LICENSE file.

-#ifndef CONTENT_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_

-#define CONTENT_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_

+#ifndef CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_SURFACE_CONTAINER_MANAGER_MAC_H_

+#define CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_SURFACE_CONTAINER_MANAGER_MAC_H_

#pragma once

#include <OpenGL/OpenGL.h>

#include <map>

-#include "app/surface/transport_dib.h"

#include "base/basictypes.h"

#include "base/synchronization/lock.h"

#include "ui/gfx/native_widget_types.h"

+#include "ui/gfx/surface/transport_dib.h"

namespace webkit {

namespace npapi {

@@ -122,4 +122,4 @@ class AcceleratedSurfaceContainerManagerMac {

DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerManagerMac);

};

-#endif // CONTENT_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_

+#endif // CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_SURFACE_CONTAINER_MANAGER_MAC_H_