commit 62ce0303fb3f9857ee3ab8df05934642c226b1a3
author bungeman <bungeman@google.com> Fri Aug 28 09:09:32 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Aug 28 09:09:32 2015 -0700
tree 4e665282b0badfc419da512d73568702cc630e97
parent 7445cef42f52e15de800207e8b14a3b24f444148

Replace SkPin32 with SkTPin and remove.

SkPin32 is already just forwarding to SkTPin, so convert existing
users and remove SkPin32.

Review URL: https://codereview.chromium.org/1314583003

src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 7cc7344..7d08184 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -199,7 +199,7 @@
 
     if (pr) {
         const SkImageInfo& info = pr->info();
-        fPixelRefOrigin.set(SkPin32(dx, 0, info.width()), SkPin32(dy, 0, info.height()));
+        fPixelRefOrigin.set(SkTPin(dx, 0, info.width()), SkTPin(dy, 0, info.height()));
     } else {
         // ignore dx,dy if there is no pixelref
         fPixelRefOrigin.setZero();

src/core/SkFontStyle.cpp

diff --git a/src/core/SkFontStyle.cpp b/src/core/SkFontStyle.cpp
index 285d17a..badf9d7 100644
--- a/src/core/SkFontStyle.cpp
+++ b/src/core/SkFontStyle.cpp
@@ -18,9 +18,9 @@
 
 SkFontStyle::SkFontStyle(int weight, int width, Slant slant) {
     fUnion.fU32 = 0;
-    fUnion.fR.fWeight = SkPin32(weight, kThin_Weight, kBlack_Weight);
-    fUnion.fR.fWidth = SkPin32(width, kUltraCondensed_Width, kUltaExpanded_Width);
-    fUnion.fR.fSlant = SkPin32(slant, kUpright_Slant, kItalic_Slant);
+    fUnion.fR.fWeight = SkTPin<int>(weight, kThin_Weight, kBlack_Weight);
+    fUnion.fR.fWidth = SkTPin<int>(width, kUltraCondensed_Width, kUltaExpanded_Width);
+    fUnion.fR.fSlant = SkTPin<int>(slant, kUpright_Slant, kItalic_Slant);
 }
 
 SkFontStyle::SkFontStyle(unsigned oldStyle) {

src/core/SkString.cpp

diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp
index 9110d80..d93f662 100644
--- a/src/core/SkString.cpp
+++ b/src/core/SkString.cpp
@@ -509,7 +509,7 @@
 }
 
 void SkString::insertHex(size_t offset, uint32_t hex, int minDigits) {
-    minDigits = SkPin32(minDigits, 0, 8);
+    minDigits = SkTPin(minDigits, 0, 8);
 
     static const char gHex[] = "0123456789ABCDEF";