| Index: ui/accelerated_widget_mac/surface_handle_types.h
|
| diff --git a/content/common/gpu/surface_handle_types_mac.h b/ui/accelerated_widget_mac/surface_handle_types.h
|
| similarity index 73%
|
| rename from content/common/gpu/surface_handle_types_mac.h
|
| rename to ui/accelerated_widget_mac/surface_handle_types.h
|
| index 8432017377abd39b9e3d2fe6472e7b5909ed0bba..7b55ec94a51aefdffa71bd582f102e4a9e466957 100644
|
| --- a/content/common/gpu/surface_handle_types_mac.h
|
| +++ b/ui/accelerated_widget_mac/surface_handle_types.h
|
| @@ -2,16 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_COMMON_GPU_SURFACE_HANDLE_TYPES_MAC_H_
|
| -#define CONTENT_COMMON_GPU_SURFACE_HANDLE_TYPES_MAC_H_
|
| +#ifndef UI_ACCELERATED_WIDGET_MAC_SURFACE_HANDLE_TYPES_H_
|
| +#define UI_ACCELERATED_WIDGET_MAC_SURFACE_HANDLE_TYPES_H_
|
|
|
| #include <IOSurface/IOSurface.h>
|
| #include <OpenGL/CGLIOSurface.h>
|
|
|
| #include "base/basictypes.h"
|
| +#include "ui/accelerated_widget_mac/accelerated_widget_mac_export.h"
|
| #include "ui/base/cocoa/remote_layer_api.h"
|
|
|
| -namespace content {
|
| +namespace ui {
|
|
|
| // The surface handle passed between the GPU and browser process may refer to
|
| // an IOSurface or a CAContext. These helper functions must be used to identify
|
| @@ -27,9 +28,12 @@ SurfaceHandleType GetSurfaceHandleType(uint64 surface_handle);
|
| CAContextID CAContextIDFromSurfaceHandle(uint64 surface_handle);
|
| IOSurfaceID IOSurfaceIDFromSurfaceHandle(uint64 surface_handle);
|
|
|
| +ACCELERATED_WIDGET_MAC_EXPORT
|
| uint64 SurfaceHandleFromIOSurfaceID(IOSurfaceID io_surface_id);
|
| +
|
| +ACCELERATED_WIDGET_MAC_EXPORT
|
| uint64 SurfaceHandleFromCAContextID(CAContextID ca_context_id);
|
|
|
| -} // namespace content
|
| +} // namespace ui
|
|
|
| -#endif // CONTENT_COMMON_GPU_HANDLE_TYPES_MAC_H_
|
| +#endif // UI_ACCELERATED_WIDGET_MAC_SURFACE_HANDLE_TYPES_H_
|
|
|