http://codereview.appspot.com/4436057/

Tag some more API headers with SK_API so they are exposed
when doing a DLL build.

git-svn-id: http://skia.googlecode.com/svn/trunk@1193 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/core/Sk64.h b/include/core/Sk64.h
index ff28544..b40b27f 100644 (file)
--- a/include/core/Sk64.h
+++ b/include/core/Sk64.h
@@ -24,7 +24,7 @@
 
     Sk64 is a 64-bit math package that does not require long long support from the compiler.
 */
-struct Sk64 {
+struct SK_API Sk64 {
     int32_t  fHi;   //!< the high 32 bits of the number (including sign)
     uint32_t fLo;   //!< the low 32 bits of the number
 

diff --git a/include/core/SkColor.h b/include/core/SkColor.h
index 6b86e7e..1f82aa7 100644 (file)
--- a/include/core/SkColor.h
+++ b/include/core/SkColor.h
@@ -104,7 +104,7 @@ static inline SkColor SkColorSetA(SkColor c, U8CPU a) {
     @param blue  blue component value [0..255]
     @param hsv  3 element array which holds the resulting HSV components.
 */
-void SkRGBToHSV(U8CPU red, U8CPU green, U8CPU blue, SkScalar hsv[3]);
+SK_API void SkRGBToHSV(U8CPU red, U8CPU green, U8CPU blue, SkScalar hsv[3]);
 
 /** Convert the argb color to its HSV components.
         hsv[0] is Hue [0 .. 360)
@@ -127,7 +127,7 @@ static inline void SkColorToHSV(SkColor color, SkScalar hsv[3])
     @param hsv  3 element array which holds the input HSV components.
     @return the resulting argb color
 */
-SkColor SkHSVToColor(U8CPU alpha, const SkScalar hsv[3]);
+SK_API SkColor SkHSVToColor(U8CPU alpha, const SkScalar hsv[3]);
 
 /** Convert HSV components to an ARGB color. The alpha component set to 0xFF.
         hsv[0] is Hue [0 .. 360)

diff --git a/include/core/SkFontHost.h b/include/core/SkFontHost.h
index 72faed7..daa6e54 100644 (file)
--- a/include/core/SkFontHost.h
+++ b/include/core/SkFontHost.h
@@ -56,7 +56,7 @@ typedef uint32_t SkFontTableTag;
         font scaler (e.g. freetype or other) to the font's data.
     5) Utilites to manage the font cache (budgeting) and gamma correction
 */
-class SkFontHost {
+class SK_API SkFontHost {
 public:
     /** Return a new, closest matching typeface given either an existing family
         (specified by a typeface in that family) or by a familyName and a

diff --git a/include/core/SkMetaData.h b/include/core/SkMetaData.h
index ee2fa2b..1c34fd5 100644 (file)
--- a/include/core/SkMetaData.h
+++ b/include/core/SkMetaData.h
@@ -21,7 +21,7 @@
 
 class SkRefCnt;
 
-class SkMetaData {
+class SK_API SkMetaData {
 public:
     /**
      *  Used to manage the life-cycle of a ptr in the metadata. This is option

diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index 3886b09..c3d8185 100644 (file)
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -20,7 +20,7 @@
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 
-class SkStream : public SkRefCnt {
+class SK_API SkStream : public SkRefCnt {
 public:
     virtual ~SkStream();
     /** Called to rewind to the beginning of the stream. If this cannot be

diff --git a/include/core/SkThread_platform.h b/include/core/SkThread_platform.h
index c6fd058..f33f5dc 100644 (file)
--- a/include/core/SkThread_platform.h
+++ b/include/core/SkThread_platform.h
@@ -41,12 +41,12 @@ public:
 /** Implemented by the porting layer, this function adds 1 to the int specified
     by the address (in a thread-safe manner), and returns the previous value.
 */
-int32_t sk_atomic_inc(int32_t* addr);
+SK_API int32_t sk_atomic_inc(int32_t* addr);
 /** Implemented by the porting layer, this function subtracts 1 to the int
     specified by the address (in a thread-safe manner), and returns the previous
     value.
 */
-int32_t sk_atomic_dec(int32_t* addr);
+SK_API int32_t sk_atomic_dec(int32_t* addr);
 
 class SkMutex {
 public:

diff --git a/include/pipe/SkGPipe.h b/include/pipe/SkGPipe.h
index 5c729a2..d6210ac 100644 (file)
--- a/include/pipe/SkGPipe.h
+++ b/include/pipe/SkGPipe.h
@@ -42,19 +42,50 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
+class SkGPipeControler {
+public:
+    struct Block {
+        void*   fAddr;
+        size_t  fSize;
+    };
+
+    enum Status {
+        kSuccess_Status,
+        kFailure_Status
+    };
+
+    /**
+     *  To record drawing commands, we request blocks from the controller for
+     *  subsequent writes, and we want to send/flush blocks of commands we have
+     *  already written.
+     *
+     *  For each call to handleBlock, the send block will contain the block
+     *  (previously returned in a request parameter) that we have written, and
+     *  if there is more to be recorded, the request block will receive the
+     *  new block of memory to write into. When the writer detects that there
+     *  are no more drawing commands expected, it will call handleBlock with
+     *  NULL for the request parameter.
+     *
+     *  If handleBlock ever returns kFailure_Status, the writer will cease to
+     *  call handleBlock.
+     */
+    virtual Status handleBlock(const Block& send, Block* request) = 0;
+};
+
 class SkGPipeWriter {
 public:
     SkGPipeWriter();
     ~SkGPipeWriter();
 
     bool isRecording() const { return NULL != fCanvas; }
-    SkCanvas* startRecording();
+    SkCanvas* startRecording(SkGPipeControler*);
     void endRecording();
 
     size_t flatten(void* buffer);
 
 private:
     class SkGPipeCanvas* fCanvas;
+    SkGPipeControler*    fControler;
     SkWriter32 fWriter;
 };