Attachment 342763 Details for Bug 186633 – PATCH

[patch] PATCH

186633.diff (text/plain), 4.72 KB, created by Basuke Suzuki on 2018-06-14 14:45:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-06-14 14:45:22 PDT

Size: 4.72 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f0df078584d..eaa75edf218 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-06-14  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win][MiniBrowser] Change to use WebKit by default if it's available
>+        https://bugs.webkit.org/show_bug.cgi?id=186633
>+
>+        When MiniBrowser is built with WebKit, use it by default. Also add command
>+        line switch for WebKitLegacy.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * MiniBrowser/win/Common.cpp:
>+        (parseCommandLine):
>+        (dllLauncherEntryPoint): Deleted.
>+        * MiniBrowser/win/Common.h:
>+        * MiniBrowser/win/WinMain.cpp:
>+        (wWinMain):
>+        (dllLauncherEntryPoint):
>+
> 2018-06-14  Carlos Alberto Lopez Perez  <clopez@igalia.com>
> 
>         [GTK] Enable tests on the GTK EWS queue
>diff --git a/Tools/MiniBrowser/win/Common.cpp b/Tools/MiniBrowser/win/Common.cpp
>index fa25f542d35..6eb910b9a1d 100644
>--- a/Tools/MiniBrowser/win/Common.cpp
>+++ b/Tools/MiniBrowser/win/Common.cpp
>@@ -165,12 +165,16 @@ HRESULT displayAuthDialog(HWND hwnd, std::wstring& username, std::wstring& passw
>     return result > 0 ? S_OK : E_FAIL;
> }
> 
>-void parseCommandLine(bool& usesLayeredWebView, bool& useFullDesktop, bool& pageLoadTesting, _bstr_t& requestedURL)
>+void parseCommandLine(bool& usesLayeredWebView, bool& useFullDesktop, bool& pageLoadTesting, MainWindow::BrowserWindowType& windowType, _bstr_t& requestedURL)
> {
>     usesLayeredWebView = false;
>     useFullDesktop = false;
>     pageLoadTesting = false;
> 
>+#if ENABLE(WEBKIT)
>+    windowType = MainWindow::BrowserWindowType::WebKit;
>+#endif
>+
>     int argc = 0;
>     WCHAR** argv = CommandLineToArgvW(GetCommandLineW(), &argc);
>     for (int i = 1; i < argc; ++i) {
>@@ -182,12 +186,13 @@ void parseCommandLine(bool& usesLayeredWebView, bool& useFullDesktop, bool& page
>             pageLoadTesting = true;
>         else if (!wcsicmp(argv[i], L"--highDPI"))
>             continue; // ignore
>+        else if (!wcsicmp(argv[i], L"--wk1") || !wcsicmp(argv[i], L"--legacy"))
>+            windowType = MainWindow::BrowserWindowType::WebKitLegacy;
>+#if ENABLE(WEBKIT)
>+        else if (!wcsicmp(argv[i], L"--wk2") || !wcsicmp(argv[i], L"--webkit"))
>+            windowType = MainWindow::BrowserWindowType::WebKit;
>+#endif
>         else if (!requestedURL)
>             requestedURL = argv[i];
>     }
> }
>-
>-extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow)
>-{
>-    return wWinMain(hInstance, hPrevInstance, lpstrCmdLine, nCmdShow);
>-}
>diff --git a/Tools/MiniBrowser/win/Common.h b/Tools/MiniBrowser/win/Common.h
>index 985fe7744c3..5beb495defb 100644
>--- a/Tools/MiniBrowser/win/Common.h
>+++ b/Tools/MiniBrowser/win/Common.h
>@@ -31,7 +31,7 @@
> 
> void computeFullDesktopFrame();
> bool getAppDataFolder(_bstr_t& directory);
>-void parseCommandLine(bool& usesLayeredWebView, bool& useFullDesktop, bool& pageLoadTesting, _bstr_t& requestedURL);
>+void parseCommandLine(bool& usesLayeredWebView, bool& useFullDesktop, bool& pageLoadTesting, MainWindow::BrowserWindowType&, _bstr_t& requestedURL);
> void createCrashReport(EXCEPTION_POINTERS*);
> HRESULT displayAuthDialog(HWND, std::wstring& username, std::wstring& password);
> 
>diff --git a/Tools/MiniBrowser/win/WinMain.cpp b/Tools/MiniBrowser/win/WinMain.cpp
>index c96a677c74f..cfae20d0e19 100644
>--- a/Tools/MiniBrowser/win/WinMain.cpp
>+++ b/Tools/MiniBrowser/win/WinMain.cpp
>@@ -53,9 +53,10 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
>     bool usesLayeredWebView = false;
>     bool useFullDesktop = false;
>     bool pageLoadTesting = false;
>+    MainWindow::BrowserWindowType windowType = MainWindow::BrowserWindowType::WebKitLegacy;
>     _bstr_t requestedURL;
> 
>-    parseCommandLine(usesLayeredWebView, useFullDesktop, pageLoadTesting, requestedURL);
>+    parseCommandLine(usesLayeredWebView, useFullDesktop, pageLoadTesting, windowType, requestedURL);
> 
>     if (useFullDesktop)
>         computeFullDesktopFrame();
>@@ -65,7 +66,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
> 
>     ::SetProcessDPIAware();
> 
>-    auto& mainWindow = MainWindow::create(MainWindow::BrowserWindowType::WebKitLegacy).leakRef();
>+    auto& mainWindow = MainWindow::create(windowType).leakRef();
>     HRESULT hr = mainWindow.init(hInst, usesLayeredWebView, pageLoadTesting);
>     if (FAILED(hr))
>         goto exit;
>@@ -104,3 +105,8 @@ exit:
> 
>     return static_cast<int>(msg.wParam);
> }
>+
>+extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow)
>+{
>+    return wWinMain(hInstance, hPrevInstance, lpstrCmdLine, nCmdShow);
>+}

Flags:

youennf: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186633: 342763 | 342770