Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1126146 - Disable the single-color optimization in reftests. r=tn

Browse Source
This commit is contained in:
Seth Fowler 2015-01-27 17:43:21 -08:00
parent c286b2ea59
commit 594a776fc1
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/thebes/gfxPrefs.h
View File

@ -246,6 +246,7 @@ private:
DECL_GFX_PREF(Once, "image.mem.surfacecache.size_factor", ImageMemSurfaceCacheSizeFactor, uint32_t, 64); DECL_GFX_PREF(Once, "image.mem.surfacecache.size_factor", ImageMemSurfaceCacheSizeFactor, uint32_t, 64);
DECL_GFX_PREF(Live, "image.mozsamplesize.enabled", ImageMozSampleSizeEnabled, bool, false); DECL_GFX_PREF(Live, "image.mozsamplesize.enabled", ImageMozSampleSizeEnabled, bool, false);
DECL_GFX_PREF(Once, "image.multithreaded_decoding.limit", ImageMTDecodingLimit, int32_t, -1); DECL_GFX_PREF(Once, "image.multithreaded_decoding.limit", ImageMTDecodingLimit, int32_t, -1);
DECL_GFX_PREF(Live, "image.single-color-optimization.enabled", ImageSingleColorOptimizationEnabled, bool, true);
DECL_GFX_PREF(Once, "layers.acceleration.disabled", LayersAccelerationDisabled, bool, false); DECL_GFX_PREF(Once, "layers.acceleration.disabled", LayersAccelerationDisabled, bool, false);
DECL_GFX_PREF(Live, "layers.acceleration.draw-fps", LayersDrawFPS, bool, false); DECL_GFX_PREF(Live, "layers.acceleration.draw-fps", LayersDrawFPS, bool, false);

4
image/src/imgFrame.cpp
View File

@ -421,8 +421,8 @@ nsresult imgFrame::Optimize()
/* Figure out if the entire image is a constant color */ /* Figure out if the entire image is a constant color */
// this should always be true if (gfxPrefs::ImageSingleColorOptimizationEnabled() &&
if (mImageSurface->Stride() == mSize.width * 4) { mImageSurface->Stride() == mSize.width * 4) {
uint32_t *imgData = (uint32_t*) ((uint8_t *)mVBufPtr); uint32_t *imgData = (uint32_t*) ((uint8_t *)mVBufPtr);
uint32_t firstPixel = * (uint32_t*) imgData; uint32_t firstPixel = * (uint32_t*) imgData;
uint32_t pixelCount = mSize.width * mSize.height + 1; uint32_t pixelCount = mSize.width * mSize.height + 1;

2
layout/reftests/bugs/reftest.list
View File

@ -1763,7 +1763,7 @@ skip-if(B2G) == 818276-1.html 818276-1-ref.html
== 836844-1.html 836844-1-ref.html == 836844-1.html 836844-1-ref.html
== 841192-1.html 841192-1-ref.html == 841192-1.html 841192-1-ref.html
== 844178.html 844178-ref.html == 844178.html 844178-ref.html
== 846144-1.html 846144-1-ref.html fuzzy-if(OSX,1,364) == 846144-1.html 846144-1-ref.html
== 847850-1.html 847850-1-ref.html == 847850-1.html 847850-1-ref.html
== 848421-1.html 848421-1-ref.html == 848421-1.html 848421-1-ref.html
random-if(B2G) == 849407-1.html 849407-1-ref.html random-if(B2G) == 849407-1.html 849407-1-ref.html

4
layout/tools/reftest/reftest-preferences.js
View File

@ -24,6 +24,10 @@
branch.setIntPref("urlclassifier.updateinterval", 172800); branch.setIntPref("urlclassifier.updateinterval", 172800);
// Disable high-quality downscaling, since it makes reftests more difficult. // Disable high-quality downscaling, since it makes reftests more difficult.
branch.setBoolPref("image.high_quality_downscaling.enabled", false); branch.setBoolPref("image.high_quality_downscaling.enabled", false);
// Disable the single-color optimization, since it can cause intermittent
// oranges and it causes many of our tests to test a different code path
// than the one that normal images on the web use.
branch.setBoolPref("image.single-color-optimization.enabled", false);
// Checking whether two files are the same is slow on Windows. // Checking whether two files are the same is slow on Windows.
// Setting this pref makes tests run much faster there. // Setting this pref makes tests run much faster there.
branch.setBoolPref("security.fileuri.strict_origin_policy", false); branch.setBoolPref("security.fileuri.strict_origin_policy", false);

3
modules/libpref/init/all.js
View File

@ -3789,6 +3789,9 @@ pref("image.high_quality_downscaling.min_factor", 1000);
// interpreted as number of decoded bytes. // interpreted as number of decoded bytes.
pref("image.high_quality_upscaling.max_size", 20971520); pref("image.high_quality_upscaling.max_size", 20971520);
// Should we optimize away the surfaces of single-color images?
pref("image.single-color-optimization.enabled", true);
// //
// Image memory management prefs // Image memory management prefs
// //