Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: ui/compositor/mac/surface_handle_types_mac.h

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
Index: ui/compositor/mac/surface_handle_types_mac.h
diff --git a/content/common/gpu/surface_handle_types_mac.h b/ui/compositor/mac/surface_handle_types_mac.h
similarity index 81%
rename from content/common/gpu/surface_handle_types_mac.h
rename to ui/compositor/mac/surface_handle_types_mac.h
index 8432017377abd39b9e3d2fe6472e7b5909ed0bba..08cf227d4385f309ddccf5c0a130784e8723aa54 100644
--- a/content/common/gpu/surface_handle_types_mac.h
+++ b/ui/compositor/mac/surface_handle_types_mac.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_COMPOSITOR_MAC_SURFACE_HANDLE_TYPES_MAC_H_
+#define UI_COMPOSITOR_MAC_SURFACE_HANDLE_TYPES_MAC_H_
#include <IOSurface/IOSurface.h>
#include <OpenGL/CGLIOSurface.h>
#include "base/basictypes.h"
#include "ui/base/cocoa/remote_layer_api.h"
+#include "ui/compositor/compositor_export.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);
+COMPOSITOR_EXPORT
uint64 SurfaceHandleFromIOSurfaceID(IOSurfaceID io_surface_id);
+
+COMPOSITOR_EXPORT
uint64 SurfaceHandleFromCAContextID(CAContextID ca_context_id);
-} // namespace content
+} // namespace ui
#endif // CONTENT_COMMON_GPU_HANDLE_TYPES_MAC_H_

Powered by Google App Engine
This is Rietveld 408576698