diff options
Diffstat (limited to 'toolkit/content')
| -rw-r--r-- | toolkit/content/license.html | 33 | ||||
| -rw-r--r-- | toolkit/content/widgets/browser.xml | 99 | ||||
| -rw-r--r-- | toolkit/content/widgets/findbar.xml | 5 | ||||
| -rw-r--r-- | toolkit/content/widgets/tabbox.xml | 22 |
4 files changed, 61 insertions, 98 deletions
diff --git a/toolkit/content/license.html b/toolkit/content/license.html index a348fdfa6..7221a8ae2 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -97,6 +97,7 @@ <li><a href="about:license#gears">Google Gears License</a></li> <li><a href="about:license#gears-istumbler">Google Gears/iStumbler License</a></li> <li><a href="about:license#vp8">Google VP8 License</a></li> + <li><a href="about:license#gsl">GSL License</a></li> <li><a href="about:license#gyp">gyp License</a></li> <li><a href="about:license#halloc">halloc License</a></li> <li><a href="about:license#harfbuzz">HarfBuzz License</a></li> @@ -3285,6 +3286,38 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hr> + <h1><a id="gsl"></a>GSL License</h1> + + <p>This license applies to <span class="path">mfbt/Span.h</span> and + <span class="path">mfbt/tests/gtest/TestSpan.cpp</span>.</p> + <!-- https://github.com/Microsoft/GSL/blob/3819df6e378ffccf0e29465afe99c3b324c2aa70/LICENSE --> +<pre> +Copyright (c) 2015 Microsoft Corporation. All rights reserved. + +This code is licensed under the MIT License (MIT). + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +</pre> + + + <hr> + <h1><a id="gyp"></a>gyp License</h1> <p>This license applies to certain files in the directory diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml index e595c847d..9c72e86d8 100644 --- a/toolkit/content/widgets/browser.xml +++ b/toolkit/content/widgets/browser.xml @@ -43,15 +43,11 @@ <parameter name="fn"/> <body> <![CDATA[ - if (!this.isRemoteBrowser) { - this.inLoadURI = true; - try { - fn(); - } finally { - this.inLoadURI = false; - } - } else { + this.inLoadURI = true; + try { fn(); + } finally { + this.inLoadURI = false; } ]]> </body> @@ -307,7 +303,7 @@ <method name="preserveLayers"> <parameter name="preserve"/> <body> - // Only useful for remote browsers. + <!-- Only useful for remote browsers. --> </body> </method> @@ -338,8 +334,9 @@ </getter> </property> + <!-- stubbed to false until all callers are removed --> <property name="isRemoteBrowser" - onget="return (this.getAttribute('remote') == 'true');" + onget="return false;" readonly="true"/> <property name="messageManager" @@ -389,10 +386,11 @@ <method name="getTabBrowser"> <body> <![CDATA[ - var tabBrowser = this.parentNode; - while (tabBrowser && tabBrowser.localName != "tabbrowser") - tabBrowser = tabBrowser.parentNode; - return tabBrowser; + for (let node = this.parentNode; node instanceof Element; node = node.parentNode) { + if (node.localName == "tabbrowser") + return node; + } + return null; ]]> </body> </method> @@ -898,6 +896,10 @@ <field name="mIconURL">null</field> + <property name="isAuthDOSProtected" + onget="return (this.getAttribute('authdosprotected') == 'true');" + readonly="true"/> + <!-- This is managed by the tabbrowser --> <field name="lastURI">null</field> @@ -915,7 +917,7 @@ os.addObserver(this, "browser:purge-session-history", true); // enable global history if we weren't told otherwise - if (!this.hasAttribute("disableglobalhistory") && !this.isRemoteBrowser) { + if (!this.hasAttribute("disableglobalhistory")) { try { this.docShell.useGlobalHistory = true; } catch (ex) { @@ -944,9 +946,7 @@ this.relatedBrowser = relatedBrowser; } - if (!this.isRemoteBrowser) { - this.addEventListener("pagehide", this.onPageHide, true); - } + this.addEventListener("pagehide", this.onPageHide, true); if (this.messageManager) { this.messageManager.addMessageListener("PopupBlocking:UpdateBlockedPopups", this); @@ -995,9 +995,7 @@ this.lastURI = null; - if (!this.isRemoteBrowser) { - this.removeEventListener("pagehide", this.onPageHide, true); - } + this.removeEventListener("pagehide", this.onPageHide, true); if (this._autoScrollNeedsCleanup) { // we polluted the global scope, so clean it up @@ -1283,9 +1281,6 @@ <parameter name="aOtherBrowser"/> <body> <![CDATA[ - if (this.isRemoteBrowser != aOtherBrowser.isRemoteBrowser) - throw new Error("Can only swap docshells between browsers in the same process."); - // Give others a chance to swap state. // IMPORTANT: Since a swapDocShells call does not swap the messageManager // instances attached to a browser to aOtherBrowser, others @@ -1319,28 +1314,6 @@ "_webNavigation" ]; - if (this.isRemoteBrowser) { - fieldsToSwap.push(...[ - "_remoteWebNavigation", - "_remoteWebNavigationImpl", - "_remoteWebProgressManager", - "_remoteWebProgress", - "_remoteFinder", - "_securityUI", - "_documentURI", - "_documentContentType", - "_contentTitle", - "_characterSet", - "_contentPrincipal", - "_imageDocument", - "_fullZoom", - "_textZoom", - "_isSyntheticDocument", - "_innerWindowID", - "_manifestURI", - ]); - } - var ourFieldValues = {}; var otherFieldValues = {}; for (let field of fieldsToSwap) { @@ -1363,27 +1336,10 @@ aOtherBrowser[field] = ourFieldValues[field]; } - if (!this.isRemoteBrowser) { - // Null the current nsITypeAheadFind instances so that they're - // lazily re-created on access. We need to do this because they - // might have attached the wrong docShell. - this._fastFind = aOtherBrowser._fastFind = null; - } - else { - // Rewire the remote listeners - this._remoteWebNavigationImpl.swapBrowser(this); - aOtherBrowser._remoteWebNavigationImpl.swapBrowser(aOtherBrowser); - - if (this._remoteWebProgressManager && aOtherBrowser._remoteWebProgressManager) { - this._remoteWebProgressManager.swapBrowser(this); - aOtherBrowser._remoteWebProgressManager.swapBrowser(aOtherBrowser); - } - - if (this._remoteFinder) - this._remoteFinder.swapBrowser(this); - if (aOtherBrowser._remoteFinder) - aOtherBrowser._remoteFinder.swapBrowser(aOtherBrowser); - } + // Null the current nsITypeAheadFind instances so that they're + // lazily re-created on access. We need to do this because they + // might have attached the wrong docShell. + this._fastFind = aOtherBrowser._fastFind = null; event = new CustomEvent("EndSwapDocShells", {"detail": aOtherBrowser}); this.dispatchEvent(event); @@ -1535,11 +1491,6 @@ event.preventDefault(); } - // No need to handle "dragover" in e10s, since nsDocShellTreeOwner.cpp in the child process - // handles that case using "@mozilla.org/content/dropped-link-handler;1" service. - if (this.isRemoteBrowser) - return; - let linkHandler = Components.classes["@mozilla.org/content/dropped-link-handler;1"]. getService(Components.interfaces.nsIDroppedLinkHandler); if (linkHandler.canDropLink(event, false)) @@ -1548,9 +1499,7 @@ </handler> <handler event="drop" group="system"> <![CDATA[ - // No need to handle "drop" in e10s, since nsDocShellTreeOwner.cpp in the child process - // handles that case using "@mozilla.org/content/dropped-link-handler;1" service. - if (!this.droppedLinkHandler || event.defaultPrevented || this.isRemoteBrowser) + if (!this.droppedLinkHandler || event.defaultPrevented) return; let name = { }; diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml index b92fb1d05..c312a6a25 100644 --- a/toolkit/content/widgets/findbar.xml +++ b/toolkit/content/widgets/findbar.xml @@ -282,6 +282,7 @@ return this._browser; ]]></getter> <setter><![CDATA[ + let prefsvc = this._prefsvc; if (this._browser) { if (this._browser.messageManager) { this._browser.messageManager.removeMessageListener("Findbar:Keypress", this); @@ -300,7 +301,9 @@ this._browser.messageManager.addMessageListener("Findbar:Mouseup", this); this._browser.finder.addResultListener(this); - this._findField.value = this._browser._lastSearchString; + if (prefsvc.getBoolPref("findbar.termPerTab") == true) { + this._findField.value = this._browser._lastSearchString; + } } return val; ]]></setter> diff --git a/toolkit/content/widgets/tabbox.xml b/toolkit/content/widgets/tabbox.xml index 02adb70b3..60c395c13 100644 --- a/toolkit/content/widgets/tabbox.xml +++ b/toolkit/content/widgets/tabbox.xml @@ -792,19 +792,6 @@ <field name="arrowKeysShouldWrap" readonly="true"> /Mac/.test(navigator.platform) </field> - <property name="TelemetryStopwatch" readonly="true"> - <getter><![CDATA[ - let module = {}; - Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", module); - Object.defineProperty(this, "TelemetryStopwatch", { - configurable: true, - enumerable: true, - writable: true, - value: module.TelemetryStopwatch - }); - return module.TelemetryStopwatch; - ]]></getter> - </property> </implementation> <handlers> @@ -814,11 +801,6 @@ return; if (this != this.parentNode.selectedItem) { // Not selected yet - let stopwatchid = this.parentNode.getAttribute("stopwatchid"); - if (stopwatchid) { - this.TelemetryStopwatch.start(stopwatchid); - } - // Call this before setting the 'ignorefocus' attribute because this // will pass on focus if the formerly selected tab was focused as well. this.parentNode._selectNewTab(this); @@ -836,10 +818,6 @@ this.setAttribute("ignorefocus", "true"); setTimeout(tab => tab.removeAttribute("ignorefocus"), 0, this); } - - if (stopwatchid) { - this.TelemetryStopwatch.finish(stopwatchid); - } } // Otherwise this tab is already selected and we will fall // through to mousedown behavior which sets focus on the current tab, |