diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 19:22:07 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 19:22:07 +0000 |
| commit | e1ca705cac4b946993f6cbf798e2a0ba27e739f3 (patch) | |
| tree | 9757af858cadeea671264651780935b00d8c0252 /src/views/win | |
| parent | 3fb15f4d21292a319dc6522bfc99c89a7a5eac68 (diff) | |
deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPRECATED_SCALARROUND for legacy clients
BUG=
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/111353003
git-svn-id: http://skia.googlecode.com/svn/trunk@12719 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/views/win')
| -rw-r--r-- | src/views/win/SkOSWindow_win.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp index 7549ea21da..e91d73a292 100644 --- a/src/views/win/SkOSWindow_win.cpp +++ b/src/views/win/SkOSWindow_win.cpp @@ -361,7 +361,9 @@ bool SkOSWindow::attachGL(int msaaSampleCount, AttachmentInfo* info) { info->fSampleCount = 0; } - glViewport(0, 0, SkScalarRound(this->width()), SkScalarRound(this->height())); + glViewport(0, 0, + SkScalarRoundToInt(this->width()), + SkScalarRoundToInt(this->height())); return true; } return false; @@ -500,8 +502,9 @@ bool SkOSWindow::attachANGLE(int msaaSampleCount, AttachmentInfo* info) { SkAutoTUnref<const GrGLInterface> intf(GrGLCreateANGLEInterface()); if (intf ) { - ANGLE_GL_CALL(intf, Viewport(0, 0, SkScalarRound(this->width()), - SkScalarRound(this->height()))); + ANGLE_GL_CALL(intf, Viewport(0, 0, + SkScalarRoundToInt(this->width()), + SkScalarRoundToInt(this->height()))); } return true; } |