commit 81712883419f76e25d2ffec38a9438284a45a48d
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 17:12:34 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 17:12:34 2012 +0000
tree d9b6eb86b01ae7e7117f56dc2d6ca4f95879b56f
parent 35ac048e357aefa6289485c8f6a50fadce23c0d2

Remove GrScalar, replace with SkScalar.
Review URL: https://codereview.appspot.com/6812064

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

src/gpu/GrInOrderDrawBuffer.cpp

diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
index 7384cad..2f943ae 100644
--- a/src/gpu/GrInOrderDrawBuffer.cpp
+++ b/src/gpu/GrInOrderDrawBuffer.cpp
@@ -182,16 +182,16 @@
                 // conservative test fails.
                 const GrRenderTarget* target = drawState->getRenderTarget();
                 if (0 >= devClipRect.fLeft) {
-                    devClipRect.fLeft = GR_ScalarMin;
+                    devClipRect.fLeft = SK_ScalarMin;
                 }
                 if (target->width() <= devClipRect.fRight) {
-                    devClipRect.fRight = GR_ScalarMax;
+                    devClipRect.fRight = SK_ScalarMax;
                 }
                 if (0 >= devClipRect.top()) {
-                    devClipRect.fTop = GR_ScalarMin;
+                    devClipRect.fTop = SK_ScalarMin;
                 }
                 if (target->height() <= devClipRect.fBottom) {
-                    devClipRect.fBottom = GR_ScalarMax;
+                    devClipRect.fBottom = SK_ScalarMax;
                 }
                 int stride = VertexSize(layout);
                 bool insideClip = true;