wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge fx-team to mozilla-central a=merge

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-11-17 14:10:08 +01:00
commit d9f867b42d
7 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
browser/base/content/browser.js
View File

@ -841,9 +841,9 @@ function _loadURIWithFlags(browser, uri, flags, referrer, charset, postdata) {
browser.userTypedClear++;
}
let shouldBeRemote = gMultiProcessBrowser &&
E10SUtils.shouldBrowserBeRemote(uri);
try {
let shouldBeRemote = gMultiProcessBrowser &&
E10SUtils.shouldBrowserBeRemote(uri);
if (browser.isRemoteBrowser == shouldBeRemote) {
browser.webNavigation.loadURI(uri, flags, referrer, postdata, null);
} else {
@ -853,6 +853,13 @@ function _loadURIWithFlags(browser, uri, flags, referrer, charset, postdata) {
referrer: referrer ? referrer.spec : null,
});
}
} catch (e) {
// If anything goes wrong just switch remoteness manually and load the URI.
// We might lose history that way but at least the browser loaded a page.
// This might be necessary if SessionStore wasn't initialized yet i.e.
// when the homepage is a non-remote page.
gBrowser.updateBrowserRemoteness(browser, shouldBeRemote);
browser.webNavigation.loadURI(uri, flags, referrer, postdata, null);
} finally {
if (browser.userTypedClear) {
browser.userTypedClear--;

2
browser/components/preferences/in-content/privacy.xul
View File

@ -241,7 +241,7 @@
data-category="panePrivacy"
hidden="true">
<caption><label>&locationBar.label;</label></caption>
<label id="locationBarSuggestionLabel">&locbar.pre.label;</label>
<label id="locationBarSuggestionLabel">&locbar.suggest.label;</label>
<checkbox id="historySuggestion" label="&locbar.history.label;"
onsyncfrompreference="return gPrivacyPane.writeSuggestionPref();"
accesskey="&locbar.history.accesskey;"

2
browser/components/preferences/privacy.xul
View File

@ -259,7 +259,7 @@
<groupbox id="locationBarGroup">
<caption label="&locationBar.label;"/>
<label id="locationBarSuggestionLabel">&locbar.pre.label;</label>
<label id="locationBarSuggestionLabel">&locbar.suggest.label;</label>
<vbox id="tabPrefsBox" align="start" flex="1">
<checkbox id="historySuggestion" label="&locbar.history.label;"

18
browser/devtools/profiler/utils/tree-model.js
View File

@ -82,8 +82,7 @@ ThreadNode.prototype = {
* Specifies if the call tree should be inverted (youngest -> oldest
* frames).
*/
insert: function(sample, contentOnly = false, beginAt = 0, endAt = Infinity,
inverted = false) {
insert: function(sample, contentOnly = false, beginAt = 0, endAt = Infinity, inverted = false) {
let sampleTime = sample.time;
if (!sampleTime || sampleTime < beginAt || sampleTime > endAt) {
return;
@ -94,31 +93,26 @@ ThreadNode.prototype = {
// Filter out platform frames if only content-related function calls
// should be taken into consideration.
if (contentOnly) {
// The (root) node is not considered a content function, it'll be removed.
sampleFrames = sampleFrames.filter(isContent);
} else {
// Remove the (root) node manually.
sampleFrames = sampleFrames.slice(1);
}
if (!sampleFrames.length) {
return;
}
if (inverted) {
sampleFrames.reverse();
if (!contentOnly) {
// Remove the (root) node -- we don't want it as a leaf in the inverted
// tree.
sampleFrames.pop();
}
}
let startIndex = (inverted || contentOnly) ? 0 : 1;
let sampleDuration = sampleTime - this._previousSampleTime;
this._previousSampleTime = sampleTime;
this.samples++;
this.duration += sampleDuration;
FrameNode.prototype.insert(
sampleFrames, startIndex, sampleTime, sampleDuration, this.calls);
sampleFrames, 0, sampleTime, sampleDuration, this.calls);
},
/**

2
browser/locales/en-US/chrome/browser/preferences/privacy.dtd
View File

@ -15,7 +15,7 @@
<!ENTITY locationBar.label "Location Bar">
<!ENTITY locbar.pre.label "When using the location bar, suggest:">
<!ENTITY locbar.suggest.label "When using the location bar, suggest:">
<!ENTITY locbar.history.label "History">
<!ENTITY locbar.history.accesskey "i">
<!ENTITY locbar.bookmarks.label "Bookmarks">

2
browser/themes/shared/browser.inc
View File

@ -2,7 +2,7 @@
% Note that zoom-reset-button is a bit different since it doesn't use an image and thus has the image with display: none.
%define nestedButtons #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button
%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #web-apps-button, #webide-button
%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button
%ifdef XP_MACOSX
% Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button to exit fullscreen

9
mobile/android/base/StartPane.java
View File

@ -2,6 +2,7 @@ package org.mozilla.gecko;
import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
@ -55,11 +56,19 @@ public class StartPane extends DialogFragment {
return view;
}
@Override
public void onCancel(DialogInterface dialog) {
// StartPane is closed by touching outside the dialog.
Telemetry.sendUIEvent(TelemetryContract.Event.CANCEL, TelemetryContract.Method.DIALOG, "firstrun-pane");
super.onCancel(dialog);
}
// Add handler for dismissing the StartPane on a single click.
private void addDismissHandler(View view) {
final GestureDetector gestureDetector = new GestureDetector(getActivity(), new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onSingleTapUp(MotionEvent e) {
Telemetry.sendUIEvent(TelemetryContract.Event.CANCEL, TelemetryContract.Method.DIALOG, "firstrun-pane");
StartPane.this.dismiss();
return true;
}