content/plugin/webplugin_accelerated_surface_proxy_mac.h - Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/plugin/webplugin_accelerated_surface_proxy_mac.h

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix mac_rel Created 8 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/plugin/webplugin_proxy.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #ifndef CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_	5 #ifndef CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_

6 #define CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_	6 #define CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_

7 #pragma once	7 #pragma once

8	8

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "ui/gfx/gl/gpu_preference.h"	10 #include "ui/gl/gpu_preference.h"

11 #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"	11 #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"

12	12

13 class WebPluginProxy;	13 class WebPluginProxy;

14 class AcceleratedSurface;	14 class AcceleratedSurface;

15	15

16 // Out-of-process implementation of WebPluginAcceleratedSurface that proxies	16 // Out-of-process implementation of WebPluginAcceleratedSurface that proxies

17 // calls through a WebPluginProxy.	17 // calls through a WebPluginProxy.

18 class WebPluginAcceleratedSurfaceProxy	18 class WebPluginAcceleratedSurfaceProxy

19 : public webkit::npapi::WebPluginAcceleratedSurface {	19 : public webkit::npapi::WebPluginAcceleratedSurface {

20 public:	20 public:

(...skipping 21 matching lines...) Expand all Loading...
42	42

43 WebPluginProxy* plugin_proxy_; // Weak ref.	43 WebPluginProxy* plugin_proxy_; // Weak ref.

44 gfx::PluginWindowHandle window_handle_;	44 gfx::PluginWindowHandle window_handle_;

45 AcceleratedSurface* surface_;	45 AcceleratedSurface* surface_;

46 bool composited_;	46 bool composited_;

47	47

48 DISALLOW_COPY_AND_ASSIGN(WebPluginAcceleratedSurfaceProxy);	48 DISALLOW_COPY_AND_ASSIGN(WebPluginAcceleratedSurfaceProxy);

49 };	49 };

50	50

51 #endif // CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_	51 #endif // CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_

OLD	NEW