Changeset 234607 in webkit

Timestamp:

Aug 6, 2018 10:43:42 AM (6 years ago)

Author:

Fujii Hironori

Message:

[Win][DLLLauncher] Remove --highDPI switch
​https://bugs.webkit.org/show_bug.cgi?id=188255

Reviewed by Yusuke Suzuki.

Bug 149417 has added --highDPI switch to make MiniBrowser DPI
aware. But, Bug 158733 has made MiniBrowser always DPI aware. It
became useless since the change. Remove the switch.

This change fixes the issue all dump render tree tests are failing
in WinCairo port if high DPI display is connected.

• MiniBrowser/win/Common.cpp:

(parseCommandLine): Removed --highDPI switch.

• win/DLLLauncher/DLLLauncherMain.cpp:

(wWinMain): Do not call SetProcessDPIAware.
(shouldUseHighDPI): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/win/Common.cpp (modified) (1 diff)
• win/DLLLauncher/DLLLauncherMain.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-08-06  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][DLLLauncher] Remove --highDPI switch
+        https://bugs.webkit.org/show_bug.cgi?id=188255
+
+        Reviewed by Yusuke Suzuki.
+
+        Bug 149417 has added `--highDPI` switch to make MiniBrowser DPI
+        aware. But, Bug 158733 has made MiniBrowser always DPI aware. It
+        became useless since the change. Remove the switch.
+
+        This change fixes the issue all dump render tree tests are failing
+        in WinCairo port if high DPI display is connected.
+
+        * MiniBrowser/win/Common.cpp:
+        (parseCommandLine): Removed `--highDPI` switch.
+        * win/DLLLauncher/DLLLauncherMain.cpp:
+        (wWinMain): Do not call SetProcessDPIAware.
+        (shouldUseHighDPI): Deleted.
+
 2018-08-06  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/MiniBrowser/win/Common.cpp

@@ -179 +179 @@
         else if (!wcsicmp(argv[i], L"--performance"))
             options.pageLoadTesting = true;
-        else if (!wcsicmp(argv[i], L"--highDPI"))
-            continue; // ignore
         else if (!wcsicmp(argv[i], L"--wk1") || !wcsicmp(argv[i], L"--legacy"))
             options.windowType = MainWindow::BrowserWindowType::WebKitLegacy;

trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp

@@ -168 +168 @@
 }
 
-static bool shouldUseHighDPI()
-{
-#ifdef WIN_CAIRO
-    return true;
-#else
-    int argc = 0;
-    WCHAR** argv = CommandLineToArgvW(GetCommandLineW(), &argc);
-    for (int i = 1; i < argc; ++i) {
-        if (!wcsicmp(argv[i], L"--highDPI"))
-            return true;
-    }
-
-    return false;
-#endif
-}
-
 #if USE_CONSOLE_ENTRY_POINT
 int main(int argc, const char* argv[])
@@ -190 +174 @@
 #endif
 {
-    if (shouldUseHighDPI()) {
-        BOOL didIt = SetProcessDPIAware();
-        _ASSERT(didIt);
-    }
-
 #ifdef _CRTDBG_MAP_ALLOC
     _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);