Remove extra newlines around comments
This commit is contained in:
Kevin Sawicki
parent
990dc30e8d
commit
030d2a843c
40 changed files with 103 additions and 425 deletions
|
|
@ -10,9 +10,7 @@ webViewConstants = require('./web-view-constants');
|
|||
|
||||
remote = require('electron').remote;
|
||||
|
||||
|
||||
// Helper function to resolve url set in attribute.
|
||||
|
||||
a = document.createElement('a');
|
||||
|
||||
resolveURL = function(url) {
|
||||
|
|
@ -20,12 +18,8 @@ resolveURL = function(url) {
|
|||
return a.href;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Attribute objects.
|
||||
Default implementation of a WebView attribute.
|
||||
*/
|
||||
|
||||
// Attribute objects.
|
||||
// Default implementation of a WebView attribute.
|
||||
WebViewAttribute = (function() {
|
||||
function WebViewAttribute(name, webViewImpl) {
|
||||
this.name = name;
|
||||
|
|
@ -35,32 +29,24 @@ WebViewAttribute = (function() {
|
|||
this.defineProperty();
|
||||
}
|
||||
|
||||
|
||||
// Retrieves and returns the attribute's value.
|
||||
|
||||
WebViewAttribute.prototype.getValue = function() {
|
||||
return this.webViewImpl.webviewNode.getAttribute(this.name) || this.value;
|
||||
};
|
||||
|
||||
|
||||
// Sets the attribute's value.
|
||||
|
||||
WebViewAttribute.prototype.setValue = function(value) {
|
||||
return this.webViewImpl.webviewNode.setAttribute(this.name, value || '');
|
||||
};
|
||||
|
||||
|
||||
// Changes the attribute's value without triggering its mutation handler.
|
||||
|
||||
WebViewAttribute.prototype.setValueIgnoreMutation = function(value) {
|
||||
this.ignoreMutation = true;
|
||||
this.setValue(value);
|
||||
return this.ignoreMutation = false;
|
||||
};
|
||||
|
||||
|
||||
// Defines this attribute as a property on the webview node.
|
||||
|
||||
WebViewAttribute.prototype.defineProperty = function() {
|
||||
return Object.defineProperty(this.webViewImpl.webviewNode, this.name, {
|
||||
get: (function(_this) {
|
||||
|
|
@ -77,18 +63,14 @@ WebViewAttribute = (function() {
|
|||
});
|
||||
};
|
||||
|
||||
|
||||
// Called when the attribute's value changes.
|
||||
|
||||
WebViewAttribute.prototype.handleMutation = function() {};
|
||||
|
||||
return WebViewAttribute;
|
||||
|
||||
})();
|
||||
|
||||
|
||||
// An attribute that is treated as a Boolean.
|
||||
|
||||
BooleanAttribute = (function(superClass) {
|
||||
extend(BooleanAttribute, superClass);
|
||||
|
||||
|
|
@ -112,9 +94,7 @@ BooleanAttribute = (function(superClass) {
|
|||
|
||||
})(WebViewAttribute);
|
||||
|
||||
|
||||
// Attribute that specifies whether transparency is allowed in the webview.
|
||||
|
||||
AllowTransparencyAttribute = (function(superClass) {
|
||||
extend(AllowTransparencyAttribute, superClass);
|
||||
|
||||
|
|
@ -133,9 +113,7 @@ AllowTransparencyAttribute = (function(superClass) {
|
|||
|
||||
})(BooleanAttribute);
|
||||
|
||||
|
||||
// Attribute used to define the demension limits of autosizing.
|
||||
|
||||
AutosizeDimensionAttribute = (function(superClass) {
|
||||
extend(AutosizeDimensionAttribute, superClass);
|
||||
|
||||
|
|
@ -168,9 +146,7 @@ AutosizeDimensionAttribute = (function(superClass) {
|
|||
|
||||
})(WebViewAttribute);
|
||||
|
||||
|
||||
// Attribute that specifies whether the webview should be autosized.
|
||||
|
||||
AutosizeAttribute = (function(superClass) {
|
||||
extend(AutosizeAttribute, superClass);
|
||||
|
||||
|
|
@ -184,9 +160,7 @@ AutosizeAttribute = (function(superClass) {
|
|||
|
||||
})(BooleanAttribute);
|
||||
|
||||
|
||||
// Attribute representing the state of the storage partition.
|
||||
|
||||
PartitionAttribute = (function(superClass) {
|
||||
extend(PartitionAttribute, superClass);
|
||||
|
||||
|
|
@ -214,9 +188,7 @@ PartitionAttribute = (function(superClass) {
|
|||
|
||||
})(WebViewAttribute);
|
||||
|
||||
|
||||
// Attribute that handles the location and navigation of the webview.
|
||||
|
||||
SrcAttribute = (function(superClass) {
|
||||
extend(SrcAttribute, superClass);
|
||||
|
||||
|
|
@ -236,29 +208,23 @@ SrcAttribute = (function(superClass) {
|
|||
SrcAttribute.prototype.setValueIgnoreMutation = function(value) {
|
||||
WebViewAttribute.prototype.setValueIgnoreMutation.call(this, value);
|
||||
|
||||
/*
|
||||
takeRecords() is needed to clear queued up src mutations. Without it, it
|
||||
is possible for this change to get picked up asyncronously by src's
|
||||
mutation observer |observer|, and then get handled even though we do not
|
||||
want to handle this mutation.
|
||||
*/
|
||||
// takeRecords() is needed to clear queued up src mutations. Without it, it
|
||||
// is possible for this change to get picked up asyncronously by src's
|
||||
// mutation observer |observer|, and then get handled even though we do not
|
||||
// want to handle this mutation.
|
||||
return this.observer.takeRecords();
|
||||
};
|
||||
|
||||
SrcAttribute.prototype.handleMutation = function(oldValue, newValue) {
|
||||
|
||||
/*
|
||||
Once we have navigated, we don't allow clearing the src attribute.
|
||||
Once <webview> enters a navigated state, it cannot return to a
|
||||
placeholder state.
|
||||
*/
|
||||
// Once we have navigated, we don't allow clearing the src attribute.
|
||||
// Once <webview> enters a navigated state, it cannot return to a
|
||||
// placeholder state.
|
||||
if (!newValue && oldValue) {
|
||||
|
||||
/*
|
||||
src attribute changes normally initiate a navigation. We suppress
|
||||
the next src attribute handler call to avoid reloading the page
|
||||
on every guest-initiated navigation.
|
||||
*/
|
||||
// src attribute changes normally initiate a navigation. We suppress
|
||||
// the next src attribute handler call to avoid reloading the page
|
||||
// on every guest-initiated navigation.
|
||||
this.setValueIgnoreMutation(oldValue);
|
||||
return;
|
||||
}
|
||||
|
|
@ -266,13 +232,10 @@ SrcAttribute = (function(superClass) {
|
|||
};
|
||||
|
||||
|
||||
/*
|
||||
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
|
||||
spawns off a new process.
|
||||
*/
|
||||
|
||||
// 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
|
||||
// spawns off a new process.
|
||||
SrcAttribute.prototype.setupMutationObserver = function() {
|
||||
var params;
|
||||
this.observer = new MutationObserver((function(_this) {
|
||||
|
|
@ -328,9 +291,7 @@ SrcAttribute = (function(superClass) {
|
|||
|
||||
})(WebViewAttribute);
|
||||
|
||||
|
||||
// Attribute specifies HTTP referrer.
|
||||
|
||||
HttpReferrerAttribute = (function(superClass) {
|
||||
extend(HttpReferrerAttribute, superClass);
|
||||
|
||||
|
|
@ -342,9 +303,7 @@ HttpReferrerAttribute = (function(superClass) {
|
|||
|
||||
})(WebViewAttribute);
|
||||
|
||||
|
||||
// Attribute specifies user agent
|
||||
|
||||
UserAgentAttribute = (function(superClass) {
|
||||
extend(UserAgentAttribute, superClass);
|
||||
|
||||
|
|
@ -356,9 +315,7 @@ UserAgentAttribute = (function(superClass) {
|
|||
|
||||
})(WebViewAttribute);
|
||||
|
||||
|
||||
// Attribute that set preload script.
|
||||
|
||||
PreloadAttribute = (function(superClass) {
|
||||
extend(PreloadAttribute, superClass);
|
||||
|
||||
|
|
@ -384,9 +341,7 @@ PreloadAttribute = (function(superClass) {
|
|||
|
||||
})(WebViewAttribute);
|
||||
|
||||
|
||||
// Sets up all of the webview attributes.
|
||||
|
||||
WebViewImpl.prototype.setupWebViewAttributes = function() {
|
||||
var attribute, autosizeAttributes, i, len, results;
|
||||
this.attributes = {};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
module.exports = {
|
||||
|
||||
// Attributes.
|
||||
ATTRIBUTE_ALLOWTRANSPARENCY: 'allowtransparency',
|
||||
ATTRIBUTE_AUTOSIZE: 'autosize',
|
||||
|
|
|
|||
|
|
@ -12,18 +12,14 @@ guestViewInternal = require('./guest-view-internal');
|
|||
|
||||
webViewConstants = require('./web-view-constants');
|
||||
|
||||
|
||||
// ID generator.
|
||||
|
||||
nextId = 0;
|
||||
|
||||
getNextId = function() {
|
||||
return ++nextId;
|
||||
};
|
||||
|
||||
|
||||
// Represents the internal state of the WebView node.
|
||||
|
||||
WebViewImpl = (function() {
|
||||
function WebViewImpl(webviewNode) {
|
||||
var shadowRoot;
|
||||
|
|
@ -50,32 +46,25 @@ WebViewImpl = (function() {
|
|||
}
|
||||
|
||||
WebViewImpl.prototype.createBrowserPluginNode = function() {
|
||||
|
||||
/*
|
||||
We create BrowserPlugin as a custom element in order to observe changes
|
||||
to attributes synchronously.
|
||||
*/
|
||||
// We create BrowserPlugin as a custom element in order to observe changes
|
||||
// to attributes synchronously.
|
||||
var browserPluginNode;
|
||||
browserPluginNode = new WebViewImpl.BrowserPlugin();
|
||||
v8Util.setHiddenValue(browserPluginNode, 'internal', this);
|
||||
return browserPluginNode;
|
||||
};
|
||||
|
||||
|
||||
// Resets some state upon reattaching <webview> element to the DOM.
|
||||
|
||||
WebViewImpl.prototype.reset = function() {
|
||||
// Unlisten the zoom-level-changed event.
|
||||
webFrame.removeListener('zoom-level-changed', this.onZoomLevelChanged);
|
||||
|
||||
/*
|
||||
If guestInstanceId is defined then the <webview> has navigated and has
|
||||
already picked up a partition ID. Thus, we need to reset the initialization
|
||||
state. However, it may be the case that beforeFirstNavigation is false BUT
|
||||
guestInstanceId has yet to be initialized. This means that we have not
|
||||
heard back from createGuest yet. We will not reset the flag in this case so
|
||||
that we don't end up allocating a second guest.
|
||||
*/
|
||||
// If guestInstanceId is defined then the <webview> has navigated and has
|
||||
// already picked up a partition ID. Thus, we need to reset the initialization
|
||||
// state. However, it may be the case that beforeFirstNavigation is false BUT
|
||||
// guestInstanceId has yet to be initialized. This means that we have not
|
||||
// heard back from createGuest yet. We will not reset the flag in this case so
|
||||
// that we don't end up allocating a second guest.
|
||||
if (this.guestInstanceId) {
|
||||
guestViewInternal.destroyGuest(this.guestInstanceId);
|
||||
this.webContents = null;
|
||||
|
|
@ -86,9 +75,7 @@ WebViewImpl = (function() {
|
|||
return this.internalInstanceId = 0;
|
||||
};
|
||||
|
||||
|
||||
// Sets the <webview>.request property.
|
||||
|
||||
WebViewImpl.prototype.setRequestPropertyOnWebViewNode = function(request) {
|
||||
return Object.defineProperty(this.webviewNode, 'request', {
|
||||
value: request,
|
||||
|
|
@ -99,12 +86,10 @@ WebViewImpl = (function() {
|
|||
WebViewImpl.prototype.setupFocusPropagation = function() {
|
||||
if (!this.webviewNode.hasAttribute('tabIndex')) {
|
||||
|
||||
/*
|
||||
<webview> needs a tabIndex in order to be focusable.
|
||||
TODO(fsamuel): It would be nice to avoid exposing a tabIndex attribute
|
||||
to allow <webview> to be focusable.
|
||||
See http://crbug.com/231664.
|
||||
*/
|
||||
// <webview> needs a tabIndex in order to be focusable.
|
||||
// TODO(fsamuel): It would be nice to avoid exposing a tabIndex attribute
|
||||
// to allow <webview> to be focusable.
|
||||
// See http://crbug.com/231664.
|
||||
this.webviewNode.setAttribute('tabIndex', -1);
|
||||
}
|
||||
this.webviewNode.addEventListener('focus', (function(_this) {
|
||||
|
|
@ -124,14 +109,11 @@ WebViewImpl = (function() {
|
|||
};
|
||||
|
||||
|
||||
/*
|
||||
This observer monitors mutations to attributes of the <webview> and
|
||||
updates the BrowserPlugin properties accordingly. In turn, updating
|
||||
a BrowserPlugin property will update the corresponding BrowserPlugin
|
||||
attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
|
||||
details.
|
||||
*/
|
||||
|
||||
// This observer monitors mutations to attributes of the <webview> and
|
||||
// updates the BrowserPlugin properties accordingly. In turn, updating
|
||||
// a BrowserPlugin property will update the corresponding BrowserPlugin
|
||||
// attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
|
||||
// details.
|
||||
WebViewImpl.prototype.handleWebviewAttributeMutation = function(attributeName, oldValue, newValue) {
|
||||
if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
|
||||
return;
|
||||
|
|
@ -164,7 +146,6 @@ WebViewImpl = (function() {
|
|||
height = node.offsetHeight;
|
||||
|
||||
// Check the current bounds to make sure we do not resize <webview>
|
||||
|
||||
// outside of current constraints.
|
||||
maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width;
|
||||
maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width;
|
||||
|
|
@ -176,16 +157,13 @@ WebViewImpl = (function() {
|
|||
node.style.width = newWidth + 'px';
|
||||
node.style.height = newHeight + 'px';
|
||||
|
||||
/*
|
||||
Only fire the DOM event if the size of the <webview> has actually
|
||||
changed.
|
||||
*/
|
||||
// Only fire the DOM event if the size of the <webview> has actually
|
||||
// changed.
|
||||
return this.dispatchEvent(webViewEvent);
|
||||
}
|
||||
};
|
||||
|
||||
WebViewImpl.prototype.onElementResize = function(newSize) {
|
||||
|
||||
// Dispatch the 'resize' event.
|
||||
var resizeEvent;
|
||||
resizeEvent = new Event('resize', {
|
||||
|
|
@ -213,12 +191,8 @@ WebViewImpl = (function() {
|
|||
return this.webviewNode.dispatchEvent(webViewEvent);
|
||||
};
|
||||
|
||||
|
||||
// Adds an 'on<event>' property on the webview, which can be used to set/unset
|
||||
|
||||
|
||||
// an event handler.
|
||||
|
||||
WebViewImpl.prototype.setupEventProperty = function(eventName) {
|
||||
var propertyName;
|
||||
propertyName = 'on' + eventName.toLowerCase();
|
||||
|
|
@ -243,20 +217,16 @@ WebViewImpl = (function() {
|
|||
});
|
||||
};
|
||||
|
||||
|
||||
// Updates state upon loadcommit.
|
||||
|
||||
WebViewImpl.prototype.onLoadCommit = function(webViewEvent) {
|
||||
var newValue, oldValue;
|
||||
oldValue = this.webviewNode.getAttribute(webViewConstants.ATTRIBUTE_SRC);
|
||||
newValue = webViewEvent.url;
|
||||
if (webViewEvent.isMainFrame && (oldValue !== newValue)) {
|
||||
|
||||
/*
|
||||
Touching the src attribute triggers a navigation. To avoid
|
||||
triggering a page reload on every guest-initiated navigation,
|
||||
we do not handle this mutation.
|
||||
*/
|
||||
// Touching the src attribute triggers a navigation. To avoid
|
||||
// triggering a page reload on every guest-initiated navigation,
|
||||
// we do not handle this mutation.
|
||||
return this.attributes[webViewConstants.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue);
|
||||
}
|
||||
};
|
||||
|
|
@ -278,13 +248,11 @@ WebViewImpl = (function() {
|
|||
params[attributeName] = attribute.getValue();
|
||||
}
|
||||
|
||||
/*
|
||||
When the WebView is not participating in layout (display:none)
|
||||
then getBoundingClientRect() would report a width and height of 0.
|
||||
However, in the case where the WebView has a fixed size we can
|
||||
use that value to initially size the guest so as to avoid a relayout of
|
||||
the on display:block.
|
||||
*/
|
||||
// When the WebView is not participating in layout (display:none)
|
||||
// then getBoundingClientRect() would report a width and height of 0.
|
||||
// However, in the case where the WebView has a fixed size we can
|
||||
// use that value to initially size the guest so as to avoid a relayout of
|
||||
// the on display:block.
|
||||
css = window.getComputedStyle(this.webviewNode, null);
|
||||
elementRect = this.webviewNode.getBoundingClientRect();
|
||||
params.elementWidth = parseInt(elementRect.width) || parseInt(css.getPropertyValue('width'));
|
||||
|
|
@ -305,9 +273,7 @@ WebViewImpl = (function() {
|
|||
|
||||
})();
|
||||
|
||||
|
||||
// Registers browser plugin <object> custom element.
|
||||
|
||||
registerBrowserPluginElement = function() {
|
||||
var proto;
|
||||
proto = Object.create(HTMLObjectElement.prototype);
|
||||
|
|
@ -329,7 +295,6 @@ registerBrowserPluginElement = function() {
|
|||
return internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue);
|
||||
};
|
||||
proto.attachedCallback = function() {
|
||||
|
||||
// Load the plugin immediately.
|
||||
var unused;
|
||||
return unused = this.nonExistentAttribute;
|
||||
|
|
@ -344,9 +309,7 @@ registerBrowserPluginElement = function() {
|
|||
return delete proto.attributeChangedCallback;
|
||||
};
|
||||
|
||||
|
||||
// Registers <webview> custom element.
|
||||
|
||||
registerWebViewElement = function() {
|
||||
var createBlockHandler, createNonBlockHandler, i, j, len, len1, m, methods, nonblockMethods, proto;
|
||||
proto = Object.create(HTMLObjectElement.prototype);
|
||||
|
|
@ -385,7 +348,51 @@ registerWebViewElement = function() {
|
|||
};
|
||||
|
||||
// Public-facing API methods.
|
||||
methods = ['getURL', 'getTitle', 'isLoading', 'isWaitingForResponse', 'stop', 'reload', 'reloadIgnoringCache', 'canGoBack', 'canGoForward', 'canGoToOffset', 'clearHistory', 'goBack', 'goForward', 'goToIndex', 'goToOffset', 'isCrashed', 'setUserAgent', 'getUserAgent', 'openDevTools', 'closeDevTools', 'isDevToolsOpened', 'isDevToolsFocused', 'inspectElement', 'setAudioMuted', 'isAudioMuted', 'undo', 'redo', 'cut', 'copy', 'paste', 'pasteAndMatchStyle', 'delete', 'selectAll', 'unselect', 'replace', 'replaceMisspelling', 'findInPage', 'stopFindInPage', 'getId', 'downloadURL', 'inspectServiceWorker', 'print', 'printToPDF'];
|
||||
methods = [
|
||||
'getURL',
|
||||
'getTitle',
|
||||
'isLoading',
|
||||
'isWaitingForResponse',
|
||||
'stop',
|
||||
'reload',
|
||||
'reloadIgnoringCache',
|
||||
'canGoBack',
|
||||
'canGoForward',
|
||||
'canGoToOffset',
|
||||
'clearHistory',
|
||||
'goBack',
|
||||
'goForward',
|
||||
'goToIndex',
|
||||
'goToOffset',
|
||||
'isCrashed',
|
||||
'setUserAgent',
|
||||
'getUserAgent',
|
||||
'openDevTools',
|
||||
'closeDevTools',
|
||||
'isDevToolsOpened',
|
||||
'isDevToolsFocused',
|
||||
'inspectElement',
|
||||
'setAudioMuted',
|
||||
'isAudioMuted',
|
||||
'undo',
|
||||
'redo',
|
||||
'cut',
|
||||
'copy',
|
||||
'paste',
|
||||
'pasteAndMatchStyle',
|
||||
'delete',
|
||||
'selectAll',
|
||||
'unselect',
|
||||
'replace',
|
||||
'replaceMisspelling',
|
||||
'findInPage',
|
||||
'stopFindInPage',
|
||||
'getId',
|
||||
'downloadURL',
|
||||
'inspectServiceWorker',
|
||||
'print',
|
||||
'printToPDF'
|
||||
];
|
||||
nonblockMethods = [
|
||||
'executeJavaScript',
|
||||
'insertCSS',
|
||||
|
|
@ -429,10 +436,8 @@ registerWebViewElement = function() {
|
|||
prototype: proto
|
||||
});
|
||||
|
||||
/*
|
||||
Delete the callbacks so developers cannot call them and produce unexpected
|
||||
behavior.
|
||||
*/
|
||||
// Delete the callbacks so developers cannot call them and produce unexpected
|
||||
// behavior.
|
||||
delete proto.createdCallback;
|
||||
delete proto.attachedCallback;
|
||||
delete proto.detachedCallback;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue