Add support for setting http referrer
- Add url option to specify the http referrer - Add httpReferrer attribute to webview NOTE: This is still not complete. Some love has to be done to guest-view-manager.coffee and very likely the function calls called createGuest and to the code that uses them.
This commit is contained in:
parent
fea5559fbc
commit
f56d1ea7b4
6 changed files with 61 additions and 16 deletions
|
@ -286,8 +286,14 @@ bool WebContents::IsAlive() const {
|
|||
return web_contents() != NULL;
|
||||
}
|
||||
|
||||
void WebContents::LoadURL(const GURL& url) {
|
||||
void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
|
||||
content::NavigationController::LoadURLParams params(url);
|
||||
|
||||
base::string16 http_referrer_;
|
||||
|
||||
if(options.Get("httpReferrer", &http_referrer_))
|
||||
params.referrer = content::Referrer(GURL(http_referrer_).GetAsReferrer(), blink::WebReferrerPolicyDefault);
|
||||
|
||||
params.transition_type = content::PAGE_TRANSITION_TYPED;
|
||||
params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE;
|
||||
web_contents()->GetController().LoadURLWithParams(params);
|
||||
|
@ -313,15 +319,15 @@ void WebContents::Stop() {
|
|||
web_contents()->Stop();
|
||||
}
|
||||
|
||||
void WebContents::Reload() {
|
||||
void WebContents::Reload(const mate::Dictionary& options) {
|
||||
// Navigating to a URL would always restart the renderer process, we want this
|
||||
// because normal reloading will break our node integration.
|
||||
// This is done by AtomBrowserClient::ShouldSwapProcessesForNavigation.
|
||||
LoadURL(GetURL());
|
||||
LoadURL(GetURL(), options);
|
||||
}
|
||||
|
||||
void WebContents::ReloadIgnoringCache() {
|
||||
Reload();
|
||||
void WebContents::ReloadIgnoringCache(const mate::Dictionary& options) {
|
||||
Reload(options);
|
||||
}
|
||||
|
||||
bool WebContents::CanGoBack() const {
|
||||
|
|
|
@ -41,14 +41,14 @@ class WebContents : public mate::EventEmitter,
|
|||
|
||||
void Destroy();
|
||||
bool IsAlive() const;
|
||||
void LoadURL(const GURL& url);
|
||||
void LoadURL(const GURL& url, const mate::Dictionary& options);
|
||||
GURL GetURL() const;
|
||||
base::string16 GetTitle() const;
|
||||
bool IsLoading() const;
|
||||
bool IsWaitingForResponse() const;
|
||||
void Stop();
|
||||
void Reload();
|
||||
void ReloadIgnoringCache();
|
||||
void Reload(const mate::Dictionary& options);
|
||||
void ReloadIgnoringCache(const mate::Dictionary& options);
|
||||
bool CanGoBack() const;
|
||||
bool CanGoForward() const;
|
||||
bool CanGoToOffset(int offset) const;
|
||||
|
|
|
@ -11,6 +11,8 @@ BrowserWindow::__proto__ = EventEmitter.prototype
|
|||
BrowserWindow.windows = new IDWeakMap
|
||||
|
||||
BrowserWindow::_init = ->
|
||||
@urlOptions = {}
|
||||
|
||||
# Simulate the application menu on platforms other than OS X.
|
||||
if process.platform isnt 'darwin'
|
||||
menu = app.getApplicationMenu()
|
||||
|
@ -84,14 +86,23 @@ BrowserWindow.fromId = (id) ->
|
|||
BrowserWindow.windows.get id
|
||||
|
||||
# Helpers.
|
||||
BrowserWindow::loadUrl = -> @webContents.loadUrl.apply @webContents, arguments
|
||||
BrowserWindow::loadUrl = ->
|
||||
args = [].slice.call arguments
|
||||
unless args.length > 1
|
||||
args.push @urlOptions
|
||||
|
||||
#TODO: This needs fixing!
|
||||
@urlOptions = args[1]
|
||||
|
||||
@webContents.loadUrl.apply @webContents, args
|
||||
|
||||
BrowserWindow::send = -> @webContents.send.apply @webContents, arguments
|
||||
|
||||
# Be compatible with old API.
|
||||
BrowserWindow::restart = -> @webContents.reload()
|
||||
BrowserWindow::getUrl = -> @webContents.getUrl()
|
||||
BrowserWindow::reload = -> @webContents.reload()
|
||||
BrowserWindow::reloadIgnoringCache = -> @webContents.reloadIgnoringCache()
|
||||
BrowserWindow::reload = -> @webContents.reload(@urlOptions)
|
||||
BrowserWindow::reloadIgnoringCache = -> @webContents.reloadIgnoringCache(@urlOptions)
|
||||
BrowserWindow::getPageTitle = -> @webContents.getTitle()
|
||||
BrowserWindow::isLoading = -> @webContents.isLoading()
|
||||
BrowserWindow::isWaitingForResponse = -> @webContents.isWaitingForResponse()
|
||||
|
|
|
@ -47,7 +47,7 @@ createGuest = (embedder, params) ->
|
|||
max = width: params.maxwidth, height: params.maxheight
|
||||
@setAutoSize params.autosize, min, max
|
||||
if params.src
|
||||
@loadUrl params.src
|
||||
@loadUrl params.src, params.urlOptions
|
||||
if params.allowtransparency?
|
||||
@setAllowTransparency params.allowtransparency
|
||||
|
||||
|
|
|
@ -7,11 +7,11 @@ frameToGuest = {}
|
|||
createGuest = (embedder, url, frameName, options) ->
|
||||
guest = frameToGuest[frameName]
|
||||
if frameName and guest?
|
||||
guest.loadUrl url
|
||||
guest.loadUrl url {}
|
||||
return guest.id
|
||||
|
||||
guest = new BrowserWindow(options)
|
||||
guest.loadUrl url
|
||||
guest.loadUrl url {}
|
||||
|
||||
# When |embedder| is destroyed we should also destroy attached guest, and if
|
||||
# guest is closed by user then we should prevent |embedder| from double
|
||||
|
|
|
@ -94,6 +94,8 @@ class WebView
|
|||
# on* Event handlers.
|
||||
@on = {}
|
||||
|
||||
@urlOptions = {}
|
||||
|
||||
@browserPluginNode = @createBrowserPluginNode()
|
||||
shadowRoot = @webviewNode.createShadowRoot()
|
||||
@partition = new Partition()
|
||||
|
@ -197,6 +199,12 @@ class WebView
|
|||
# No setter.
|
||||
enumerable: true
|
||||
|
||||
@httpReferrer = @webviewNode.getAttribute 'httpReferrer'
|
||||
Object.defineProperty @webviewNode, 'httpReferrer',
|
||||
get: => @httpReferrer
|
||||
set: (value) => @webviewNode.setAttribute 'httpReferrer', value
|
||||
enumerable: true
|
||||
|
||||
# The purpose of this mutation observer is to catch assignment to the src
|
||||
# attribute without any changes to its value. This is useful in the case
|
||||
# where the webview guest has crashed and navigating to the same address
|
||||
|
@ -211,7 +219,7 @@ class WebView
|
|||
params =
|
||||
attributes: true,
|
||||
attributeOldValue: true,
|
||||
attributeFilter: ['src', 'partition']
|
||||
attributeFilter: ['src', 'partition', 'httpReferrer']
|
||||
@srcAndPartitionObserver.observe @webviewNode, params
|
||||
|
||||
# This observer monitors mutations to attributes of the <webview> and
|
||||
|
@ -245,6 +253,22 @@ class WebView
|
|||
return unless @guestInstanceId
|
||||
|
||||
guestViewInternal.setAllowTransparency @guestInstanceId, @allowtransparency
|
||||
else if name is 'httpReferrer'
|
||||
oldValue ?= ''
|
||||
newValue ?= ''
|
||||
|
||||
if newValue == '' and oldValue != ''
|
||||
@webviewNode.setAttribute 'httpReferrer', oldValue
|
||||
|
||||
@httpReferrer = newValue
|
||||
|
||||
result = {}
|
||||
# I think the right thing to do if you change your referrer is to reload
|
||||
# the src since I've bundled the referrer in with the parseSrcAttribute.
|
||||
# I think it makes sense to do that.
|
||||
@parseSrcAttribute result
|
||||
|
||||
throw result.error if result.error?
|
||||
else if name is 'src'
|
||||
# We treat null attribute (attribute removed) and the empty string as
|
||||
# one case.
|
||||
|
@ -363,8 +387,11 @@ class WebView
|
|||
@createGuest()
|
||||
return
|
||||
|
||||
if @httpReferrer
|
||||
@urlOptions = { "httpReferrer": @httpReferrer }
|
||||
|
||||
# Navigate to |this.src|.
|
||||
remote.getGuestWebContents(@guestInstanceId).loadUrl @src
|
||||
remote.getGuestWebContents(@guestInstanceId).loadUrl @src, @urlOptions
|
||||
|
||||
parseAttributes: ->
|
||||
return unless @elementAttached
|
||||
|
@ -447,6 +474,7 @@ class WebView
|
|||
# set via this.onAttach().
|
||||
storagePartitionId: @partition.toAttribute()
|
||||
userAgentOverride: @userAgentOverride
|
||||
urlOptions: @urlOptions
|
||||
|
||||
attachWindow: (guestInstanceId, isNewWindow) ->
|
||||
@guestInstanceId = guestInstanceId
|
||||
|
|
Loading…
Reference in a new issue