Title: [234607] trunk/Tools
- Revision
- 234607
- Author
- hironori.fu...@sony.com
- Date
- 2018-08-06 10:43:42 -0700 (Mon, 06 Aug 2018)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (234606 => 234607)
--- trunk/Tools/ChangeLog 2018-08-06 17:25:13 UTC (rev 234606)
+++ trunk/Tools/ChangeLog 2018-08-06 17:43:42 UTC (rev 234607)
@@ -1,3 +1,23 @@
+2018-08-06 Fujii Hironori <hironori.fu...@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_hs...@apple.com>
[iOS] Tests that try to interact with the QuickType bar time out on iOS 11+
Modified: trunk/Tools/MiniBrowser/win/Common.cpp (234606 => 234607)
--- trunk/Tools/MiniBrowser/win/Common.cpp 2018-08-06 17:25:13 UTC (rev 234606)
+++ trunk/Tools/MiniBrowser/win/Common.cpp 2018-08-06 17:43:42 UTC (rev 234607)
@@ -178,8 +178,6 @@
options.useFullDesktop = true;
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;
#if ENABLE(WEBKIT)
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (234606 => 234607)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2018-08-06 17:25:13 UTC (rev 234606)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2018-08-06 17:43:42 UTC (rev 234607)
@@ -167,22 +167,6 @@
return errorMessage;
}
-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[])
#else
@@ -189,11 +173,6 @@
int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpstrCmdLine, _In_ int nCmdShow)
#endif
{
- if (shouldUseHighDPI()) {
- BOOL didIt = SetProcessDPIAware();
- _ASSERT(didIt);
- }
-
#ifdef _CRTDBG_MAP_ALLOC
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
