Revert 124702 - GPU: Buld most of the gpu as a single DLL.

gpu/command_buffer/service/common_decoder.h

-// 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_COMMON_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_COMMON_DECODER_H_
 
 #include <map>
 #include <stack>
 #include <string>
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/cmd_parser.h"
-#include "gpu/gpu_export.h"
 
 namespace gpu {
 
 class CommandBufferEngine;
 
 // This class is a helper base class for implementing the common parts of the
 // o3d/gl2 command buffer decoder.
-class GPU_EXPORT CommonDecoder : NON_EXPORTED_BASE(public AsyncAPIInterface) {
+class CommonDecoder : public AsyncAPIInterface {
  public:
   typedef error::Error Error;
 
   static const unsigned int kMaxStackDepth = 32;
 
   // A bucket is a buffer to help collect memory across a command buffer. When
   // creating a command buffer implementation of an existing API, sometimes that
   // API has functions that take a pointer to data.  A good example is OpenGL's
   // glBufferData. Because the data is separated between client and service,
   // there are 2 ways to get this data across. 1 is to put all the data in
   // shared memory. The problem with this is the data can be arbitarily large
   // and the host OS may not support that much shared memory. Another solution
   // is to shuffle memory across a little bit at a time, collecting it on the
   // service side and when it is all there then call glBufferData. Buckets
   // implement this second solution. Using the common commands, SetBucketSize,
   // SetBucketData, SetBucketDataImmediate the client can fill a bucket. It can
   // then call a command that uses that bucket (like BufferDataBucket in the
   // GLES2 command buffer implementation).
   //
   // If you are designing an API from scratch you can avoid this need for
   // Buckets by making your API always take an offset and a size
   // similar to glBufferSubData.
   //
   // Buckets also help pass strings to/from the service. To return a string of
   // arbitary size, the service puts the string in a bucket. The client can
   // then query the size of a bucket and request sections of the bucket to
   // be passed across shared memory.
-  class GPU_EXPORT Bucket {
+  class Bucket {
    public:
     Bucket();
     ~Bucket();
 
     size_t size() const {
       return size_;
     }
 
     // Gets a pointer to a section the bucket. Returns NULL if offset or size is
     // out of range.
@@ skipping 113 matching lines @@
 
     uint32 offset;
   };
   std::stack<CommandAddress> call_stack_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_COMMON_DECODER_H_