Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / core / SkDescriptor.h

diff --git a/src/third_party/skia/src/core/SkDescriptor.h b/src/third_party/skia/src/core/SkDescriptor.h
index e71ff41..c526451 100644 (file)
--- a/src/third_party/skia/src/core/SkDescriptor.h
+++ b/src/third_party/skia/src/core/SkDescriptor.h
@@ -37,14 +37,14 @@ public:
 
     uint32_t getLength() const { return fLength; }
 
-    void* addEntry(uint32_t tag, uint32_t length, const void* data = NULL) {
+    void* addEntry(uint32_t tag, size_t length, const void* data = NULL) {
         SkASSERT(tag);
         SkASSERT(SkAlign4(length) == length);
         SkASSERT(this->findEntry(tag, NULL) == NULL);
 
         Entry*  entry = (Entry*)((char*)this + fLength);
         entry->fTag = tag;
-        entry->fLen = length;
+        entry->fLen = SkToU32(length);
         if (data) {
             memcpy(entry + 1, data, length);
         }