7 files changed, 17 insertions, 16 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 0cb762afed..276b39236f 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1078,7 +1078,7 @@ public:
         subclasses like SkPicture's recording canvas, that can store the data
         and then play it back later (via another call to drawData).
      */
-    virtual void drawData(const void* data, size_t length) {
+    virtual void drawData(const void* /*data*/, size_t /*length*/) {
         // do nothing. Subclasses may do something with the data
     }
 
@@ -1086,10 +1086,10 @@ public:
         Each comment added via addComment is notionally attached to its
         enclosing group. Top-level comments simply belong to no group.
      */
-    virtual void beginCommentGroup(const char* description) {
+    virtual void beginCommentGroup(const char* /*description*/) {
         // do nothing. Subclasses may do something
     }
-    virtual void addComment(const char* kywd, const char* value) {
+    virtual void addComment(const char* /*kywd*/, const char* /*value*/) {
         // do nothing. Subclasses may do something
     }
     virtual void endCommentGroup() {
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index 43cb32c8c9..471a76be8e 100644
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -281,8 +281,8 @@ protected:
      *  it just returns false and leaves result and offset unchanged.
      */
     virtual bool filterImage(const SkImageFilter*, const SkBitmap&,
-                             const SkImageFilter::Context& ctx,
-                             SkBitmap* result, SkIPoint* offset) {
+                             const SkImageFilter::Context&,
+                             SkBitmap* /*result*/, SkIPoint* /*offset*/) {
         return false;
     }
 
@@ -352,7 +352,7 @@ protected:
         const SkPixelGeometry fPixelGeometry;
     };
 
-    virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo& cinfo) {
+    virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) {
         return NULL;
     }
 
diff --git a/include/core/SkImageDecoder.h b/include/core/SkImageDecoder.h
index 21077cccff..b384708d30 100644
--- a/include/core/SkImageDecoder.h
+++ b/include/core/SkImageDecoder.h
@@ -348,13 +348,13 @@ protected:
 
     // If the decoder wants to support tiled based decoding,
     // this method must be overridden. This guy is called by buildTileIndex(...)
-    virtual bool onBuildTileIndex(SkStreamRewindable*, int *width, int *height) {
+    virtual bool onBuildTileIndex(SkStreamRewindable*, int* /*width*/, int* /*height*/) {
         return false;
     }
 
     // If the decoder wants to support tiled based decoding,
     // this method must be overridden. This guy is called by decodeRegion(...)
-    virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) {
+    virtual bool onDecodeSubset(SkBitmap*, const SkIRect&) {
         return false;
     }
 
@@ -364,8 +364,9 @@ protected:
         updates componentSizes to the final image size.
         Returns whether the decoding was successful.
     */
-    virtual bool onDecodeYUV8Planes(SkStream* stream, SkISize componentSizes[3], void* planes[3],
-                                    size_t rowBytes[3], SkYUVColorSpace*) {
+    virtual bool onDecodeYUV8Planes(SkStream*, SkISize[3] /*componentSizes*/,
+                                    void*[3] /*planes*/, size_t[3] /*rowBytes*/,
+                                    SkYUVColorSpace*) {
         return false;
     }
 
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 02d696edd8..6f0421e3c4 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -247,7 +247,7 @@ public:
      *          not be created with the given config), or this PixelRef does not support deep
      *          copies.
      */
-    virtual SkPixelRef* deepCopy(SkColorType colortype, const SkIRect* subset) {
+    virtual SkPixelRef* deepCopy(SkColorType, const SkIRect* /*subset*/) {
         return NULL;
     }
 
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 0fbc1b8bd6..151511884a 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -366,7 +366,7 @@ public:
         const SkXfermode*   fMode;
     };
 
-    virtual bool asACompose(ComposeRec* rec) const { return false; }
+    virtual bool asACompose(ComposeRec*) const { return false; }
 
 
     /**
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index 8e3f375519..913286bdb4 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -102,13 +102,13 @@ public:
      *  If an attempt is made to seek past the end of the stream, the position will be set
      *  to the end of the stream.
      */
-    virtual bool seek(size_t position) { return false; }
+    virtual bool seek(size_t /*position*/) { return false; }
 
     /** Seeks to an relative offset in the stream. If this cannot be done, returns false.
      *  If an attempt is made to move to a position outside the stream, the position will be set
      *  to the closest point within the stream (beginning or end).
      */
-    virtual bool move(long offset) { return false; }
+    virtual bool move(long /*offset*/) { return false; }
 
     /** Duplicates this stream. If this cannot be done, returns NULL.
      *  The returned stream will be positioned the same as this stream.
diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h
index 06a85bc439..9de21179f0 100644
--- a/include/core/SkTArray.h
+++ b/include/core/SkTArray.h
@@ -464,7 +464,7 @@ private:
 
 // Use the below macro (SkNEW_APPEND_TO_TARRAY) rather than calling this directly
 template <typename T, bool MEM_COPY>
-void* operator new(size_t, SkTArray<T, MEM_COPY>* array, int atIndex) {
+void* operator new(size_t, SkTArray<T, MEM_COPY>* array, int SkDEBUGCODE(atIndex)) {
     // Currently, we only support adding to the end of the array. When the array class itself
     // supports random insertion then this should be updated.
     // SkASSERT(atIndex >= 0 && atIndex <= array->count());
@@ -476,7 +476,7 @@ void* operator new(size_t, SkTArray<T, MEM_COPY>* array, int atIndex) {
 // to match the op new silences warnings about missing op delete when a constructor throws an
 // exception.
 template <typename T, bool MEM_COPY>
-void operator delete(void*, SkTArray<T, MEM_COPY>* array, int atIndex) {
+void operator delete(void*, SkTArray<T, MEM_COPY>* /*array*/, int /*atIndex*/) {
     SK_CRASH();
 }