Attachment 346621 Details for Bug 188345 – WIP patch

[patch] WIP patch

wip.patch (text/plain), 7.43 KB, created by Fujii Hironori on 2018-08-06 04:07:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-08-06 04:07:10 PDT

Size: 7.43 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 1f12887fd1c..26c87272bf2 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 3588fc43b3f..ac38f01b4bd 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/TestResultServer/static-dashboards/builders.jsonp b/Tools/TestResultServer/static-dashboards/builders.jsonp
>index 7223d13a969..97606f2164c 100644
>--- a/Tools/TestResultServer/static-dashboards/builders.jsonp
>+++ b/Tools/TestResultServer/static-dashboards/builders.jsonp
>@@ -22,7 +22,8 @@ LOAD_BUILDBOT_DATA([
>                     "GTK Linux 64-bit Debug (Tests)", 
>                     "GTK Linux 64-bit Release (Tests)", 
>                     "GTK Linux 64-bit Release Wayland (Tests)", 
>-                    "WPE Linux 64-bit Release (Tests)"
>+                    "WPE Linux 64-bit Release (Tests)",
>+                    "WinCairo 64-bit WKL Release (Tests)"
>                 ]
>             }
>         }, 
>diff --git a/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js b/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js
>index a9c8b110f5a..3671ce8d1b1 100644
>--- a/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js
>+++ b/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js
>@@ -93,6 +93,9 @@ var PLATFORMS = {
>         subPlatforms: {
>             'LINUX': { fallbackPlatforms: ['WPE', 'WK2'] }
>         }
>+    },
>+    'WinCairo': {
>+        expectationsDirectory: 'wincairo',
>     }
> };
> 
>@@ -356,6 +359,9 @@ function determineBuilderPlatform(builderNameUpperCase)
>     if (string.contains(builderNameUpperCase, 'WPE LINUX'))
>         return 'WPE_LINUX';
> 
>+    if (string.contains(builderNameUpperCase, 'WINCAIRO'))
>+        return 'WINCAIRO';
>+
>     if (string.contains(builderNameUpperCase, 'MOJAVE'))
>         return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_MOJAVE');
>     if (string.contains(builderNameUpperCase, 'HIGHSIERRA'))
>diff --git a/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js b/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js
>index a456fb88811..3018271f843 100644
>--- a/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js
>+++ b/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js
>@@ -46,7 +46,7 @@ function resetGlobals()
>     LOAD_BUILDBOT_DATA([{
>         name: 'webkit.org',
>         url: 'dummyurl',
>-        tests: {'layout-tests': {'builders': ['Apple Lion Release WK2 (Tests)', 'Apple Lion Debug WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)', 'WPE Linux 64-bit Release (Tests)']}}
>+        tests: {'layout-tests': {'builders': ['Apple Lion Release WK2 (Tests)', 'Apple Lion Debug WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)', 'WPE Linux 64-bit Release (Tests)', 'WinCairo 64-bit WKL Release (Tests)']}}
>     }]);
>  
>     for (var group in LAYOUT_TESTS_BUILDER_GROUPS)
>@@ -162,6 +162,7 @@ test('platformAndBuildType', 30, function() {
>     runPlatformAndBuildTypeTest('Windows 7 Release (Tests)', 'APPLE_WIN_WIN7', 'RELEASE');
>     runPlatformAndBuildTypeTest('Windows XP Debug (Tests)', 'APPLE_WIN_XP', 'DEBUG');
>     runPlatformAndBuildTypeTest('WPE Linux 64-bit Release (Tests)', 'WPE_LINUX', 'RELEASE');
>+    runPlatformAndBuildTypeTest('WinCairo 64-bit WKL Release (Tests)', 'WINCAIRO', 'RELEASE');
>     
>     // FIXME: Should WebKit2 be it's own platform?
>     runPlatformAndBuildTypeTest('MountainLion Release (WebKit2 Tests)', 'APPLE_MAC_MOUNTAINLION_WK2', 'RELEASE');
>diff --git a/Tools/TestResultServer/static-dashboards/loader_unittests.js b/Tools/TestResultServer/static-dashboards/loader_unittests.js
>index a050ebc2b3d..41a4ba06fcc 100644
>--- a/Tools/TestResultServer/static-dashboards/loader_unittests.js
>+++ b/Tools/TestResultServer/static-dashboards/loader_unittests.js
>@@ -52,7 +52,7 @@ test('loading steps', 1, function() {
> // and then 2 per builder (one for ok, one for deepEqual of tests).
> test('results files loading', 9, function() {
>     resetGlobals();
>-    var expectedLoadedBuilders =  ['Apple Lion Debug WK2 (Tests)', 'Apple Lion Release WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)', 'WPE Linux 64-bit Release (Tests)'];
>+    var expectedLoadedBuilders =  ['Apple Lion Debug WK2 (Tests)', 'Apple Lion Release WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)', 'WPE Linux 64-bit Release (Tests)', 'WinCairo 64-bit WKL Release (Tests)'];
>     var loadedBuilders = [];
>     var resourceLoader = new loader.Loader();
>     resourceLoader._loadNext = function() {
>@@ -83,7 +83,7 @@ test('expectations files loading', 1, function() {
>     resetGlobals();
>     g_history.parseCrossDashboardParameters();
>     var expectedLoadedPlatforms = ["gtk", "gtk-wk2",
>-        "mac", "mac-lion", "mac-wk2", "mac-wk2", "win", "wk2", "wpe"];
>+        "mac", "mac-lion", "mac-wk2", "mac-wk2", "win", "wk2", "wpe", "wincairo"];
>     var loadedPlatforms = [];
>     var resourceLoader = new loader.Loader();
>     resourceLoader._loadNext = function() {
>diff --git a/Tools/win/DLLLauncher/DLLLauncherMain.cpp b/Tools/win/DLLLauncher/DLLLauncherMain.cpp
>index fcf1a8719f9..1d22daa4de0 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 188345: 346621 | 346622 | 346896 | 347606 | 351938