Add SkTypeface* parameter to SkScalerContext (and its callers)

trunk/src/views/win/SkOSWindow_win.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_WIN)
@@ skipping 86 matching lines @@
     };
     for (size_t i = 0; i < SK_ARRAY_COUNT(gPair); i++) {
         if (gPair[i].fVK == vk) {
             return gPair[i].fKey;
         }
     }
     return kNONE_SkKey;
 }
 
 static unsigned getModifiers(UINT message) {
-    return 0;   // TODO
+        static const struct {

[bungeman-skia, 2013/03/15 16:12:44]

Not sure what this has to do with this change, but I like it except for the
tabs. (Full disclosure: I like tabs, but Skia doesn't.)

[reed1, 2013/03/15 17:46:44]

Accidentally picked up when I editing on my win machine. Removing from this CL
(need to remember to land it separately).

+                int     fVKey;
+                unsigned fSkMask;
+        } gModi[] = {
+                { VK_SHIFT,             kShift_SkModifierKey },
+                { VK_CONTROL,   kControl_SkModifierKey },
+                { VK_MENU,              kOption_SkModifierKey },
+        };
+
+        unsigned modi = 0;
+        for (size_t i = 0; i < SK_ARRAY_COUNT(gModi); ++i) {
+                // check the high-bit of the returned ushort
+                if (GetKeyState(gModi[i].fVKey) & 0x8000) {
+                        modi |= gModi[i].fSkMask;
+                }
+        }
+        return modi;
 }
 
 bool SkOSWindow::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
     switch (message) {
         case WM_KEYDOWN: {
             SkKey key = winToskKey(wParam);
             if (kNONE_SkKey != key) {
                 this->handleKey(key);
                 return true;
             }
@@ skipping 484 matching lines @@
         break;
 #endif // SK_ANGLE
 #endif // SK_SUPPORT_GPU
     default:
         SkASSERT(false);
         break;
     }
 }
 
 #endif