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

Back out bug 925796 and bug 923596 for breaking Metro on a CLOSED TREE

Browse Source
This commit is contained in:
Matt Brubeck 2013-10-17 15:23:36 -07:00
parent 3995839028
commit 1d776c1b15
5 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/extensions/Makefile.in
View File

@ -36,16 +36,10 @@ ifdef MOZ_METRO
$(DIST)/bin/metro/chrome/pdfjs.manifest: $(GLOBAL_DEPS)
printf "manifest pdfjs/chrome.manifest" > $@
$(DIST)/bin/metro/chrome/shumway.manifest: $(GLOBAL_DEPS)
printf "manifest shumway/chrome.manifest" > $@
libs:: $(DIST)/bin/metro/chrome/pdfjs.manifest $(DIST)/bin/metro/chrome/shumway.manifest
libs:: $(DIST)/bin/metro/chrome/pdfjs.manifest
$(PYTHON) $(topsrcdir)/config/nsinstall.py \
$(srcdir)/pdfjs \
$(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \
$(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/pdfjs.manifest")
$(call py_action,buildlist,$(DIST)/bin/metro/chrome.manifest "manifest chrome/shumway.manifest")
endif

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

@ -37,9 +37,6 @@ 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, "Task",
"resource://gre/modules/Task.jsm");

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

@ -112,7 +112,6 @@ var BrowserUI = {
NewTabUtils.init();
SettingsCharm.init();
NavButtonSlider.init();
ShumwayUtils.init();
// We can delay some initialization until after startup. We wait until
// the first page is shown, then dispatch a UIReadyDelayed event.

4
browser/metro/locales/import/Makefile.in
View File

@ -30,11 +30,9 @@ libs::
# Bookmarks
# Pick up desktop's bookmarks.inc file
ifdef LOCALE_MERGEDIR
vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile
endif
vpath book%.inc $(LOCALE_SRCDIR)/profile
ifdef LOCALE_MERGEDIR
vpath book%.inc $(LOCALE_SRCDIR)/profile
vpath book%.inc @top_srcdir@/$(relativesrcdir)/en-US/profile
endif

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

@ -576,8 +576,6 @@ pref("pdfjs.firstRun", false);
pref("pdfjs.previousHandler.preferredAction", 0);
pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
pref("shumway.disabled", true);
// 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.)