| Index: gpu/blink/webgraphicscontext3d_impl.h
|
| diff --git a/webkit/common/gpu/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
|
| similarity index 98%
|
| copy from webkit/common/gpu/webgraphicscontext3d_impl.h
|
| copy to gpu/blink/webgraphicscontext3d_impl.h
|
| index 3ed0dd97269b502022db5751f1d0417f7aa6e72e..41a6d89411c29764b605cf7c8eb8a4bb24ed289b 100644
|
| --- a/webkit/common/gpu/webgraphicscontext3d_impl.h
|
| +++ b/gpu/blink/webgraphicscontext3d_impl.h
|
| @@ -2,17 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IMPL_H_
|
| -#define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IMPL_H_
|
| +#ifndef GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
|
| +#define GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "gpu/blink/gpu_blink_export.h"
|
| #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| -#include "webkit/common/gpu/webkit_gpu_export.h"
|
|
|
| namespace gpu {
|
|
|
| @@ -38,12 +38,11 @@ using blink::WGC3Dclampf;
|
| using blink::WGC3Dintptr;
|
| using blink::WGC3Dsizeiptr;
|
|
|
| -namespace webkit {
|
| -namespace gpu {
|
| +namespace gpu_blink {
|
|
|
| class WebGraphicsContext3DErrorMessageCallback;
|
|
|
| -class WEBKIT_GPU_EXPORT WebGraphicsContext3DImpl
|
| +class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
|
| : public NON_EXPORTED_BASE(blink::WebGraphicsContext3D) {
|
| public:
|
| virtual ~WebGraphicsContext3DImpl();
|
| @@ -608,7 +607,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DImpl
|
| uint32_t flush_id_;
|
| };
|
|
|
| -} // namespace gpu
|
| -} // namespace webkit
|
| +} // namespace gpu_blink
|
|
|
| -#endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IMPL_H_
|
| +#endif // GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
|
|
|