Changeset 246814 in webkit


Ignore:
Timestamp:
Jun 25, 2019 4:24:30 PM (5 years ago)
Author:
Ross Kirsling
Message:

[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):

Location:
trunk/Tools
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r246800 r246814  
     12019-06-25  Ross Kirsling  <ross.kirsling@sony.com>
     2
     3        [Win] MiniBrowser should default to webkit.org
     4        https://bugs.webkit.org/show_bug.cgi?id=199201
     5
     6        Reviewed by Don Olmstead.
     7
     8        * MiniBrowser/win/BrowserWindow.h:
     9        * MiniBrowser/win/MiniBrowserReplace.h:
     10        * MiniBrowser/win/WebKitBrowserWindow.cpp:
     11        (WebKitBrowserWindow::loadHTMLString): Deleted.
     12        * MiniBrowser/win/WebKitBrowserWindow.h:
     13        * MiniBrowser/win/WebKitLegacyBrowserWindow.cpp:
     14        (WebKitLegacyBrowserWindow::loadHTMLString): Deleted.
     15        * MiniBrowser/win/WebKitLegacyBrowserWindow.h:
     16        * MiniBrowser/win/WinMain.cpp:
     17        (wWinMain):
     18
    1192019-06-25  Wenson Hsieh  <wenson_hsieh@apple.com>
    220

  • trunk/Tools/MiniBrowser/win/BrowserWindow.h

    r238051 r246814  
    3636    virtual HWND hwnd() = 0;
    3737
    38     virtual HRESULT loadHTMLString(const BSTR&) = 0;
    3938    virtual HRESULT loadURL(const BSTR& passedURL) = 0;
    4039    virtual void navigateForwardOrBackward(UINT menuID) = 0;

  • trunk/Tools/MiniBrowser/win/MiniBrowserReplace.h

    r237616 r246814  
    2323 */
    2424
    25 #ifndef MiniBrowserReplace_h
    26 #define MiniBrowserReplace_h
     25#pragma once
    2726
    2827// This file is to make it easier for users to manage changes to the internals of MiniBrowser
    2928
    30 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>";
     29static const wchar_t* defaultURL = L"https://www.webkit.org/";
    3130
    3231static void processCrashReport(const wchar_t* fileName) { ::MessageBox(0, fileName, L"Crash Report", MB_OK); }
    33 
    34 #endif

  • trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp

    r246249 r246814  
    190190}
    191191
    192 HRESULT WebKitBrowserWindow::loadHTMLString(const BSTR& str)
    193 {
    194     auto page = WKViewGetPage(m_view.get());
    195     auto url = createWKURL(_bstr_t(L"about:"));
    196     WKPageLoadHTMLString(page, createWKString(_bstr_t(str)).get(), url.get());
    197     return true;
    198 }
    199 
    200192void WebKitBrowserWindow::navigateForwardOrBackward(UINT menuID)
    201193{

  • trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.h

    r243654 r246814  
    4141    HWND hwnd() override;
    4242
    43     HRESULT loadHTMLString(const BSTR&) override;
    4443    HRESULT loadURL(const BSTR& url) override;
    4544    void navigateForwardOrBackward(UINT menuID) override;

  • trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp

    r239666 r246814  
    3434#include "DOMDefaultImpl.h"
    3535#include "MiniBrowserLibResource.h"
    36 #include "MiniBrowserReplace.h"
    3736#include "MiniBrowserWebHost.h"
    3837#include "PrintWebUIDelegate.h"
    … …  
    196195    hr = m_webViewPrivate->viewWindow(&m_viewWnd);
    197196
    198     return hr;
    199 }
    200 
    201 HRESULT WebKitLegacyBrowserWindow::loadHTMLString(const BSTR& str)
    202 {
    203     IWebFramePtr frame;
    204     HRESULT hr = m_webView->mainFrame(&frame.GetInterfacePtr());
    205     if (FAILED(hr))
    206         return hr;
    207 
    208     frame->loadHTMLString(str, 0);
    209197    return hr;
    210198}

  • trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h

    r239666 r246814  
    6767    HRESULT prepareViews(HWND mainWnd, const RECT& clientRect);
    6868
    69     HRESULT loadHTMLString(const BSTR&);
    7069    HRESULT loadURL(const BSTR& passedURL);
    7170

  • trunk/Tools/MiniBrowser/win/WinMain.cpp

    r242984 r246814  
    8383        mainWindow.loadURL(options.requestedURL.GetBSTR());
    8484    else
    85         mainWindow.browserWindow()->loadHTMLString(_bstr_t(defaultHTML).GetBSTR());
     85        mainWindow.browserWindow()->loadURL(_bstr_t(defaultURL).GetBSTR());
    8686
    8787#pragma warning(disable:4509)
Note: See TracChangeset for help on using the changeset viewer.