Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 03:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 5 changesets (bug 1476437, bug 1478574) for failing hyphenation-control-5.html on windows builds on a CLOSED TREE

Browse Source 
Backed out changeset d8d3c9e7b832 (bug 1476437)
Backed out changeset 280aff154491 (bug 1476437)
Backed out changeset e17db916959e (bug 1476437)
Backed out changeset 144a3d2b7da9 (bug 1478574)
Backed out changeset edb45de7ff9d (bug 1478574)
This commit is contained in:
Tiberius Oros 2018-07-28 13:22:54 +03:00
parent 6e34ef61c4
commit 339c5c47b4
8 changed files with 3 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/generic/nsTextFrame.cpp
View File

@ -3640,13 +3640,10 @@ PropertyProvider::GetHyphenationBreaks(Range aRange, HyphenType* aBreakBefore) c
}
if (mTextStyle->mHyphens == StyleHyphens::Auto) {
gfxSkipCharsIterator skipIter(mStart);
uint32_t currentFragOffset = mStart.GetOriginalOffset();
for (uint32_t i = 0; i < aRange.Length(); ++i) {
if (IS_HYPHEN(mFrag->
CharAt(skipIter.ConvertSkippedToOriginal(aRange.start + i)))) {
if (i < aRange.Length() - 1) {
aBreakBefore[i + 1] = HyphenType::Explicit;
}
if (IS_HYPHEN(mFrag->CharAt(currentFragOffset + i))) {
aBreakBefore[i] = HyphenType::Explicit;
continue;
}

22
layout/reftests/text/hyphenation-control-5-ref.html
View File

@ -1,22 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<meta charset="utf-8">
<style>
body { columns: 3; }
p { margin: 0 0 1em 0; }
</style>
<body>
<p>hard-<br>hit
<p>hard-<br>hit-<br>ting
<p>hard-<br>est-<br>hit
<p>hard-<br>est-<br>hit-<br>ting
<p><b>hard</b>-<br>hit
<p><b>hard</b>-<br>hit-<br>ting
<p><b>hard-<br>est</b>-<br>hit
<p><b>hard-<br>est</b>-<br>hit-<br>ting
<p>hard-<br><b>hit</b>
<p>hard-<br><b>hit-<br>ting</b>
<p>hard-<br>est-<br><b>hit</b>
<p>hard-<br>est-<br><b>hit-<br>ting</b>

22
layout/reftests/text/hyphenation-control-5.html
View File

@ -1,22 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<meta charset="utf-8">
<style>
body { columns: 3; }
p { margin: 0 0 1em 0; width:0; hyphens:auto; }
</style>
<body>
<p>hard-hit
<p>hard-hitting
<p>hardest-hit
<p>hardest-hitting
<p><b>hard</b>-hit
<p><b>hard</b>-hitting
<p><b>hardest</b>-hit
<p><b>hardest</b>-hitting
<p>hard-<b>hit</b>
<p>hard-<b>hitting</b>
<p>hardest-<b>hit</b>
<p>hardest-<b>hitting</b>

73
layout/reftests/text/hyphenation-control-6-ref.html
View File

@ -1,73 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<meta charset="utf-8">
<style>
.test { hyphens:auto; font:10px monospace; border: 1px solid silver; }
</style>
<body>
<p>All the columns should appear identical:</p>
<div id="outer" style="columns:6">
<script>
let outer = document.getElementById("outer");
for (i = 1; i <= 6; ++i) {
div = document.createElement("div");
div.className = "test";
div.style.width = "0ch";
div.innerHTML = "the<br>flow-<br>rel-<br>a-<br>tive";
outer.appendChild(div);
div = document.createElement("div");
div.className = "test";
div.style.width = "2ch";
div.innerHTML = "the<br>flow-<br>rel-<br>a-<br>tive";
outer.appendChild(div);
div = document.createElement("div");
div.className = "test";
div.style.width = "4ch";
div.innerHTML = "the<br>flow-<br>rel-<br>a-<br>tive";
outer.appendChild(div);
div = document.createElement("div");
div.className = "test";
div.style.width = "6ch";
div.innerHTML = "the<br>flow-<br>rela-<br>tive";
outer.appendChild(div);
div = document.createElement("div");
div.className = "test";
div.style.width = "8ch";
div.innerHTML = "the<br>flow-<br>relative";
outer.appendChild(div);
div = document.createElement("div");
div.className = "test";
div.style.width = "10ch";
div.innerHTML = "the flow-<br>relative";
outer.appendChild(div);
div = document.createElement("div");
div.className = "test";
div.style.width = "12ch";
div.innerHTML = "the flow-<br>relative";
outer.appendChild(div);
div = document.createElement("div");
div.className = "test";
div.style.width = "14ch";
div.innerHTML = "the flow-<br>relative";
outer.appendChild(div);
div = document.createElement("div");
div.className = "test";
div.style.width = "16ch";
div.innerHTML = "the flow-<br>relative";
outer.appendChild(div);
div = document.createElement("div");
div.className = "test";
div.style.width = "18ch";
div.innerHTML = "the flow-relative";
outer.appendChild(div);
}
</script>

21
layout/reftests/text/hyphenation-control-6.html
View File

@ -1,21 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<meta charset="utf-8">
<style>
.test { hyphens:auto; font:10px monospace; border: 1px solid silver; }
</style>
<body>
<p>All the columns should appear identical:</p>
<div id="outer" style="columns:6">
<script>
let outer = document.getElementById("outer");
for (i = 1; i <= 6; ++i) {
for (j = 0; j <= 18; j += 2) {
div = document.createElement("div");
div.className = "test";
div.style.width = j + "ch";
div.textContent = "the" + " ".repeat(i) + "flow-relative";
outer.appendChild(div);
}
}
</script>

25
layout/reftests/text/hyphenation-control-7-ref.html
View File

@ -1,25 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta "charset=utf-8">
<style>
p {
background: yellow;
margin: 0 0 1em 0;
font-family: monospace;
}
</style>
<body>
<h3>The columns should appear identical; "relative" should never be hyphenated</h3>
<div style="columns:2">
<p style="width: 16ch">the flow-<br>relative flow-<br>relative flow-<br>relative flow-<br>relative flow-<br>relative</p>
<p style="width: 20ch">the flow-relative<br>flow-relative flow-<br>relative flow-<br>relative flow-<br>relative</p>
<p style="width: 24ch">the flow-relative flow-<br>relative flow-relative<br>flow-relative flow-<br>relative</p>
<p style="width: 41ch">the flow-relative flow-relative flow-<br>relative flow-relative flow-relative</p>
<p style="width: 50ch">the flow-relative flow-relative flow-relative<br>flow-relative flow-relative</p>
<p style="width: 16ch">the flow-<br>relative flow-<br>relative flow-<br>relative flow-<br>relative flow-<br>relative</p>
<p style="width: 20ch">the flow-relative<br>flow-relative flow-<br>relative flow-<br>relative flow-<br>relative</p>
<p style="width: 24ch">the flow-relative flow-<br>relative flow-relative<br>flow-relative flow-<br>relative</p>
<p style="width: 41ch">the flow-relative flow-relative flow-<br>relative flow-relative flow-relative</p>
<p style="width: 50ch">the flow-relative flow-relative flow-relative<br>flow-relative flow-relative</p>

26
layout/reftests/text/hyphenation-control-7.html
View File

@ -1,26 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta "charset=utf-8">
<style>
p {
background: yellow;
margin: 0 0 1em 0;
font-family: monospace;
hyphens: auto;
}
</style>
<body>
<h3>The columns should appear identical; "relative" should never be hyphenated</h3>
<div style="columns:2">
<p style="width: 16ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>
<p style="width: 20ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>
<p style="width: 24ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>
<p style="width: 41ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>
<p style="width: 50ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>
<p style="width: 16ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>
<p style="width: 20ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>
<p style="width: 24ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>
<p style="width: 41ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>
<p style="width: 50ch">the flow-relative flow-relative flow-relative flow-relative flow-relative</p>

3
layout/reftests/text/reftest.list
View File

@ -321,9 +321,6 @@ pref(gfx.font_rendering.graphite.enabled,true) == glyph-decomposition-graphite.h
== hyphenation-control-2.html hyphenation-control-2-ref.html
== hyphenation-control-3.html hyphenation-control-3-ref.html
== hyphenation-control-4.html hyphenation-control-4-ref.html
== hyphenation-control-5.html hyphenation-control-5-ref.html
== hyphenation-control-6.html hyphenation-control-6-ref.html
== hyphenation-control-7.html hyphenation-control-7-ref.html
# osx-font-smoothing - with and without subpixel AA, only under OSX
fails-if(!cocoaWidget) != osx-font-smoothing.html osx-font-smoothing-ref.html