Bug 1060869 - Followup - Fix mochitest.ini syntax and bump back up memory limit prefs on B2G. r=me

--HG--
extra : rebase_source : 1b3a89c0c35e2fc8e1febcba1e4b3b784fa5fcff

b2g/app/b2g.js

@@ -336,8 +336,8 @@ pref("image.mem.min_discard_timeout_ms", 86400000); /* 24h, we rely on the out o
 // surface cache. Once animated images are stored in the surface cache too, this
 // pref will go away; see bug 977459. The same goes for
 // 'hard_limit_decoded_image_kb'; the surface cache limits are all hard.
-pref("image.mem.max_decoded_image_kb", 16384); // 16MB
-pref("image.mem.hard_limit_decoded_image_kb", 16384); // 16MB
+pref("image.mem.max_decoded_image_kb", 30000);
+pref("image.mem.hard_limit_decoded_image_kb", 66560);
 // Limit the surface cache to 1/8 of main memory or 128MB, whichever is smaller.
 // Almost everything that was factored into 'max_decoded_image_kb' is now stored
 // in the surface cache.  1/8 of main memory is 32MB on a 256MB device, which is

image/test/mochitest/chrome.ini

@@ -32,7 +32,7 @@ support-files =
 [test_animSVGImage.html]
 [test_animSVGImage2.html]
 [test_animation.html]
-skip-if = true # bug 1100497
+disabled = bug 1100497
 [test_animation2.html]
 [test_background_image_anim.html]
 [test_bullet_animation.html]
@@ -47,5 +47,5 @@ skip-if = true # bug 1100497
 [test_svg_filter_animation.html]
 [test_synchronized_animation.html]
 [test_undisplayed_iframe.html]
-skip-if = true # bug 1060869
+disabled = bug 1060869
 [test_xultree_animation.xhtml]

image/test/mochitest/mochitest.ini

@@ -94,4 +94,4 @@ skip-if = toolkit == "gonk" #Bug 997034 - canvas.toDataURL() often causes lost c
 [test_short_gif_header.html]
 [test_image_buffer_limit.html]
 #run-if = toolkit == "gonk" #Image buffer limit is only set for Firefox OS currently.
-skip-if = true # bug 1060869
+disabled = bug 1060869