| Index: gpu/ipc/service/ca_layer_tree_mac.h
|
| diff --git a/content/common/gpu/ca_layer_tree_mac.h b/gpu/ipc/service/ca_layer_tree_mac.h
|
| similarity index 96%
|
| rename from content/common/gpu/ca_layer_tree_mac.h
|
| rename to gpu/ipc/service/ca_layer_tree_mac.h
|
| index 56ce4e4c6a55b4f9e1b3143543949562ea2b51d1..36aad0d2a578bbbb04f12ccc06c54bb60b6acb36 100644
|
| --- a/content/common/gpu/ca_layer_tree_mac.h
|
| +++ b/gpu/ipc/service/ca_layer_tree_mac.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_COMMON_GPU_CA_LAYER_TREE_MAC_H_
|
| -#define CONTENT_COMMON_GPU_CA_LAYER_TREE_MAC_H_
|
| +#ifndef GPU_IPC_SERVICE_CA_LAYER_TREE_MAC_H_
|
| +#define GPU_IPC_SERVICE_CA_LAYER_TREE_MAC_H_
|
|
|
| #include <IOSurface/IOSurface.h>
|
| #include <QuartzCore/QuartzCore.h>
|
| @@ -13,7 +13,7 @@
|
| #include "base/mac/scoped_cftyperef.h"
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "content/common/content_export.h"
|
| +#include "gpu/gpu_export.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/gfx/geometry/rect_f.h"
|
| #include "ui/gfx/mac/io_surface.h"
|
| @@ -21,12 +21,12 @@
|
|
|
| @class AVSampleBufferDisplayLayer;
|
|
|
| -namespace content {
|
| +namespace gpu {
|
|
|
| // The CALayerTree will construct a hierarchy of CALayers from a linear list,
|
| // using the algorithm and structure referenced described in
|
| // https://docs.google.com/document/d/1DtSN9zzvCF44_FQPM7ie01UxGHagQ66zfF5L9HnigQY/edit?usp=sharing
|
| -class CONTENT_EXPORT CALayerTree {
|
| +class GPU_EXPORT CALayerTree {
|
| public:
|
| CALayerTree();
|
|
|
| @@ -197,6 +197,6 @@ class CONTENT_EXPORT CALayerTree {
|
| DISALLOW_COPY_AND_ASSIGN(CALayerTree);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace gpu
|
|
|
| -#endif // CONTENT_COMMON_GPU_CA_LAYER_TREE_MAC_H_
|
| +#endif // GPU_IPC_SERVICE_CA_LAYER_TREE_MAC_H_
|
|
|