diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /mobile/android/geckoview/src/androidTest/assets | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mobile/android/geckoview/src/androidTest/assets')
| -rw-r--r-- | mobile/android/geckoview/src/androidTest/assets/web_extensions/langpack_signed.xpi | bin | 4452 -> 7593 bytes | |||
| -rw-r--r-- | mobile/android/geckoview/src/androidTest/assets/web_extensions/options_page_alias/manifest.json | 12 | ||||
| -rw-r--r-- | mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html | 2 | ||||
| -rw-r--r-- | mobile/android/geckoview/src/androidTest/assets/www/ogg.html | 11 | ||||
| -rw-r--r-- | mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg | bin | 285310 -> 0 bytes |
5 files changed, 13 insertions, 12 deletions
diff --git a/mobile/android/geckoview/src/androidTest/assets/web_extensions/langpack_signed.xpi b/mobile/android/geckoview/src/androidTest/assets/web_extensions/langpack_signed.xpi Binary files differindex f60d00348e..ab7db3926e 100644 --- a/mobile/android/geckoview/src/androidTest/assets/web_extensions/langpack_signed.xpi +++ b/mobile/android/geckoview/src/androidTest/assets/web_extensions/langpack_signed.xpi diff --git a/mobile/android/geckoview/src/androidTest/assets/web_extensions/options_page_alias/manifest.json b/mobile/android/geckoview/src/androidTest/assets/web_extensions/options_page_alias/manifest.json new file mode 100644 index 0000000000..3e7b0c1f4c --- /dev/null +++ b/mobile/android/geckoview/src/androidTest/assets/web_extensions/options_page_alias/manifest.json @@ -0,0 +1,12 @@ +{ + "manifest_version": 2, + "name": "options_page_alias", + "version": "1.0", + "description": "A test add-on using options_page instead of options_ui.page", + "browser_specific_settings": { + "gecko": { + "id": "options_page_alias@tests.mozilla.org" + } + }, + "options_page": "dummy.html" +} diff --git a/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html b/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html index d9b34843fd..2b3300ba5c 100644 --- a/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html +++ b/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html @@ -5,7 +5,7 @@ </head> <body> <video controls preload> - <source src="videos/fileDoesNotExist.ogg"></source> + <source src="videos/fileDoesNotExist.webm"></source> </video> </body> </html> diff --git a/mobile/android/geckoview/src/androidTest/assets/www/ogg.html b/mobile/android/geckoview/src/androidTest/assets/www/ogg.html deleted file mode 100644 index dd478d3b3f..0000000000 --- a/mobile/android/geckoview/src/androidTest/assets/www/ogg.html +++ /dev/null @@ -1,11 +0,0 @@ -<html> - <head> - <meta charset="utf-8"> - <title>OGG Video</title> - </head> - <body> - <video controls preload> - <source src="videos/video.ogg"></source> - </video> - </body> -</html> diff --git a/mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg b/mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg Binary files differdeleted file mode 100644 index ac7ece3519..0000000000 --- a/mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg +++ /dev/null |