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 mozilla-central and fx-team

Browse Source
This commit is contained in:
Ed Morley 2013-10-29 16:40:05 +00:00
commit b0188b5d55
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/android/base/gfx/BitmapUtils.java
View File

@ -61,6 +61,11 @@ public final class BitmapUtils {
return GeckoJarReader.getBitmapDrawable(context.getResources(), data); return GeckoJarReader.getBitmapDrawable(context.getResources(), data);
} }
// Don't attempt to validate the JAR signature when loading an add-on icon
if (data.startsWith("jar:file")) {
return GeckoJarReader.getBitmapDrawable(context.getResources(), Uri.decode(data));
}
URL url = new URL(data); URL url = new URL(data);
InputStream is = (InputStream) url.getContent(); InputStream is = (InputStream) url.getContent();
try { try {

4
mobile/android/base/home/BrowserSearch.java
View File

@ -877,13 +877,13 @@ public class BrowserSearch extends HomeFragment
} }
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
// Dismiss the soft keyboard. // Dismiss the soft keyboard.
requestFocus(); requestFocus();
} }
return super.onInterceptTouchEvent(event); return super.onTouchEvent(event);
} }
} }
} }

10
toolkit/mozapps/update/tests/unit_aus_update/downloadResumeForSameAppVersion.js
View File

@ -30,7 +30,15 @@ function run_test() {
} }
do_check_eq(gUpdateManager.activeUpdate.state, STATE_DOWNLOADING); do_check_eq(gUpdateManager.activeUpdate.state, STATE_DOWNLOADING);
do_test_finished(); // Pause the download and reload the Update Manager with an empty update so
// the Application Update Service doesn't write the update xml files during
// xpcom-shutdown which will leave behind the test directory.
gAUS.pauseDownload();
writeUpdatesToXMLFile(getLocalUpdatesXMLString(""), true);
writeUpdatesToXMLFile(getLocalUpdatesXMLString(""), false);
reloadUpdateManagerData();
do_timeout(TEST_CHECK_TIMEOUT, do_test_finished);
} }
function end_test() { function end_test() {