Attachment 346618 Details for Bug 188255 – Patch

[patch] Patch

bug-188255-20180806180401.patch (text/plain), 2.96 KB, created by Fujii Hironori on 2018-08-06 02:04:02 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-08-06 02:04:02 PDT

Size: 2.96 KB

patch

obsolete

>Subversion Revision: 234586
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1f12887fd1c1bfabbad1a112a4c1676c4c7e129f..26c87272bf28920361afdeacef6da88305cc19b6 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,23 @@
>+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 NOBODY (OOPS!).
>+
>+        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-03  Ben Richards  <benton_richards@apple.com>
> 
>         We should cache the compiled sandbox profile in a data vault
>diff --git a/Tools/MiniBrowser/win/Common.cpp b/Tools/MiniBrowser/win/Common.cpp
>index 3588fc43b3ff69b0559ace19affaa4c40160c99b..ac38f01b4bd8477098102f5fc38d6ed291c30ca4 100644
>--- a/Tools/MiniBrowser/win/Common.cpp
>+++ b/Tools/MiniBrowser/win/Common.cpp
>@@ -178,8 +178,6 @@ CommandLineOptions parseCommandLine()
>             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)
>diff --git a/Tools/win/DLLLauncher/DLLLauncherMain.cpp b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
>index fcf1a8719f927da66d098c354feab37343dea135..1d22daa4de04043cece13f1401668250abfa7932 100644
>--- a/Tools/win/DLLLauncher/DLLLauncherMain.cpp
>+++ b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
>@@ -167,33 +167,12 @@ static wstring getLastErrorString(HRESULT hr)
>     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
> 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);

Actions: View | Formatted Diff | Diff

Attachments on bug 188255: 346618