WebKit Bugzilla
Attachment 372868 Details for
Bug 199201
: [Win] MiniBrowser should default to webkit.org
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for landing
bug-199201-20190625154103.patch (text/plain), 6.36 KB, created by
Ross Kirsling
on 2019-06-25 15:41:06 PDT
(
hide
)
Description:
Patch for landing
Filename:
MIME Type:
Creator:
Ross Kirsling
Created:
2019-06-25 15:41:06 PDT
Size:
6.36 KB
patch
obsolete
>Subversion Revision: 246801 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 8f56538a6ac274982c0ff90d45f98b9730c98992..a2e5cb43799e26078d0fbac8039435b66decfcae 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,21 @@ >+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 Don Olmstead. >+ >+ * MiniBrowser/win/BrowserWindow.h: >+ * MiniBrowser/win/MiniBrowserReplace.h: >+ * MiniBrowser/win/WebKitBrowserWindow.cpp: >+ (WebKitBrowserWindow::loadHTMLString): Deleted. >+ * MiniBrowser/win/WebKitBrowserWindow.h: >+ * MiniBrowser/win/WebKitLegacyBrowserWindow.cpp: >+ (WebKitLegacyBrowserWindow::loadHTMLString): Deleted. >+ * MiniBrowser/win/WebKitLegacyBrowserWindow.h: >+ * 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/BrowserWindow.h b/Tools/MiniBrowser/win/BrowserWindow.h >index a52237fcdd7a291d82decf4540dd921c3b6c054c..f178a62e230029bf7fbd2493c85960b61beac942 100644 >--- a/Tools/MiniBrowser/win/BrowserWindow.h >+++ b/Tools/MiniBrowser/win/BrowserWindow.h >@@ -35,7 +35,6 @@ public: > virtual HRESULT init() = 0; > virtual HWND hwnd() = 0; > >- virtual HRESULT loadHTMLString(const BSTR&) = 0; > virtual HRESULT loadURL(const BSTR& passedURL) = 0; > virtual void navigateForwardOrBackward(UINT menuID) = 0; > virtual void navigateToHistory(UINT menuID) = 0; >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/WebKitBrowserWindow.cpp b/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp >index 50ef2329bacf93217c3932d12e27fcec3233084a..004b0a9d1adac8e58f201025f3847da56aeed968 100644 >--- a/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp >+++ b/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp >@@ -189,14 +189,6 @@ HRESULT WebKitBrowserWindow::loadURL(const BSTR& url) > return true; > } > >-HRESULT WebKitBrowserWindow::loadHTMLString(const BSTR& str) >-{ >- auto page = WKViewGetPage(m_view.get()); >- auto url = createWKURL(_bstr_t(L"about:")); >- WKPageLoadHTMLString(page, createWKString(_bstr_t(str)).get(), url.get()); >- return true; >-} >- > void WebKitBrowserWindow::navigateForwardOrBackward(UINT menuID) > { > auto page = WKViewGetPage(m_view.get()); >diff --git a/Tools/MiniBrowser/win/WebKitBrowserWindow.h b/Tools/MiniBrowser/win/WebKitBrowserWindow.h >index b79b84530bb803e7a3ec96abfcd6450fb9896d20..876827bcfc6908db85a2f566623753f02c367ccd 100644 >--- a/Tools/MiniBrowser/win/WebKitBrowserWindow.h >+++ b/Tools/MiniBrowser/win/WebKitBrowserWindow.h >@@ -40,7 +40,6 @@ private: > HRESULT init() override; > HWND hwnd() override; > >- HRESULT loadHTMLString(const BSTR&) override; > HRESULT loadURL(const BSTR& url) override; > void navigateForwardOrBackward(UINT menuID) override; > void navigateToHistory(UINT menuID) override; >diff --git a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp >index 3de9fe55c126cc35c2bf6a3276458b775624bcef..db72d95b674ec11576bce5c2f7385eb56e82eeed 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" >@@ -198,17 +197,6 @@ HRESULT WebKitLegacyBrowserWindow::prepareViews(HWND mainWnd, const RECT& client > return hr; > } > >-HRESULT WebKitLegacyBrowserWindow::loadHTMLString(const BSTR& str) >-{ >- IWebFramePtr frame; >- HRESULT hr = m_webView->mainFrame(&frame.GetInterfacePtr()); >- if (FAILED(hr)) >- return hr; >- >- frame->loadHTMLString(str, 0); >- return hr; >-} >- > static WNDPROC gDefWebKitProc; > > static LRESULT CALLBACK viewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) >diff --git a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h >index ea49645fe3381b72a00a7027090fe487c492289d..f5195bd3266f4226062214068ab4c8fb20bcbbfa 100644 >--- a/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h >+++ b/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h >@@ -66,7 +66,6 @@ private: > HRESULT init(); > HRESULT prepareViews(HWND mainWnd, const RECT& clientRect); > >- HRESULT loadHTMLString(const BSTR&); > HRESULT loadURL(const BSTR& passedURL); > > void showLastVisitedSites(IWebView&); >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) >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 199201
:
372858
| 372868