Index: ui/compositor/test/grcontext_for_webgraphicscontext3d.h |
diff --git a/webkit/common/gpu/grcontext_for_webgraphicscontext3d.h b/ui/compositor/test/grcontext_for_webgraphicscontext3d.h |
similarity index 57% |
copy from webkit/common/gpu/grcontext_for_webgraphicscontext3d.h |
copy to ui/compositor/test/grcontext_for_webgraphicscontext3d.h |
index 0d882e8a89ee364625d41f583a559471fd21e9dc..c09c63a6ff2ec6681182b5b75b0128e6a06a290e 100644 |
--- a/webkit/common/gpu/grcontext_for_webgraphicscontext3d.h |
+++ b/ui/compositor/test/grcontext_for_webgraphicscontext3d.h |
@@ -1,13 +1,12 @@ |
-// Copyright (c) 2013 The Chromium Authors. All rights reserved. |
+// Copyright 2014 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef WEBKIT_COMMON_GPU_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ |
-#define WEBKIT_COMMON_GPU_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ |
+#ifndef UI_COMPOSITOR_TEST_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ |
+#define UI_COMPOSITOR_TEST_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ |
-#include "base/basictypes.h" |
+#include "base/macros.h" |
#include "skia/ext/refptr.h" |
-#include "webkit/common/gpu/webkit_gpu_export.h" |
class GrContext; |
@@ -15,19 +14,18 @@ namespace gpu_blink { |
class WebGraphicsContext3DImpl; |
} |
-namespace webkit { |
-namespace gpu { |
+namespace ui { |
// This class binds an offscreen GrContext to an offscreen context3d. The |
// context3d is used by the GrContext so must be valid as long as this class |
// is alive. |
-class WEBKIT_GPU_EXPORT GrContextForWebGraphicsContext3D { |
+class GrContextForWebGraphicsContext3D { |
piman
2015/01/21 02:07:36
You don't need this class any more.
|
public: |
explicit GrContextForWebGraphicsContext3D( |
gpu_blink::WebGraphicsContext3DImpl* context3d); |
virtual ~GrContextForWebGraphicsContext3D(); |
- GrContext* get() { return gr_context_.get(); } |
+ GrContext* context() { return gr_context_.get(); } |
void OnLostContext(); |
void FreeGpuResources(); |
@@ -38,7 +36,6 @@ class WEBKIT_GPU_EXPORT GrContextForWebGraphicsContext3D { |
DISALLOW_COPY_AND_ASSIGN(GrContextForWebGraphicsContext3D); |
}; |
-} // namespace gpu |
-} // namespace webkit |
+} // namespace ui |
-#endif // WEBKIT_COMMON_GPU_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ |
+#endif // UI_COMPOSITOR_TEST_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ |