SkXPS: clean up SkConstexprMath

src/xps/SkXPSDevice.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 "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
@@ skipping 184 matching lines @@
                                         IXpsOMImageResource** image) {
     SkTScopedComPtr<IXpsOMThumbnailGenerator> thumbnailGenerator;
     HRM(CoCreateInstance(
             CLSID_XpsOMThumbnailGenerator,
             nullptr,
             CLSCTX_INPROC_SERVER,
             IID_PPV_ARGS(&thumbnailGenerator)),
         "Could not create thumbnail generator.");
 
     SkTScopedComPtr<IOpcPartUri> partUri;
-    static const size_t size = SkTUMax<
-        SK_ARRAY_COUNT(L"/Documents/1/Metadata/.png") + SK_DIGITS_IN(pageNum),
-        SK_ARRAY_COUNT(L"/Metadata/" L_GUID_ID L".png")
-    >::value;
+    constexpr size_t size = SkSMax(
+            SK_ARRAY_COUNT(L"/Documents/1/Metadata/.png") + SkDigitsIn<unsigned>(),
+            SK_ARRAY_COUNT(L"/Metadata/" L_GUID_ID L".png"));
     wchar_t buffer[size];
     if (pageNum > 0) {
         swprintf_s(buffer, size, L"/Documents/1/Metadata/%u.png", pageNum);

[bungeman-skia, 2016/05/23 15:04:49]

Eck, now that I look at these, I think this needs to be at least _swprintf_s_l
which takes a locale so we can make sure the numbers are formatted the way we
expect. For example the locale fa_IR will produce non-arabic-indic digits here
if it's the current locale on this thread. Anyhow, that's a separate issue from
this.

[hal.canary, 2016/05/23 16:55:39]

Acknowledged.

     } else {
         wchar_t id[GUID_ID_LEN];
         HR(this->createId(id, GUID_ID_LEN));
         swprintf_s(buffer, size, L"/Metadata/%s.png", id);
     }
     HRM(this->fXpsFactory->CreatePartUri(buffer, &partUri),
         "Could not create thumbnail part uri.");
 
     HRM(thumbnailGenerator->GenerateThumbnail(page,
                                               XPS_IMAGE_TYPE_PNG,
                                               XPS_THUMBNAIL_SIZE_LARGE,
                                               partUri.get(),
                                               image),
         "Could not generate thumbnail.");
 
     return S_OK;
 }
 
 HRESULT SkXPSDevice::createXpsPage(const XPS_SIZE& pageSize,
                                    IXpsOMPage** page) {
-    static const size_t size = SK_ARRAY_COUNT(L"/Documents/1/Pages/.fpage")
-                             + SK_DIGITS_IN(fCurrentPage);
+    constexpr size_t size = SK_ARRAY_COUNT(L"/Documents/1/Pages/.fpage")
+                            + SkDigitsIn<unsigned>();
     wchar_t buffer[size];
     swprintf_s(buffer, size, L"/Documents/1/Pages/%u.fpage",
                              this->fCurrentPage);
     SkTScopedComPtr<IOpcPartUri> partUri;
     HRM(this->fXpsFactory->CreatePartUri(buffer, &partUri),
         "Could not create page part uri.");
 
     //If the language is unknown, use "und" (XPS Spec 2.3.5.1).
     HRM(this->fXpsFactory->CreatePage(&pageSize,
                                       L"und",
@@ skipping 2027 matching lines @@
         //SkXPSDevice* dev = new SkXPSDevice(this);
         //SkSize s = SkSize::Make(width, height);
         //dev->BeginCanvas(s, s, SkMatrix::I());
         //return dev;
     }
 #endif
     return new SkXPSDevice(this->fXpsFactory.get());
 }
 
 #endif//defined(SK_BUILD_FOR_WIN32)