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-06-18 14:35:09 +02:00
commit 6e7d863249
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/base/content/newtab/search.js
View File

@ -158,7 +158,10 @@ let gSearch = {
let image = document.createElementNS(XUL_NAMESPACE, "image");
if (engine.iconBuffer) {
let blob = new Blob([engine.iconBuffer]);
image.setAttribute("src", URL.createObjectURL(blob));
let size = Math.round(16 * window.devicePixelRatio);
let sizeStr = size + "," + size;
let uri = URL.createObjectURL(blob) + "#-moz-resolution=" + sizeStr;
image.setAttribute("src", uri);
}
box.appendChild(image);

2
services/fxaccounts/FxAccounts.jsm
View File

@ -203,7 +203,7 @@ AccountState.prototype = {
if (!this.isCurrent) {
log.info("An accountState promise was rejected, but we are ignoring that" +
"reason and rejecting it due to a different user being signed in." +
"Originally rejected with: " + reason);
"Originally rejected with: " + error);
return Promise.reject(new Error("A different user signed in"));
}
return Promise.reject(error);