Bug 1310237 - Change skip-if(!asyncZoom) tests to skip-if(!Android) with zooming enabled. Also update the fuzziness checks to match current Android reftest results. r=tnikkel

MozReview-Commit-ID: 5gcBgzyOq7b

--HG--
extra : rebase_source : 76de7392dc0c38398a8536db2591e0cb699ccebf
This commit is contained in:
Kartikaya Gupta 2016-10-19 16:16:07 -04:00
Родитель ffb7fbf6c4
Коммит 25d2167134
5 изменённых файлов: 12 добавлений и 22 удалений

Просмотреть файл

@ -1,19 +1,19 @@
# The following tests test the async positioning of the scrollbars.
# Basic root-frame scrollbar with async scrolling
skip-if(!asyncPan) fuzzy-if(Android,6,8) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
skip-if(!asyncPan) fuzzy-if(Android,6,8) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
skip-if(!asyncPan) fuzzy-if(Android,6,8) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
skip-if(!asyncPan) fuzzy-if(Android,6,8) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
skip-if(!asyncPan) fuzzy-if(Android,13,8) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
skip-if(!asyncPan) fuzzy-if(Android,8,11) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
fuzzy-if(Android,1,2) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
fuzzy-if(Android,4,5) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
fuzzy-if(Android,3,5) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
fuzzy-if(Android,1,2) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
fuzzy-if(Android,4,5) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
fuzzy-if(Android,3,7) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
# Different async zoom levels. Since the scrollthumb gets async-scaled in the
# compositor, the border-radius ends of the scrollthumb are going to be a little
# off, hence the fuzzy-if clauses.
skip-if(!asyncZoom) fuzzy-if(B2G,98,82) == async-scrollbar-zoom-1.html async-scrollbar-zoom-1-ref.html
skip-if(!asyncZoom) fuzzy-if(B2G,94,146) == async-scrollbar-zoom-2.html async-scrollbar-zoom-2-ref.html
fuzzy-if(Android,54,18) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-zoom-1.html async-scrollbar-zoom-1-ref.html
fuzzy-if(Android,45,21) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-zoom-2.html async-scrollbar-zoom-2-ref.html
# Meta-viewport tag support
skip-if(!asyncZoom) == initial-scale-1.html initial-scale-1-ref.html
skip-if(!Android) pref(apz.allow_zooming,true) == initial-scale-1.html initial-scale-1-ref.html
skip-if(!asyncPan) == frame-reconstruction-scroll-clamping.html frame-reconstruction-scroll-clamping-ref.html

Просмотреть файл

@ -1,10 +1,5 @@
<!DOCTYPE HTML>
<html reftest-async-zoom="2">
<!-- There is a bug with MultiTiledContentClient that causes improper painting;
bug 1204076 is on file for this issue. As a temporary workaround, we set
user-scalable=no here so that WantAsyncZoom() returns false and we don't
use a MultiTiledContentClient. Once bug 1204076 is fixed, we can remove this. -->
<meta name="viewport" content="user-scalable=no">
<body>
<div style="position:absolute; top: 0; left: 0; width: 100px; height: 100px; background: red;"></div>
</body>

Просмотреть файл

@ -166,8 +166,8 @@ default-preferences pref(layers.low-precision-buffer,false)
skip-if(!asyncPan||!browserIsRemote) != async-scroll-1b.html async-scroll-1-ref.html
default-preferences
skip-if(!asyncZoom) != async-zoom-1.html async-zoom-1-ref.html
fuzzy(112,1197) skip-if(!asyncZoom) == async-zoom-2.html async-zoom-2-ref.html
skip-if(!Android) pref(apz.allow_zooming,true) != async-zoom-1.html async-zoom-1-ref.html
fuzzy(112,800) skip-if(!Android) pref(apz.allow_zooming,true) == async-zoom-2.html async-zoom-2-ref.html
# reftest-opaque-layer
== reftest-opaque-layer-pass.html reftest-opaque-layer-pass.html

Просмотреть файл

@ -555,7 +555,7 @@ the end of the test take the snapshot with the given async zoom on top of any
existing zoom. Content is not re-rendered at the new zoom level. This
corresponds to the mobile style "pinch zoom" style of zoom. This is unsupported
in many configurations, and any tests using this will probably want to have
skip-if(!asyncPanZoom) on them.
pref(apz.allow_zooming,true) on them.
Printing Tests: class="reftest-print"
=====================================

Просмотреть файл

@ -747,11 +747,6 @@ function BuildConditionSandbox(aURL) {
} catch (e) {
sandbox.asyncPan = false;
}
try {
sandbox.asyncZoom = sandbox.asyncPan && prefs.getBoolPref("apz.allow_zooming");
} catch (e) {
sandbox.asyncZoom = false;
}
if (!gDumpedConditionSandbox) {
logger.info("Dumping JSON representation of sandbox");