Make run_webkit_tests work on Windows 7. ...

webkit/tools/test_shell/test_shell_platform_delegate_win.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <list>
 #include <windows.h>
 #include <commctrl.h>
 
 #include "app/gfx/native_theme_win.h"
@@ skipping 31 matching lines @@
 // and normal vs large fonts. Something it misses is changes to the color
 // scheme (which will infact cause pixel test failures).
 bool TestShellPlatformDelegate::CheckLayoutTestSystemDependencies() {
   std::list<std::string> errors;
 
   OSVERSIONINFOEX osvi;
   ::ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
   osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
   ::GetVersionEx((OSVERSIONINFO *)&osvi);
 
-  // default to XP metrics, override if on Vista
+  // Default to XP metrics, override if on Vista or win 7.
   int requiredVScrollSize = 17;
   int requiredFontSize = -11; // 8 pt
   const wchar_t* requiredFont = L"Tahoma";
-  // Consider Windows 7 as Vista.
   bool isVista = false;
+  bool isWin7 = false;
   if (osvi.dwMajorVersion == 6
-      && (osvi.dwMinorVersion == 0 || osvi.dwMinorVersion == 1)
+      && osvi.dwMinorVersion == 1
+      && osvi.wProductType == VER_NT_WORKSTATION) {
+    requiredFont = L"Segoe UI";
+    requiredFontSize = -12;
+    isWin7 = true;
+  } else if (osvi.dwMajorVersion == 6
+      && osvi.dwMinorVersion == 0
       && osvi.wProductType == VER_NT_WORKSTATION) {
     requiredFont = L"Segoe UI";
     requiredFontSize = -12; // 9 pt
     isVista = true;
   } else if (osvi.dwMajorVersion == 5
              && osvi.dwMinorVersion == 1
              && osvi.wProductType == VER_NT_WORKSTATION) {
-    // XP;
+    ; // XP

[ojan, 2009/10/29 20:32:31]

Nit: This seems weird to me. That compiles?

How about instead checking for the following and adding the error in that case?

!(osvi.dwMajorVersion == 5
  && osvi.dwMinorVersion == 1
  && osvi.wProductType == VER_NT_WORKSTATION)

[Dirk Pranke, 2009/10/29 21:03:20]

Sure, it compiles - it's just an empty statement. But your suggestion is better.

   } else {
     errors.push_back("Unsupported Operating System version "
-                     "(must use XP or Vista).");
+                     "(must use XP, Vista, or Windows 7).");
   }
 
-  // on both XP and Vista, this metric will be 17 when font size is "Normal".
+  // This metric will be 17 when font size is "Normal".
   // The size of drop-down menus depends on it.
   int vScrollSize = ::GetSystemMetrics(SM_CXVSCROLL);
   if (vScrollSize != requiredVScrollSize) {
     errors.push_back("Must use normal size fonts (96 dpi).");
   }
 
   // ClearType must be disabled, because the rendering is unpredictable.
   BOOL bFontSmoothing;
   SystemParametersInfo(SPI_GETFONTSMOOTHING, (UINT)0,
                        (PVOID)&bFontSmoothing, (UINT)0);
   int fontSmoothingType;
   SystemParametersInfo(SPI_GETFONTSMOOTHINGTYPE, (UINT)0,
                        (PVOID)&fontSmoothingType, (UINT)0);
   if (bFontSmoothing && (fontSmoothingType == FE_FONTSMOOTHINGCLEARTYPE)) {
     errors.push_back("ClearType must be disabled.");
   }
 
   // Check that we're using the default system fonts
   NONCLIENTMETRICS metrics;
   win_util::GetNonClientMetrics(&metrics);
   LOGFONTW* system_fonts[] =
   { &metrics.lfStatusFont, &metrics.lfMenuFont, &metrics.lfSmCaptionFont };
 
   for (size_t i = 0; i < arraysize(system_fonts); ++i) {
     if (system_fonts[i]->lfHeight != requiredFontSize ||
         wcscmp(requiredFont, system_fonts[i]->lfFaceName)) {
-      if (isVista)
+      if (isVista || isWin7)
         errors.push_back("Must use either the Aero or Basic theme.");
       else
         errors.push_back("Must use the default XP theme (Luna).");
       break;
     }
   }
 
   if (!errors.empty()) {
     fprintf(stderr, "%s",
       "##################################################################\n"
@@ skipping 31 matching lines @@
 void TestShellPlatformDelegate::SetWindowPositionForRecording(
     TestShell *shell) {
   // Move the window to the upper left corner for consistent
   // record/playback mode.  For automation, we want this to work
   // on build systems where the script invoking us is a background
   // process.  So for this case, make our window the topmost window
   // as well.
   ForegroundHelper::SetForeground(shell->mainWnd());
   ::SetWindowPos(shell->mainWnd(), HWND_TOP, 0, 0, 600, 800, 0);
 }