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

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2013-12-23 05:48:03 +01:00
commit 959086d005
5 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/extensions/Makefile.in
View File

@ -48,4 +48,16 @@ libs:: $(DIST)/bin/metro/chrome/pdfjs.manifest
$(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \
$(DIST)/bin/metro/chrome
$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest 'manifest chrome/pdfjs.manifest')
ifdef NIGHTLY_BUILD
$(DIST)/bin/metro/chrome/shumway.manifest: $(GLOBAL_DEPS)
printf 'manifest shumway/chrome.manifest' > $@
libs:: $(DIST)/bin/metro/chrome/shumway.manifest
$(PYTHON) $(topsrcdir)/config/nsinstall.py \
$(srcdir)/shumway \
$(foreach exclude,$(exclude_files), -X $(srcdir)/shumway/$(exclude)) \
$(DIST)/bin/metro/chrome
$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest 'manifest chrome/shumway.manifest')
endif
endif

4
browser/installer/package-manifest.in
View File

@ -834,6 +834,10 @@ bin/libfreebl_32int64_3.so
@BINPATH@/metro/chrome/chrome.manifest
@BINPATH@/metro/chrome/@AB_CD@@JAREXT@
@BINPATH@/metro/chrome/@AB_CD@.manifest
#ifdef NIGHTLY_BUILD
@BINPATH@/metro/chrome/shumway.manifest
@BINPATH@/metro/chrome/shumway/*
#endif
@BINPATH@/metro/chrome/pdfjs.manifest
@BINPATH@/metro/chrome/pdfjs/*
@BINPATH@/metro/components

6
browser/metro/base/content/browser-scripts.js
View File

@ -40,6 +40,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "NewTabUtils",
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
"resource://gre/modules/commonjs/sdk/core/promise.js");
XPCOMUtils.defineLazyModuleGetter(this, "ShumwayUtils",
"resource://shumway/ShumwayUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PdfJs",
"resource://pdf.js/PdfJs.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Task",
"resource://gre/modules/Task.jsm");

4
browser/metro/base/content/browser-ui.js
View File

@ -115,6 +115,9 @@ var BrowserUI = {
SettingsCharm.init();
NavButtonSlider.init();
SelectionHelperUI.init();
#ifdef NIGHTLY_BUILD
ShumwayUtils.init();
#endif
// We can delay some initialization until after startup. We wait until
// the first page is shown, then dispatch a UIReadyDelayed event.
@ -151,6 +154,7 @@ var BrowserUI = {
DialogUI.init();
FormHelperUI.init();
FindHelperUI.init();
PdfJs.init();
} catch(ex) {
Util.dumpLn("Exception in delay load module:", ex.message);
}

6
browser/metro/profile/metro.js
View File

@ -546,12 +546,16 @@ pref("browser.chrome.toolbar_tips", false);
pref("pdfjs.disabled", true);
// Used by pdf.js to know the first time firefox is run with it installed so it
// can become the default pdf viewer.
pref("pdfjs.firstRun", false);
pref("pdfjs.firstRun", true);
// The values of preferredAction and alwaysAskBeforeHandling before pdf.js
// became the default.
pref("pdfjs.previousHandler.preferredAction", 0);
pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
#ifdef NIGHTLY_BUILD
pref("shumway.disabled", true);
#endif
// The maximum amount of decoded image data we'll willingly keep around (we
// might keep around more than this, but we'll try to get down to this value).
// (This is intentionally on the high side; see bug 746055.)