deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPREC…

samplecode/SampleApp.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleApp.h"
 
 #include "SkData.h"
 #include "SkCanvas.h"
@@ skipping 288 matching lines @@
         win->present();
     }
 
     virtual void windowSizeChanged(SampleWindow* win) {
 #if SK_SUPPORT_GPU
         if (fCurContext) {
             AttachmentInfo attachmentInfo;
             win->attach(fBackend, fMSAASampleCount, &attachmentInfo);
 
             GrBackendRenderTargetDesc desc;
-            desc.fWidth = SkScalarRound(win->width());
-            desc.fHeight = SkScalarRound(win->height());
+            desc.fWidth = SkScalarRoundToInt(win->width());
+            desc.fHeight = SkScalarRoundToInt(win->height());
             desc.fConfig = kSkia8888_GrPixelConfig;
             desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
             desc.fSampleCnt = attachmentInfo.fSampleCount;
             desc.fStencilBits = attachmentInfo.fStencilBits;
             GrGLint buffer;
             GR_GL_GetIntegerv(fCurIntf, GR_GL_FRAMEBUFFER_BINDING, &buffer);
             desc.fRenderTargetHandle = buffer;
 
             SkSafeUnref(fCurRenderTarget);
             fCurRenderTarget = fCurContext->wrapBackendRenderTarget(desc);
@@ skipping 986 matching lines @@
 
     this->INHERITED::draw(canvas);
 
     canvas->restoreToCount(count);
 }
 
 void SampleWindow::showZoomer(SkCanvas* canvas) {
         int count = canvas->save();
         canvas->resetMatrix();
         // Ensure the mouse position is on screen.
-        int width = SkScalarRound(this->width());
-        int height = SkScalarRound(this->height());
+        int width = SkScalarRoundToInt(this->width());
+        int height = SkScalarRoundToInt(this->height());
         if (fMouseX >= width) fMouseX = width - 1;
         else if (fMouseX < 0) fMouseX = 0;
         if (fMouseY >= height) fMouseY = height - 1;
         else if (fMouseY < 0) fMouseY = 0;
 
         SkBitmap bitmap = capture_bitmap(canvas);
         bitmap.lockPixels();
 
         // Find the size of the zoomed in view, forced to be odd, so the examined pixel is in the middle.
         int zoomedWidth = (width >> 1) | 1;
@@ skipping 703 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static const char gGestureClickType[] = "GestureClickType";
 
 bool SampleWindow::onDispatchClick(int x, int y, Click::State state,
         void* owner, unsigned modi) {
     if (Click::kMoved_State == state) {
         updatePointer(x, y);
     }
-    int w = SkScalarRound(this->width());
-    int h = SkScalarRound(this->height());
+    int w = SkScalarRoundToInt(this->width());
+    int h = SkScalarRoundToInt(this->height());
 
     // check for the resize-box
     if (w - x < 16 && h - y < 16) {
         return false;   // let the OS handle the click
     }
     else if (fMagnify) {
         //it's only necessary to update the drawing if there's a click
         this->inval(NULL);
         return false; //prevent dragging while magnify is enabled
     } else {
@@ skipping 562 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }