Reverting r12315 (More Windows 64b compilation warning fixes) due to compilation failures

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

bench/benchmain.cpp

@@ -450,13 +450,13 @@ int tool_main(int argc, char** argv) {
     // Find the longest name of the benches we're going to run to make the output pretty.
     Iter names;
     SkBenchmark* bench;
-    size_t longestName = 0;
+    int longestName = 0;
     while ((bench = names.next()) != NULL) {
         SkAutoTUnref<SkBenchmark> benchUnref(bench);
         if (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getName())) {
             continue;
         }
-        const size_t length = strlen(bench->getName());
+        const int length = strlen(bench->getName());
         longestName = length > longestName ? length : longestName;
     }
 

include/core/SkUtils.h

@@ -71,7 +71,8 @@ size_t      SkUTF8_FromUnichar(SkUnichar uni, char utf8[] = NULL);
 #define SkUTF16_IsLowSurrogate(c)   (((c) & 0xFC00) == 0xDC00)
 
 int SkUTF16_CountUnichars(const uint16_t utf16[]);
-int SkUTF16_CountUnichars(const uint16_t utf16[], int numberOf16BitValues);
+int SkUTF16_CountUnichars(const uint16_t utf16[],
+                                  int numberOf16BitValues);
 // returns the current unichar and then moves past it (*p++)
 SkUnichar SkUTF16_NextUnichar(const uint16_t**);
 // this guy backs up to the previus unichar value, and returns it (*--p)

src/gpu/SkGpuDevice.cpp

@@ -571,7 +571,7 @@ void SkGpuDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
 
     fContext->drawVertices(grPaint,
                            gPointMode2PrimtiveType[mode],
-                           SkToS32(count),
+                           count,
                            (GrPoint*)pts,
                            NULL,
                            NULL,

src/gpu/gl/GrGLProgramDesc.cpp

@@ -105,7 +105,7 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState,
         memset(desc->header(), 0, kHeaderSize);
     }
     // write the key length
-    *desc->atOffset<uint32_t, kLengthOffset>() = SkToU32(newKeyLength);
+    *desc->atOffset<uint32_t, kLengthOffset>() = newKeyLength;
 
     KeyHeader* header = desc->header();
     EffectKey* effectKeys = desc->effectKeys();

src/gpu/gl/GrGpuGL_program.cpp

@@ -291,7 +291,7 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC
 
 void GrGpuGL::setupGeometry(const DrawInfo& info, size_t* indexOffsetInBytes) {
 
-    GrGLsizei stride = static_cast<GrGLsizei>(this->getDrawState().getVertexSize());
+    GrGLsizei stride = this->getDrawState().getVertexSize();
 
     size_t vertexOffsetInBytes = stride * info.startVertex();
 

src/images/bmpdecoderhelper.cpp

@@ -18,7 +18,7 @@ static const int kBmpOS2InfoSize = 12;
 static const int kMaxDim = SHRT_MAX / 2;
 
 bool BmpDecoderHelper::DecodeImage(const char* p,
-                                   size_t len,
+                                   int len,
                                    int max_pixels,
                                    BmpDecoderCallback* callback) {
   data_ = reinterpret_cast<const uint8*>(p);
@@ -182,7 +182,7 @@ void BmpDecoderHelper::DoRLEDecode() {
   static const uint8 RLE_DELTA = 2;
   int x = 0;
   int y = height_ - 1;
-  while (pos_ + 1 < len_) {
+  while (pos_ < len_ - 1) {
     uint8 cmd = GetByte();
     if (cmd != RLE_ESCAPE) {
       uint8 pixels = GetByte();
@@ -210,7 +210,7 @@ void BmpDecoderHelper::DoRLEDecode() {
           return;
         }
       } else if (cmd == RLE_DELTA) {
-        if (pos_ + 1 < len_) {
+        if (pos_ < len_ - 1) {
           uint8 dx = GetByte();
           uint8 dy = GetByte();
           x += dx;

src/images/bmpdecoderhelper.h

@@ -72,7 +72,7 @@ class BmpDecoderHelper {
   BmpDecoderHelper() { }
   ~BmpDecoderHelper() { }
   bool DecodeImage(const char* data,
-                   size_t len,
+                   int len,
                    int max_pixels,
                    BmpDecoderCallback* callback);
 
@@ -91,7 +91,7 @@ class BmpDecoderHelper {
 
   const uint8* data_;
   int pos_;
-  size_t len_;
+  int len_;
   int width_;
   int height_;
   int bpp_;

src/pdf/SkPDFDevice.cpp

@@ -123,7 +123,7 @@ static void align_text(SkDrawCacheProc glyphCacheProc, const SkPaint& paint,
     *y = *y - yAdj;
 }
 
-static int max_glyphid_for_typeface(SkTypeface* typeface) {
+static size_t max_glyphid_for_typeface(SkTypeface* typeface) {
     SkAutoResolveDefaultTypeface autoResolve(typeface);
     typeface = autoResolve.get();
     return typeface->countGlyphs() - 1;

src/pdf/SkPDFDeviceFlattener.cpp

@@ -43,7 +43,7 @@ void SkPDFDeviceFlattener::drawPoints(const SkDraw& d, SkCanvas::PointMode mode,
     flattenPaint(d, &paintFlatten);
 
     SkPoint* flattenedPoints = SkNEW_ARRAY(SkPoint, count);
-    d.fMatrix->mapPoints(flattenedPoints, points, SkToS32(count));
+    d.fMatrix->mapPoints(flattenedPoints, points, count);
     SkDraw draw(d);
     SkMatrix identity = SkMatrix::I();
     draw.fMatrix = &identity;

src/pdf/SkPDFImage.cpp

@@ -426,7 +426,7 @@ static SkBitmap unpremultiply_bitmap(const SkBitmap& bitmap,
     SkBitmap outBitmap;
     outBitmap.setConfig(bitmap.config(), srcRect.width(), srcRect.height());
     outBitmap.allocPixels();
-    int dstRow = 0;
+    size_t dstRow = 0;
 
     outBitmap.lockPixels();
     bitmap.lockPixels();

src/utils/debugger/SkObjectParser.cpp

@@ -335,11 +335,9 @@ SkString* SkObjectParser::TextToString(const void* text, size_t byteLength,
         }
         case SkPaint::kUTF16_TextEncoding: {
             decodedText->append("UTF-16: ");
-            size_t sizeNeeded = SkUTF16_ToUTF8((uint16_t*)text, 
-                                                SkToS32(byteLength / 2), 
-                                                NULL);
+            size_t sizeNeeded = SkUTF16_ToUTF8((uint16_t*)text, byteLength / 2, NULL);
             SkAutoSTMalloc<0x100, char> utf8(sizeNeeded);
-            SkUTF16_ToUTF8((uint16_t*)text, SkToS32(byteLength / 2), utf8);
+            SkUTF16_ToUTF8((uint16_t*)text, byteLength / 2, utf8);
             decodedText->append(utf8, sizeNeeded);
             break;
         }

src/views/win/SkOSWindow_win.cpp

@@ -130,12 +130,9 @@ bool SkOSWindow::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             this->handleChar(SkUTF8_ToUnichar((char*)&wParam));
             return true;
         } break;
-        case WM_SIZE: {
-            INT width = LOWORD(lParam);
-            INT height = HIWORD(lParam);
-            this->resize(width, height);
+        case WM_SIZE:
+            this->resize(lParam & 0xFFFF, lParam >> 16);
             break;
-        }
         case WM_PAINT: {
             PAINTSTRUCT ps;
             HDC hdc = BeginPaint(hWnd, &ps);