Backed out changeset 82fd2eef7630 (bug 1060869) because the rest of this bug was backed out and it seems to be causing OSX Gip(f1) to be near permafail.

b2g/app/b2g.js

@@ -330,22 +330,9 @@ pref("media.video-queue.default-size", 3);
 pref("image.mem.decodeondraw", true);
 pref("image.mem.allow_locking_in_content_processes", false); /* don't allow image locking */
 pref("image.mem.min_discard_timeout_ms", 86400000); /* 24h, we rely on the out of memory hook */
-// At this point 'max_decoded_image_kb' only applies to animated images. They're
-// unfortunately fairly large, so this pref still needs to be somewhat generous,
-// but it makes sense to reduce it since most types of images are now in the
-// 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
-// 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
-// about the same as the old 'max_decoded_image_kb'.
-pref("image.mem.surfacecache.max_size_kb", 131072);  // 128MB
-pref("image.mem.surfacecache.size_factor", 8);  // 1/8 of main memory
-pref("image.mem.surfacecache.discard_factor", 2);  // Discard 1/2 of the surface cache at a time.
-pref("image.mem.surfacecache.min_expiration_ms", 86400000); // 24h, we rely on the out of memory hook
+pref("image.mem.max_decoded_image_kb", 30000); /* 30MB seems reasonable */
+// 65MB seems reasonable and layout/reftests/bugs/370629-1.html requires more than 62MB
+pref("image.mem.hard_limit_decoded_image_kb", 66560);
 pref("image.onload.decode.limit", 24); /* don't decode more than 24 images eagerly */
 
 // XXX this isn't a good check for "are touch events supported", but

dom/base/test/mochitest.ini

@@ -674,7 +674,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 904183 # b2g(bug 904183
 [test_fileapi.html]
 skip-if = e10s
 [test_fileapi_slice.html]
-disabled = Busted on B2G, Android, E10S and now Mulet. Bug 775227.
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 775227
 [test_getElementById.html]
 [test_html_colors_quirks.html]
 [test_html_colors_standards.html]

dom/html/reftests/reftest.list

@@ -39,7 +39,7 @@ skip-if(Android||B2G) == 649134-2.html 649134-2-ref.html
 # (Fuzzy necessary due to pixel-wise comparison of different JPEGs.
 # The vast majority of the fuzziness comes from Linux and WinXP.)
 fuzzy(1,149) == bug917595-iframe-1.html    bug917595-1-ref.html
-skip-if(B2G) fuzzy-if(!B2G,3,640) == bug917595-exif-rotated.jpg bug917595-pixel-rotated.jpg # bug 1060869
+fuzzy(3,640) == bug917595-exif-rotated.jpg bug917595-pixel-rotated.jpg
 
 == href-attr-change-restyles.html href-attr-change-restyles-ref.html
 == figure.html figure-ref.html

image/test/mochitest/chrome.ini

@@ -47,5 +47,4 @@ skip-if = true # bug 1100497
 [test_svg_filter_animation.html]
 [test_synchronized_animation.html]
 [test_undisplayed_iframe.html]
-skip-if = true # bug 1060869
 [test_xultree_animation.xhtml]

image/test/mochitest/mochitest.ini

@@ -93,5 +93,4 @@ skip-if = toolkit == "gonk" #Bug 997034 - canvas.toDataURL() often causes lost c
 [test_error_events.html]
 [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
+run-if = toolkit == "gonk" #Image buffer limit is only set for Firefox OS currently.

layout/reftests/bugs/reftest.list

@@ -637,7 +637,7 @@ skip-if(B2G&&browserIsRemote) == 369882.xul 369882-ref.xul # bug 974780
 == 370525-rowspan-4.html 370525-rowspan-4-ref.html
 == 370525-sib.html 370525-sib-ref.html
 == 370586-1.xhtml 370586-1-ref.xhtml
-skip-if(B2G) == 370629-1.html 370629-1-ref.html # bug 1060869
+== 370629-1.html 370629-1-ref.html
 skip-if(B2G) == 370629-2.html 370629-2-ref.html
 == 370692-1.xhtml 370692-1-ref.xhtml
 == 371041-1.html 371041-1-ref.html
@@ -1844,4 +1844,4 @@ test-pref(dom.webcomponents.enabled,true) == 1066554-1.html 1066554-1-ref.html
 == 1078262-1.html about:blank
 test-pref(layout.testing.overlay-scrollbars.always-visible,false) == 1081072-1.html 1081072-1-ref.html
 fuzzy-if(winWidget&&!layersGPUAccelerated,1,31) == 1081185-1.html 1081185-1-ref.html
-== 1097437-1.html 1097437-1-ref.html
+== 1097437-1.html 1097437-1-ref.html

modules/libpref/init/all.js

@@ -3799,13 +3799,14 @@ pref("image.mem.hard_limit_decoded_image_kb", 0);
 pref("image.mem.surfacecache.min_expiration_ms", 60000); // 60ms
 
 // Maximum size for the surface cache, in kilobytes.
-pref("image.mem.surfacecache.max_size_kb", 1048576); // 1GB
+pref("image.mem.surfacecache.max_size_kb", 102400); // 100MB
 
 // The surface cache's size, within the constraints of the maximum size set
-// above, is determined as a fraction of main memory size. The size factor is
-// interpreted as a reciprocal, so a size factor of 4 means to use no more than
-// 1/4 of main memory.  The default should be a good balance for most systems.
-pref("image.mem.surfacecache.size_factor", 4);
+// above, is determined using a formula based on system capabilities like memory
+// size. The size factor is used to tune this formula. Larger size factors
+// result in smaller caches. The default should be a good balance for most
+// systems.
+pref("image.mem.surfacecache.size_factor", 64);
 
 // Whether we decode images on multiple background threads rather than the
 // foreground thread.