7 files changed, 11 insertions, 45 deletions

diff --git a/gpu/command_buffer/client/cmd_buffer_helper.h b/gpu/command_buffer/client/cmd_buffer_helper.h
index 8a7e122..bc3fd56 100644
--- a/gpu/command_buffer/client/cmd_buffer_helper.h
+++ b/gpu/command_buffer/client/cmd_buffer_helper.h
@@ -10,7 +10,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "../../gpu_export.h"
 #include "../common/logging.h"
 #include "../common/constants.h"
 #include "../common/cmd_buffer_common.h"
@@ -33,7 +32,7 @@ namespace gpu {
 //
 // helper.WaitForToken(token);  // this doesn't return until the first two
 //                              // commands have been executed.
-class GPU_EXPORT CommandBufferHelper {
+class CommandBufferHelper {
  public:
   explicit CommandBufferHelper(CommandBuffer* command_buffer);
   virtual ~CommandBufferHelper();
diff --git a/gpu/command_buffer/client/fenced_allocator.h b/gpu/command_buffer/client/fenced_allocator.h
index 3ccad45..74cdf33 100644
--- a/gpu/command_buffer/client/fenced_allocator.h
+++ b/gpu/command_buffer/client/fenced_allocator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -8,8 +8,6 @@
 #define GPU_COMMAND_BUFFER_CLIENT_FENCED_ALLOCATOR_H_
 
 #include <vector>
-
-#include "../../gpu_export.h"
 #include "../common/logging.h"
 #include "../common/types.h"
 
@@ -26,7 +24,7 @@ class CommandBufferHelper;
 // environment which is multi-process, this class isn't "thread safe", because
 // it isn't meant to be shared across modules. It is thread-compatible though
 // (see http://www.corp.google.com/eng/doc/cpp_primer.html#thread_safety).
-class GPU_EXPORT FencedAllocator {
+class FencedAllocator {
  public:
   typedef unsigned int Offset;
   // Invalid offset, returned by Alloc in case of failure.
diff --git a/gpu/command_buffer/client/gles2_impl_export.h b/gpu/command_buffer/client/gles2_impl_export.h
deleted file mode 100644
index 9bf1871..0000000
--- a/gpu/command_buffer/client/gles2_impl_export.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 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 GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPL_EXPORT_H_
-#define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPL_EXPORT_H_
-#pragma once
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(GLES2_IMPL_IMPLEMENTATION)
-#define GLES2_IMPL_EXPORT __declspec(dllexport)
-#else
-#define GLES2_IMPL_EXPORT __declspec(dllimport)
-#endif  // defined(GLES2_IMPL_IMPLEMENTATION)
-
-#else  // defined(WIN32)
-#define GLES2_IMPL_EXPORT __attribute__((visibility("default")))
-#endif
-
-#else  // defined(COMPONENT_BUILD)
-#define GLES2_IMPL_EXPORT
-#endif
-
-#endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPL_EXPORT_H_
diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h
index dbdb271..97622ea 100644
--- a/gpu/command_buffer/client/gles2_implementation.h
+++ b/gpu/command_buffer/client/gles2_implementation.h
@@ -17,7 +17,6 @@
 #include "../common/scoped_ptr.h"
 #include "../client/gles2_cmd_helper.h"
 #include "../client/ring_buffer.h"
-#include "gles2_impl_export.h"
 
 #if !defined(NDEBUG) && !defined(__native_client__) && !defined(GLES2_CONFORMANCE_TESTS)  // NOLINT
   #if defined(GLES2_INLINE_OPTIMIZATION)
@@ -105,7 +104,7 @@ class IdHandlerInterface {
 // be had by changing your code to use command buffers directly by using the
 // GLES2CmdHelper but that entails changing your code to use and deal with
 // shared memory and synchronization issues.
-class GLES2_IMPL_EXPORT GLES2Implementation {
+class GLES2Implementation {
  public:
   // Stores client side cached GL state.
   struct GLState {
diff --git a/gpu/command_buffer/client/mapped_memory.h b/gpu/command_buffer/client/mapped_memory.h
index 93390a7..f38470f 100644
--- a/gpu/command_buffer/client/mapped_memory.h
+++ b/gpu/command_buffer/client/mapped_memory.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "../../gpu_export.h"
 #include "../common/types.h"
 #include "../client/fenced_allocator.h"
 #include "../common/buffer.h"
@@ -17,7 +16,7 @@ namespace gpu {
 class CommandBufferHelper;
 
 // Manages a shared memory segment.
-class GPU_EXPORT MemoryChunk {
+class MemoryChunk {
  public:
   MemoryChunk(int32 shm_id, gpu::Buffer shm, CommandBufferHelper* helper);
 
@@ -105,7 +104,7 @@ class GPU_EXPORT MemoryChunk {
 };
 
 // Manages MemoryChucks.
-class GPU_EXPORT MappedMemoryManager {
+class MappedMemoryManager {
  public:
   explicit MappedMemoryManager(CommandBufferHelper* helper);
 
diff --git a/gpu/command_buffer/client/ring_buffer.h b/gpu/command_buffer/client/ring_buffer.h
index c08cccd..582d4ee 100644
--- a/gpu/command_buffer/client/ring_buffer.h
+++ b/gpu/command_buffer/client/ring_buffer.h
@@ -8,8 +8,6 @@
 #define GPU_COMMAND_BUFFER_CLIENT_RING_BUFFER_H_
 
 #include <deque>
-
-#include "../../gpu_export.h"
 #include "../common/logging.h"
 #include "../common/types.h"
 
@@ -19,7 +17,7 @@ class CommandBufferHelper;
 // RingBuffer manages a piece of memory as a ring buffer. Memory is allocated
 // with Alloc and then a is freed pending a token with FreePendingToken.  Old
 // allocations must not be kept past new allocations.
-class GPU_EXPORT RingBuffer {
+class RingBuffer {
  public:
   typedef unsigned int Offset;
 
diff --git a/gpu/command_buffer/client/transfer_buffer.h b/gpu/command_buffer/client/transfer_buffer.h
index 0921b74..b3a58d2d 100644
--- a/gpu/command_buffer/client/transfer_buffer.h
+++ b/gpu/command_buffer/client/transfer_buffer.h
@@ -5,7 +5,6 @@
 #ifndef GPU_COMMAND_BUFFER_CLIENT_TRANSFER_BUFFER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_TRANSFER_BUFFER_H_
 
-#include "../../gpu_export.h"
 #include "../common/buffer.h"
 #include "../common/compiler_specific.h"
 #include "../common/gles2_cmd_utils.h"
@@ -51,7 +50,7 @@ class AlignedRingBuffer : public RingBufferWrapper {
 };
 
 // Interface for managing the transfer buffer.
-class GPU_EXPORT TransferBufferInterface {
+class TransferBufferInterface {
  public:
   TransferBufferInterface() { }
   virtual ~TransferBufferInterface() { }
@@ -85,7 +84,7 @@ class GPU_EXPORT TransferBufferInterface {
 };
 
 // Class that manages the transfer buffer.
-class GPU_EXPORT TransferBuffer : public TransferBufferInterface {
+class TransferBuffer : public TransferBufferInterface {
  public:
   TransferBuffer(CommandBufferHelper* helper);
   virtual ~TransferBuffer();
@@ -157,7 +156,7 @@ class GPU_EXPORT TransferBuffer : public TransferBufferInterface {
 };
 
 // A class that will manage the lifetime of a transferbuffer allocation.
-class GPU_EXPORT ScopedTransferBufferPtr {
+class ScopedTransferBufferPtr {
  public:
   ScopedTransferBufferPtr(
       unsigned int size,