Diff
Modified: trunk/Tools/ChangeLog (249038 => 249039)
--- trunk/Tools/ChangeLog 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/ChangeLog 2019-08-23 01:59:22 UTC (rev 249039)
@@ -1,3 +1,40 @@
+2019-08-22 Fujii Hironori <[email protected]>
+
+ [Win][MiniBrowser] URL bar should be updated for in-page navigations
+ https://bugs.webkit.org/show_bug.cgi?id=201032
+
+ Reviewed by Darin Adler.
+
+ * MiniBrowser/win/BrowserWindow.h: Added activeURLChanged to BrowserWindowClient interface.
+ * MiniBrowser/win/MainWindow.cpp:
+ (MainWindow::init):
+ (MainWindow::activeURLChanged): Added.
+ * MiniBrowser/win/MainWindow.h:
+ * MiniBrowser/win/MiniBrowserWebHost.cpp:
+ (MiniBrowserWebHost::didCommitLoadForFrame):
+ (MiniBrowserWebHost::didChangeLocationWithinPageForFrame): Added.
+ (MiniBrowserWebHost::updateAddressBar): Deleted.
+ (MiniBrowserWebHost::loadURL): Deleted.
+ * MiniBrowser/win/MiniBrowserWebHost.h:
+ (MiniBrowserWebHost::MiniBrowserWebHost):
+ (MiniBrowserWebHost::didCommitLoadForFrame): Deleted.
+ (MiniBrowserWebHost::didChangeLocationWithinPageForFrame): Deleted.
+ * MiniBrowser/win/PrintWebUIDelegate.cpp:
+ * MiniBrowser/win/WebKitBrowserWindow.cpp:
+ (WebKitBrowserWindow::create):
+ (WebKitBrowserWindow::WebKitBrowserWindow):
+ (WebKitBrowserWindow::didChangeIsLoading): Removed an unused variable.
+ (WebKitBrowserWindow::didChangeActiveURL): Added.
+ (WebKitBrowserWindow::createNewPage):
+ (WebKitBrowserWindow::didCommitNavigation): Deleted.
+ * MiniBrowser/win/WebKitBrowserWindow.h: Removed m_urlBarWnd.
+ * MiniBrowser/win/WebKitLegacyBrowserWindow.cpp:
+ (WebKitLegacyBrowserWindow::create):
+ (WebKitLegacyBrowserWindow::WebKitLegacyBrowserWindow):
+ (WebKitLegacyBrowserWindow::init):
+ (WebKitLegacyBrowserWindow::navigateToHistory):
+ * MiniBrowser/win/WebKitLegacyBrowserWindow.h: Removed m_urlBarWnd.
+
2019-08-22 Andy Estes <[email protected]>
[watchOS] Disable Content Filtering in the simulator build
Modified: trunk/Tools/MiniBrowser/win/BrowserWindow.h (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/BrowserWindow.h 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/BrowserWindow.h 2019-08-23 01:59:22 UTC (rev 249039)
@@ -32,6 +32,7 @@
public:
virtual void progressChanged(double) = 0;
virtual void progressFinished() = 0;
+ virtual void activeURLChanged(std::wstring) = 0;
};
class BrowserWindow : public RefCounted<BrowserWindow> {
Modified: trunk/Tools/MiniBrowser/win/MainWindow.cpp (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/MainWindow.cpp 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/MainWindow.cpp 2019-08-23 01:59:22 UTC (rev 249039)
@@ -125,7 +125,7 @@
DefEditProc = reinterpret_cast<WNDPROC>(GetWindowLongPtr(m_hURLBarWnd, GWLP_WNDPROC));
SetWindowLongPtr(m_hURLBarWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(EditProc));
- m_browserWindow = factory(*this, m_hMainWnd, m_hURLBarWnd, usesLayeredWebView);
+ m_browserWindow = factory(*this, m_hMainWnd, usesLayeredWebView);
if (!m_browserWindow)
return false;
HRESULT hr = m_browserWindow->init();
@@ -487,3 +487,8 @@
{
SetWindowText(m_hProgressIndicator, L"");
}
+
+void MainWindow::activeURLChanged(std::wstring url)
+{
+ SetWindowText(m_hURLBarWnd, url.c_str());
+}
Modified: trunk/Tools/MiniBrowser/win/MainWindow.h (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/MainWindow.h 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/MainWindow.h 2019-08-23 01:59:22 UTC (rev 249039)
@@ -33,7 +33,7 @@
class MainWindow final : public RefCounted<MainWindow>, public BrowserWindowClient {
public:
- using BrowserWindowFactory = std::function<Ref<BrowserWindow>(BrowserWindowClient&, HWND mainWnd, HWND urlBarWnd, bool usesLayeredWebView)>;
+ using BrowserWindowFactory = std::function<Ref<BrowserWindow>(BrowserWindowClient&, HWND mainWnd, bool usesLayeredWebView)>;
static Ref<MainWindow> create();
@@ -62,6 +62,7 @@
// BrowserWindowClient
void progressChanged(double) final;
void progressFinished() final;
+ void activeURLChanged(std::wstring) final;
HWND m_hMainWnd { nullptr };
HWND m_hURLBarWnd { nullptr };
Modified: trunk/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserWebHost.cpp 2019-08-23 01:59:22 UTC (rev 249039)
@@ -33,42 +33,12 @@
#include <WebKitLegacy/WebKit.h>
typedef _com_ptr_t<_com_IIID<IWebDataSource, &__uuidof(IWebDataSource)>> IWebDataSourcePtr;
-typedef _com_ptr_t<_com_IIID<IWebMutableURLRequest, &__uuidof(IWebMutableURLRequest)>> IWebMutableURLRequestPtr;
-HRESULT MiniBrowserWebHost::updateAddressBar(IWebView& webView)
+HRESULT MiniBrowserWebHost::didCommitLoadForFrame(_In_opt_ IWebView* webView, _In_opt_ IWebFrame* frame)
{
- IWebFramePtr mainFrame;
- HRESULT hr = webView.mainFrame(&mainFrame.GetInterfacePtr());
- if (FAILED(hr))
- return hr;
-
- IWebDataSourcePtr dataSource;
- hr = mainFrame->dataSource(&dataSource.GetInterfacePtr());
- if (FAILED(hr) || !dataSource)
- hr = mainFrame->provisionalDataSource(&dataSource.GetInterfacePtr());
- if (FAILED(hr) || !dataSource)
- return hr;
-
- IWebMutableURLRequestPtr request;
- hr = dataSource->request(&request.GetInterfacePtr());
- if (FAILED(hr) || !request)
- return hr;
-
- _bstr_t frameURL;
- hr = request->mainDocumentURL(frameURL.GetAddress());
- if (FAILED(hr))
- return hr;
-
- loadURL(frameURL);
-
- return S_OK;
+ return didChangeLocationWithinPageForFrame(webView, frame);
}
-void MiniBrowserWebHost::loadURL(_bstr_t& url)
-{
- ::SendMessage(m_hURLBarWnd, static_cast<UINT>(WM_SETTEXT), 0, reinterpret_cast<LPARAM>(url.GetBSTR()));
-}
-
HRESULT MiniBrowserWebHost::didFailProvisionalLoadWithError(_In_opt_ IWebView*, _In_opt_ IWebError *error, _In_opt_ IWebFrame*)
{
_bstr_t errorDescription;
@@ -84,6 +54,25 @@
return S_OK;
}
+HRESULT MiniBrowserWebHost::didChangeLocationWithinPageForFrame(_In_opt_ IWebView* webView, _In_opt_ IWebFrame* frame)
+{
+ IWebFrame2Ptr frame2(frame);
+ if (!frame2)
+ return E_NOINTERFACE;
+ BOOL isMainFrame;
+ HRESULT hr = frame2->isMainFrame(&isMainFrame);
+ if (FAILED(hr))
+ return hr;
+ if (!isMainFrame)
+ return S_OK;
+ _bstr_t url;
+ hr = webView->mainFrameURL(url.GetAddress());
+ if (FAILED(hr))
+ return hr;
+ m_client->m_client.activeURLChanged(url.GetBSTR());
+ return S_OK;
+}
+
HRESULT MiniBrowserWebHost::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
{
if (!ppvObject)
@@ -110,8 +99,6 @@
return m_client->Release();
}
-typedef _com_ptr_t<_com_IIID<IWebFrame2, &__uuidof(IWebFrame2)>> IWebFrame2Ptr;
-
HRESULT MiniBrowserWebHost::didFinishLoadForFrame(_In_opt_ IWebView* webView, _In_opt_ IWebFrame* frame)
{
if (!frame || !webView)
Modified: trunk/Tools/MiniBrowser/win/MiniBrowserWebHost.h (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/MiniBrowserWebHost.h 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserWebHost.h 2019-08-23 01:59:22 UTC (rev 249039)
@@ -33,8 +33,8 @@
class MiniBrowserWebHost : public IWebFrameLoadDelegate, public IWebFrameLoadDelegatePrivate, public IWebNotificationObserver {
public:
- MiniBrowserWebHost(WebKitLegacyBrowserWindow* client, HWND urlBar)
- : m_client(client), m_hURLBarWnd(urlBar) { }
+ MiniBrowserWebHost(WebKitLegacyBrowserWindow* client)
+ : m_client(client) { }
// IUnknown
virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
@@ -45,20 +45,13 @@
virtual HRESULT STDMETHODCALLTYPE didStartProvisionalLoadForFrame(_In_opt_ IWebView*, _In_opt_ IWebFrame*);
virtual HRESULT STDMETHODCALLTYPE didReceiveServerRedirectForProvisionalLoadForFrame(_In_opt_ IWebView*, _In_opt_ IWebFrame*) { return S_OK; }
virtual HRESULT STDMETHODCALLTYPE didFailProvisionalLoadWithError(_In_opt_ IWebView*, _In_opt_ IWebError*, _In_opt_ IWebFrame*);
- virtual HRESULT STDMETHODCALLTYPE didCommitLoadForFrame(_In_opt_ IWebView* webView, _In_opt_ IWebFrame*)
- {
- if (!webView)
- return E_POINTER;
-
- return updateAddressBar(*webView);
- }
-
+ virtual HRESULT STDMETHODCALLTYPE didCommitLoadForFrame(_In_opt_ IWebView*, _In_opt_ IWebFrame*);
virtual HRESULT STDMETHODCALLTYPE didReceiveTitle(_In_opt_ IWebView*, _In_ BSTR title, _In_opt_ IWebFrame*) { return S_OK; }
virtual HRESULT STDMETHODCALLTYPE didChangeIcons(_In_opt_ IWebView*, _In_opt_ IWebFrame*) { return S_OK; }
virtual HRESULT STDMETHODCALLTYPE didReceiveIcon(_In_opt_ IWebView*, _In_ HBITMAP, _In_opt_ IWebFrame*) { return S_OK; }
virtual HRESULT STDMETHODCALLTYPE didFinishLoadForFrame(_In_opt_ IWebView*, _In_opt_ IWebFrame*);
virtual HRESULT STDMETHODCALLTYPE didFailLoadWithError(_In_opt_ IWebView*, _In_opt_ IWebError*, _In_opt_ IWebFrame*);
- virtual HRESULT STDMETHODCALLTYPE didChangeLocationWithinPageForFrame(_In_opt_ IWebView*, _In_opt_ IWebFrame*) { return S_OK; }
+ virtual HRESULT STDMETHODCALLTYPE didChangeLocationWithinPageForFrame(_In_opt_ IWebView*, _In_opt_ IWebFrame*);
virtual HRESULT STDMETHODCALLTYPE willPerformClientRedirectToURL(_In_opt_ IWebView*, _In_ BSTR url, double delaySeconds, DATE fireDate, _In_opt_ IWebFrame*) { return S_OK; }
virtual HRESULT STDMETHODCALLTYPE didCancelClientRedirectForFrame(_In_opt_ IWebView*, _In_opt_ IWebFrame*) { return S_OK; }
virtual HRESULT STDMETHODCALLTYPE willCloseFrame(_In_opt_ IWebView*, _In_opt_ IWebFrame*) { return S_OK; }
@@ -74,12 +67,6 @@
// IWebNotificationObserver
virtual HRESULT STDMETHODCALLTYPE onNotify(_In_opt_ IWebNotification*);
- void loadURL(_bstr_t&);
-
-protected:
- HRESULT updateAddressBar(IWebView&);
-
private:
WebKitLegacyBrowserWindow* m_client { nullptr };
- HWND m_hURLBarWnd { 0 };
};
Modified: trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.cpp (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.cpp 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/PrintWebUIDelegate.cpp 2019-08-23 01:59:22 UTC (rev 249039)
@@ -159,9 +159,6 @@
return m_client.Release();
}
-typedef _com_ptr_t<_com_IIID<IWebFrame, &__uuidof(IWebFrame)>> IWebFramePtr;
-typedef _com_ptr_t<_com_IIID<IWebFramePrivate, &__uuidof(IWebFramePrivate)>> IWebFramePrivatePtr;
-
HRESULT PrintWebUIDelegate::webViewPrintingMarginRect(_In_opt_ IWebView* view, _Out_ RECT* rect)
{
if (!view || !rect)
Modified: trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.cpp 2019-08-23 01:59:22 UTC (rev 249039)
@@ -104,7 +104,7 @@
return adoptWK(WKURLCreateWithUTF8CString(utf8.data()));
}
-Ref<BrowserWindow> WebKitBrowserWindow::create(BrowserWindowClient& client, HWND mainWnd, HWND urlBarWnd, bool)
+Ref<BrowserWindow> WebKitBrowserWindow::create(BrowserWindowClient& client, HWND mainWnd, bool)
{
auto conf = adoptWK(WKPageConfigurationCreate());
@@ -121,13 +121,12 @@
auto context =adoptWK(WKContextCreateWithConfiguration(nullptr));
WKPageConfigurationSetContext(conf.get(), context.get());
- return adoptRef(*new WebKitBrowserWindow(client, conf.get(), mainWnd, urlBarWnd));
+ return adoptRef(*new WebKitBrowserWindow(client, conf.get(), mainWnd));
}
-WebKitBrowserWindow::WebKitBrowserWindow(BrowserWindowClient& client, WKPageConfigurationRef conf, HWND mainWnd, HWND urlBarWnd)
+WebKitBrowserWindow::WebKitBrowserWindow(BrowserWindowClient& client, WKPageConfigurationRef conf, HWND mainWnd)
: m_client(client)
, m_hMainWnd(mainWnd)
- , m_urlBarWnd(urlBarWnd)
{
RECT rect = { };
m_view = adoptWK(WKViewCreate(rect, conf, mainWnd));
@@ -138,7 +137,6 @@
WKPageNavigationClientV0 navigationClient = { };
navigationClient.base.version = 0;
navigationClient.base.clientInfo = this;
- navigationClient.didCommitNavigation = didCommitNavigation;
navigationClient.didReceiveAuthenticationChallenge = didReceiveAuthenticationChallenge;
WKPageSetPageNavigationClient(page, &navigationClient.base);
@@ -155,6 +153,7 @@
stateClient.didChangeTitle = didChangeTitle;
stateClient.didChangeIsLoading = didChangeIsLoading;
stateClient.didChangeEstimatedProgress = didChangeEstimatedProgress;
+ stateClient.didChangeActiveURL = didChangeActiveURL;
WKPageSetPageStateClient(page, &stateClient.base);
updateProxySettings();
@@ -314,7 +313,6 @@
void WebKitBrowserWindow::didChangeIsLoading(const void* clientInfo)
{
auto& thisWindow = toWebKitBrowserWindow(clientInfo);
- auto page = WKViewGetPage(thisWindow.m_view.get());
thisWindow.m_client.progressFinished();
}
@@ -325,13 +323,12 @@
thisWindow.m_client.progressChanged(WKPageGetEstimatedProgress(page));
}
-void WebKitBrowserWindow::didCommitNavigation(WKPageRef page, WKNavigationRef navigation, WKTypeRef userData, const void* clientInfo)
+void WebKitBrowserWindow::didChangeActiveURL(const void* clientInfo)
{
auto& thisWindow = toWebKitBrowserWindow(clientInfo);
-
- WKRetainPtr<WKURLRef> wkurl = adoptWK(WKPageCopyCommittedURL(page));
- std::wstring urlString = createString(wkurl.get());
- SetWindowText(thisWindow.m_urlBarWnd, urlString.c_str());
+ auto page = WKViewGetPage(thisWindow.m_view.get());
+ WKRetainPtr<WKURLRef> url = ""
+ thisWindow.m_client.activeURLChanged(createString(url.get()));
}
void WebKitBrowserWindow::didReceiveAuthenticationChallenge(WKPageRef page, WKAuthenticationChallengeRef challenge, const void* clientInfo)
@@ -384,8 +381,8 @@
WKPageRef WebKitBrowserWindow::createNewPage(WKPageRef page, WKPageConfigurationRef configuration, WKNavigationActionRef navigationAction, WKWindowFeaturesRef windowFeatures, const void *clientInfo)
{
auto& newWindow = MainWindow::create().leakRef();
- auto factory = [configuration](BrowserWindowClient& client, HWND mainWnd, HWND urlBarWnd, bool) -> auto {
- return adoptRef(*new WebKitBrowserWindow(client, configuration, mainWnd, urlBarWnd));
+ auto factory = [configuration](BrowserWindowClient& client, HWND mainWnd, bool) -> auto {
+ return adoptRef(*new WebKitBrowserWindow(client, configuration, mainWnd));
};
bool ok = newWindow.init(factory, hInst);
if (!ok)
Modified: trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.h (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.h 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/WebKitBrowserWindow.h 2019-08-23 01:59:22 UTC (rev 249039)
@@ -33,10 +33,10 @@
class WebKitBrowserWindow : public BrowserWindow {
public:
- static Ref<BrowserWindow> create(BrowserWindowClient&, HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView = false);
+ static Ref<BrowserWindow> create(BrowserWindowClient&, HWND mainWnd, bool useLayeredWebView = false);
private:
- WebKitBrowserWindow(BrowserWindowClient&, WKPageConfigurationRef, HWND mainWnd, HWND urlBarWnd);
+ WebKitBrowserWindow(BrowserWindowClient&, WKPageConfigurationRef, HWND mainWnd);
HRESULT init() override;
HWND hwnd() override;
@@ -68,7 +68,7 @@
static void didChangeTitle(const void*);
static void didChangeIsLoading(const void*);
static void didChangeEstimatedProgress(const void*);
- static void didCommitNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*);
+ static void didChangeActiveURL(const void*);
static void didReceiveAuthenticationChallenge(WKPageRef, WKAuthenticationChallengeRef, const void*);
static WKPageRef createNewPage(WKPageRef, WKPageConfigurationRef, WKNavigationActionRef, WKWindowFeaturesRef, const void *);
static void didNotHandleKeyEvent(WKPageRef, WKNativeEventPtr, const void*);
@@ -76,7 +76,6 @@
BrowserWindowClient& m_client;
WKRetainPtr<WKViewRef> m_view;
HWND m_hMainWnd { nullptr };
- HWND m_urlBarWnd { nullptr };
ProxySettings m_proxy { };
std::unordered_map<std::wstring, std::wstring> m_acceptedServerTrustCerts;
};
Modified: trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp 2019-08-23 01:59:22 UTC (rev 249039)
@@ -57,20 +57,14 @@
static const int maxHistorySize = 10;
-typedef _com_ptr_t<_com_IIID<IWebMutableURLRequest, &__uuidof(IWebMutableURLRequest)>> IWebMutableURLRequestPtr;
-typedef _com_ptr_t<_com_IIID<IWebNotificationObserver, &__uuidof(IWebNotificationObserver)>> IWebNotificationObserverPtr;
-typedef _com_ptr_t<_com_IIID<IWebNotificationCenter, &__uuidof(IWebNotificationCenter)>> IWebNotificationCenterPtr;
-
-
-Ref<BrowserWindow> WebKitLegacyBrowserWindow::create(BrowserWindowClient& client, HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView)
+Ref<BrowserWindow> WebKitLegacyBrowserWindow::create(BrowserWindowClient& client, HWND mainWnd, bool useLayeredWebView)
{
- return adoptRef(*new WebKitLegacyBrowserWindow(client, mainWnd, urlBarWnd, useLayeredWebView));
+ return adoptRef(*new WebKitLegacyBrowserWindow(client, mainWnd, useLayeredWebView));
}
-WebKitLegacyBrowserWindow::WebKitLegacyBrowserWindow(BrowserWindowClient& client, HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView)
+WebKitLegacyBrowserWindow::WebKitLegacyBrowserWindow(BrowserWindowClient& client, HWND mainWnd, bool useLayeredWebView)
: m_client(client)
, m_hMainWnd(mainWnd)
- , m_hURLBarWnd(urlBarWnd)
, m_useLayeredWebView(useLayeredWebView)
{
}
@@ -129,7 +123,7 @@
if (!setCacheFolder())
return E_FAIL;
- auto webHost = new MiniBrowserWebHost(this, m_hURLBarWnd);
+ auto webHost = new MiniBrowserWebHost(this);
hr = setFrameLoadDelegate(webHost);
if (FAILED(hr))
@@ -474,7 +468,7 @@
_bstr_t frameURL;
desiredHistoryItem->URLString(frameURL.GetAddress());
- ::SendMessage(m_hURLBarWnd, (UINT)WM_SETTEXT, 0, (LPARAM)frameURL.GetBSTR());
+ m_client.activeURLChanged(frameURL.GetBSTR());
}
bool WebKitLegacyBrowserWindow::goBack()
Modified: trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h (249038 => 249039)
--- trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h 2019-08-23 01:43:43 UTC (rev 249038)
+++ trunk/Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.h 2019-08-23 01:59:22 UTC (rev 249039)
@@ -33,6 +33,7 @@
typedef _com_ptr_t<_com_IIID<IUnknown, &__uuidof(IUnknown)>> IUnknownPtr;
typedef _com_ptr_t<_com_IIID<IWebFrame, &__uuidof(IWebFrame)>> IWebFramePtr;
+typedef _com_ptr_t<_com_IIID<IWebFrame2, &__uuidof(IWebFrame2)>> IWebFrame2Ptr;
typedef _com_ptr_t<_com_IIID<IWebView, &__uuidof(IWebView)>> IWebViewPtr;
typedef _com_ptr_t<_com_IIID<IWebViewPrivate2, &__uuidof(IWebViewPrivate2)>> IWebViewPrivatePtr;
typedef _com_ptr_t<_com_IIID<IWebFrameLoadDelegate, &__uuidof(IWebFrameLoadDelegate)>> IWebFrameLoadDelegatePtr;
@@ -48,10 +49,13 @@
typedef _com_ptr_t<_com_IIID<IWebResourceLoadDelegate, &__uuidof(IWebResourceLoadDelegate)>> IWebResourceLoadDelegatePtr;
typedef _com_ptr_t<_com_IIID<IWebDownloadDelegate, &__uuidof(IWebDownloadDelegate)>> IWebDownloadDelegatePtr;
typedef _com_ptr_t<_com_IIID<IWebFramePrivate, &__uuidof(IWebFramePrivate)>> IWebFramePrivatePtr;
+typedef _com_ptr_t<_com_IIID<IWebMutableURLRequest, &__uuidof(IWebMutableURLRequest)>> IWebMutableURLRequestPtr;
+typedef _com_ptr_t<_com_IIID<IWebNotificationObserver, &__uuidof(IWebNotificationObserver)>> IWebNotificationObserverPtr;
+typedef _com_ptr_t<_com_IIID<IWebNotificationCenter, &__uuidof(IWebNotificationCenter)>> IWebNotificationCenterPtr;
class WebKitLegacyBrowserWindow : public BrowserWindow {
public:
- static Ref<BrowserWindow> create(BrowserWindowClient&, HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView = false);
+ static Ref<BrowserWindow> create(BrowserWindowClient&, HWND mainWnd, bool useLayeredWebView = false);
private:
friend class AccessibilityDelegate;
@@ -111,7 +115,7 @@
void updateStatistics(HWND dialog);
void setPreference(UINT menuID, bool enable);
- WebKitLegacyBrowserWindow(BrowserWindowClient&, HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView);
+ WebKitLegacyBrowserWindow(BrowserWindowClient&, HWND mainWnd, bool useLayeredWebView);
void subclassForLayeredWindow();
bool setCacheFolder();
@@ -136,7 +140,6 @@
IWebCachePtr m_webCache;
HWND m_hMainWnd { nullptr };
- HWND m_hURLBarWnd { nullptr };
HWND m_viewWnd { nullptr };
bool m_useLayeredWebView;
