mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1298652 - Allow 64k width/height images to be rendered. r=jrmuizel 

MozReview-Commit-ID: DIK9y9acV0M

--HG--
extra : rebase_source : 55129089afacd7a4a932a1ada59d366db54ea33a
This commit is contained in:
Andrew Osmond 2016-09-01 07:32:02 -04:00
Родитель db3ff2c559
Коммит d93e9c00e1
2 изменённых файлов: 6 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
image/imgFrame.cpp
Просмотреть файл

@ -156,14 +156,6 @@ AllowedImageSize(int32_t aWidth, int32_t aHeight)
NS_WARNING("width or height too large");
return false;
}
#if defined(XP_MACOSX)
// CoreGraphics is limited to images < 32K in *height*, so clamp all surfaces
// on the Mac to that height
if (MOZ_UNLIKELY(aHeight > SHRT_MAX)) {
NS_WARNING("image too big");
return false;
}
#endif
return true;
}

12
image/test/reftest/downscaling/reftest.list
Просмотреть файл

@ -193,15 +193,15 @@ fuzzy(18,128) == downscale-32px.html?-bmp-in.ico downscale-32px-ref.html
fuzzy(18,128) == downscale-32px.html?-png-in.ico downscale-32px-ref.html
# Test images taller or wider than 32767 pixels.
fails-if(OSX) == huge-1.html?100x32768.png,100,100 huge-1.html?100x100.png,100,100
fails-if(OSX) == huge-1.html?100x32768.png,100,32768 huge-1.html?100x100.png,100,32768
== huge-1.html?100x32768.png,100,100 huge-1.html?100x100.png,100,100
== huge-1.html?100x32768.png,100,32768 huge-1.html?100x100.png,100,32768
== huge-1.html?32768x100.png,100,100 huge-1.html?100x100.png,100,100
== huge-1.html?32768x100.png,32768,100 huge-1.html?100x100.png,32768,100
fails-if(OSX) == huge-1.html?100x32768.gif,100,100 huge-1.html?100x100.gif,100,100
fails-if(OSX) == huge-1.html?100x32768.gif,100,32768 huge-1.html?100x100.gif,100,32768
== huge-1.html?100x32768.gif,100,100 huge-1.html?100x100.gif,100,100
== huge-1.html?100x32768.gif,100,32768 huge-1.html?100x100.gif,100,32768
== huge-1.html?32768x100.gif,100,100 huge-1.html?100x100.gif,100,100
== huge-1.html?32768x100.gif,32768,100 huge-1.html?100x100.gif,32768,100
fails-if(OSX) == huge-1.html?100x32768.jpg,100,100 huge-1.html?100x100.jpg,100,100
fails-if(OSX) == huge-1.html?100x32768.jpg,100,32768 huge-1.html?100x100.jpg,100,32768
== huge-1.html?100x32768.jpg,100,100 huge-1.html?100x100.jpg,100,100
== huge-1.html?100x32768.jpg,100,32768 huge-1.html?100x100.jpg,100,32768
== huge-1.html?32768x100.jpg,100,100 huge-1.html?100x100.jpg,100,100
== huge-1.html?32768x100.jpg,32768,100 huge-1.html?100x100.jpg,32768,100