Attachment 372858 Details for Bug 199201 – Patch

[patch] Patch

bug-199201-20190625134433.patch (text/plain), 3.07 KB, created by Ross Kirsling on 2019-06-25 13:44:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2019-06-25 13:44:37 PDT

Size: 3.07 KB

patch

obsolete

>Subversion Revision: 246801
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 8f56538a6ac274982c0ff90d45f98b9730c98992..92096d68d2e6dd20c6f8245e02ef281f2f538e29 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-25  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        [Win] MiniBrowser should default to webkit.org
>+        https://bugs.webkit.org/show_bug.cgi?id=199201
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * MiniBrowser/win/MiniBrowserReplace.h:
>+        * MiniBrowser/win/WebKitLegacyBrowserWindow.cpp:
>+        * MiniBrowser/win/WinMain.cpp:
>+        (wWinMain):
>+
> 2019-06-25  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Occasional crash under -[UIPreviewTarget initWithContainer:center:transform:] when generating a drag preview
>diff --git a/Tools/MiniBrowser/win/MiniBrowserReplace.h b/Tools/MiniBrowser/win/MiniBrowserReplace.h
>index 7c623f45f70b6be36b27514b2edc125bc645f472..67d00eba587578c5d0ea73463ae7ec09d6a13bc9 100644
>--- a/Tools/MiniBrowser/win/MiniBrowserReplace.h
>+++ b/Tools/MiniBrowser/win/MiniBrowserReplace.h
>@@ -22,13 +22,10 @@
>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef MiniBrowserReplace_h
>-#define MiniBrowserReplace_h
>+#pragma once
> 
> // This file is to make it easier for users to manage changes to the internals of MiniBrowser
> 
>-static const wchar_t* defaultHTML = L"<p style=\"background-color: #00FF00\">Testing</p><img id=\"webkit logo\" src=\"https://webkit.org/wp-content/themes/webkit/images/webkit.svg\" alt=\"WebKit Logo\" height=\"50\" width=\"50\"><div style=\"border: solid blue; background: white;\" contenteditable=\"true\">div with blue border</div><ul><li>foo<li>bar<li>baz</ul>";
>+static const wchar_t* defaultURL = L"https://www.webkit.org/";
> 
> static void processCrashReport(const wchar_t* fileName) { ::MessageBox(0, fileName, L"Crash Report", MB_OK); }
>-
>-#endif
>diff --git a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp
>index 3de9fe55c126cc35c2bf6a3276458b775624bcef..3f283810f92553bd8162b5e93b61225f56855e86 100644
>--- a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp
>+++ b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp
>@@ -33,7 +33,6 @@
> #include "Common.h"
> #include "DOMDefaultImpl.h"
> #include "MiniBrowserLibResource.h"
>-#include "MiniBrowserReplace.h"
> #include "MiniBrowserWebHost.h"
> #include "PrintWebUIDelegate.h"
> #include "ResourceLoadDelegate.h"
>diff --git a/Tools/MiniBrowser/win/WinMain.cpp b/Tools/MiniBrowser/win/WinMain.cpp
>index 93f005842fe493936bfad769e050811003095db6..3e788283503aae98bdcbcfd35fd6b99c3670b3fd 100644
>--- a/Tools/MiniBrowser/win/WinMain.cpp
>+++ b/Tools/MiniBrowser/win/WinMain.cpp
>@@ -82,7 +82,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
>     if (options.requestedURL.length())
>         mainWindow.loadURL(options.requestedURL.GetBSTR());
>     else
>-        mainWindow.browserWindow()->loadHTMLString(_bstr_t(defaultHTML).GetBSTR());
>+        mainWindow.browserWindow()->loadURL(_bstr_t(defaultURL).GetBSTR());
> 
> #pragma warning(disable:4509)
>

Actions: View | Formatted Diff | Diff

Attachments on bug 199201: 372858 | 372868