Commit fd0b701b authored by Narcis Beleuzu's avatar Narcis Beleuzu
Browse files

Backed out 4 changesets (bug 1417251) for reftest failures in... 

Backed out 4 changesets (bug 1417251) for reftest failures in abs-pos-non-replaced-vrl* on Windows and in box-sizing-replaced* on Android. r=backout a=backout

Backed out changeset 66d4e6df73d2 (bug 1417251)
Backed out changeset 5f8edbddf6b5 (bug 1417251)
Backed out changeset bf26cbb99b6a (bug 1417251)
Backed out changeset 2374657677b7 (bug 1417251)

--HG--
extra : amend_source : 9e00f8873f41a7aa6a98e6ccb6528e0c3c19eb05
parent 04a25ecb

docshell/base/nsDocShell.cpp

+0 −3
Original line number Diff line number Diff line
@@ -10535,9 +10535,6 @@ nsDocShell::InternalLoad(nsIURI* aURI, 
    (aFlags & INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP) != 0;

  mURIResultedInDocument = false;  // reset the clock...



  // Note that there is code that relies on this check to stop us entering the

  // `doShortCircuitedLoad` block below for certain load types.  (For example,

  // reftest-content.js uses LOAD_FLAGS_BYPASS_CACHE for this purpose.)

  if (aLoadType == LOAD_NORMAL ||

      aLoadType == LOAD_STOP_CONTENT ||

      LOAD_TYPE_HAS_FLAGS(aLoadType, LOAD_FLAGS_REPLACE_HISTORY) ||

layout/reftests/backgrounds/reftest.list

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ fuzzy(50,500) fuzzy-if(skiaContent,51,320) fails-if(webrender) == attachment-loc 
# The next three tests are fuzzy due to bug 1128229.

fuzzy(16,69) fuzzy-if(skiaContent,95,2206) == attachment-local-clipping-image-4.html attachment-local-clipping-image-4-ref.html

fuzzy(16,69) fuzzy-if(skiaContent,95,2206) == attachment-local-clipping-image-5.html attachment-local-clipping-image-4-ref.html

fuzzy(80,500) fuzzy-if(skiaContent,118,929) fails-if(webrender) == attachment-local-clipping-image-6.html attachment-local-clipping-image-6-ref.html

fuzzy(80,500) fuzzy-if(skiaContent,109,908) fails-if(webrender) == attachment-local-clipping-image-6.html attachment-local-clipping-image-6-ref.html



fuzzy-if(skiaContent,1,8) fuzzy-if(webrender,1,84) == background-multiple-with-border-radius.html background-multiple-with-border-radius-ref.html

== background-repeat-large-area.html background-repeat-large-area-ref.html

layout/reftests/bugs/reftest.list

+3 −3
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ fuzzy-if(Android,3,50) fuzzy-if(skiaContent,1,133) == 273681-1.html 273681-1-ref 
== 283686-2.html 283686-2-ref.html

== 283686-3.html about:blank

== 289384-1.xhtml 289384-ref.xhtml

random-if(d2d) fuzzy-if(Android,8,1439) HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 578114 for the d2d failures

random-if(d2d) fuzzy-if(Android,8,1439) skip-if(styloVsGecko) HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 578114 for the d2d failures, bug 1354406

== 290129-1.html 290129-1-ref.html

== 291078-1.html 291078-1-ref.html

== 291078-2.html 291078-2-ref.html
@@ -598,7 +598,7 @@ fails-if(Android&&!asyncPan) != 367247-l-hidden.html 367247-l-scroll.html 
== 367612-1e.html 367612-1-ref.html

== 367612-1f.html 367612-1-ref.html

!= 367612-1g.html 367612-1-ref.html

fuzzy(32,34) fuzzy-if(cocoaWidget,32,100) == 368020-1.html 368020-1-ref.html

fuzzy-if(skiaContent,1,28) fuzzy-if(winWidget||gtkWidget,32,34) == 368020-1.html 368020-1-ref.html

== 368020-2.html 368020-2-ref.html

== 368020-3.html 368020-3-ref.html

pref(layout.css.box-decoration-break.enabled,true) == 368020-5.html 368020-5-ref.html
@@ -1473,7 +1473,7 @@ random == 536061.html 536061-ref.html # fixedpoint division in blur code makes t 
== 539323-3.html 539323-3-ref.html

== 539880-1.html 539880-1-ref.html

== 539880-1-dynamic.html 539880-1-ref.html

fuzzy-if(Android,12,1000) == 539949-1.html#test2 539949-1-ref.html#test2

fuzzy-if(Android,12,1000) skip-if(styloVsGecko) == 539949-1.html#test2 539949-1-ref.html#test2 # bug 1354406

== 541382-1.html 541382-1-ref.html

random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)||!haveTestPlugin) HTTP == 541406-1.html 541406-1-ref.html

needs-focus != 542116-1.html 542116-1-ref.html

layout/reftests/css-break/reftest.list

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ default-preferences pref(layout.css.box-decoration-break.enabled,true) 


== box-decoration-break-1.html box-decoration-break-1-ref.html

fuzzy(1,20) fuzzy-if(skiaContent,1,700) fuzzy-if(webrender,6-6,8490-8490) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html

fuzzy(60,692) fuzzy-if(Android||cocoaWidget||winWidget,77,1764) fuzzy-if(styloVsGecko,45,1410) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543

fuzzy(45,460) fuzzy-if(skiaContent,57,439) fuzzy-if(Android,57,1330) fuzzy-if(styloVsGecko,45,1410) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543

random-if(!gtkWidget) == box-decoration-break-border-image.html box-decoration-break-border-image-ref.html

== box-decoration-break-block-border-padding.html box-decoration-break-block-border-padding-ref.html

== box-decoration-break-block-margin.html box-decoration-break-block-margin-ref.html

layout/reftests/css-ui/caret-color-01-ref.html

+7 −18
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html class="reftest-wait">

  <script>



// We use MozReftestInvalidate here to wait until the font has loaded before

// calling getBoundingClientRect.

document.addEventListener('MozReftestInvalidate', () => {

  let div = document.querySelector('div');

  let span = document.querySelector('span');

  div.style.height = span.getBoundingClientRect().height + 'px';

  document.documentElement.removeAttribute("class");

});



  </script>

<style>



@font-face {

  font-family: Ahem;

  src: url(../fonts/Ahem.ttf);
@@ -23,7 +9,10 @@ div { 
  width: 1em;

  background: green;

}



</style>

<div><span></span></div>

<script>

let $div = document.querySelector('div');

let $span = document.querySelector('span');

$div.style.height = $span.getBoundingClientRect().height + 'px';

</script>