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

Backed out 2 changesets (bug 1283222) for build bustages on nsLineLayout. CLOSED TREE 

Backed out changeset fb82d1aa97d0 (bug 1283222)
Backed out changeset 093bf5cadbcc (bug 1283222)
This commit is contained in:
Cosmin Sabou 2019-04-24 15:50:59 +03:00
Родитель 1d349df2d1
Коммит 5d756e5a09
7 изменённых файлов: 2 добавлений и 93 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
layout/generic/nsLineLayout.cpp
Просмотреть файл

@ -1064,12 +1064,11 @@ void nsLineLayout::ReflowFrame(nsIFrame* aFrame, nsReflowStatus& aReflowStatus,
}
if (!continuingTextRun && !psd->mNoWrap) {
if (!LineIsEmpty()) {
if (!LineIsEmpty() || placedFloat) {
// record soft break opportunity after this content that can't be
// part of a text run. This is not a text frame so we know
// that offset INT32_MAX means "after the content".
if (!aFrame->IsPlaceholderFrame() &&
NotifyOptionalBreakPosition(aFrame, INT32_MAX,
if (NotifyOptionalBreakPosition(aFrame, INT32_MAX,
optionalBreakAfterFits,
gfxBreakPriority::eNormalBreak)) {
// If this returns true then we are being told to actually break

16
testing/web-platform/tests/css/css-text/line-breaking/line-breaking-015.html
Просмотреть файл

@ -1,16 +0,0 @@
<!doctype html>
<html>
<meta charset="utf-8">
<title>CSS Text — line breaking at element boundaries</title>
<meta name=assert content="An empty inline element should not introduce a line-break opportunity">
<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
<link rel=match href="reference/line-breaking-015-ref.html">
<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
<style>
.test { margin: 1em 0; width: 0; line-height: 2; }
</style>
<body>
The word "unbroken" below should <b>not</b> be broken:
<div class="test">un<span></span>bro<b></b>ken</div>
</body>
</html>

17
testing/web-platform/tests/css/css-text/line-breaking/line-breaking-016.html
Просмотреть файл

@ -1,17 +0,0 @@
<!doctype html>
<html>
<meta charset="utf-8">
<title>CSS Text — line breaking at element boundaries</title>
<meta name=assert content="An out-of-flow element should not introduce a line-break opportunity">
<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
<link rel=match href="reference/line-breaking-016-ref.html">
<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
<style>
.test { margin: 1em 0; width: 0; }
.oof { position: absolute; left: 6em; }
</style>
<body>
The word "unbroken" below should <b>not</b> be broken:
<div class="test">un<span class="oof"></span>bro<b class="oof">absolute</b>ken</div>
</body>
</html>

17
testing/web-platform/tests/css/css-text/line-breaking/line-breaking-017.html
Просмотреть файл

@ -1,17 +0,0 @@
<!doctype html>
<html>
<meta charset="utf-8">
<title>CSS Text — line breaking at element boundaries</title>
<meta name=assert content="An out-of-flow element should not introduce a line-break opportunity">
<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
<link rel=match href="reference/line-breaking-017-ref.html">
<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
<style>
.test { margin: 1em 0; width: 0; }
.oof { float: left; }
</style>
<body>
The word "unbroken" below should <b>not</b> be broken:
<div class="test">un<span class="oof"></span>bro<b class="oof">float</b>ken</div>
</body>
</html>

13
testing/web-platform/tests/css/css-text/line-breaking/reference/line-breaking-015-ref.html
Просмотреть файл

@ -1,13 +0,0 @@
<!doctype html>
<html>
<meta charset="utf-8">
<title>CSS Text — reference file for line-breaking test</title>
<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
<style>
.test { margin: 1em 0; line-height: 2; }
</style>
<body>
The word "unbroken" below should <b>not</b> be broken:
<div class="test">unbroken</div>
</body>
</html>

14
testing/web-platform/tests/css/css-text/line-breaking/reference/line-breaking-016-ref.html
Просмотреть файл

@ -1,14 +0,0 @@
<!doctype html>
<html>
<meta charset="utf-8">
<title>CSS Text — reference file for line-breaking test</title>
<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
<style>
.test { margin: 1em 0; }
.oof { position: absolute; left: 6em; }
</style>
<body>
The word "unbroken" below should <b>not</b> be broken:
<div class="test">unbroken<b class="oof">absolute</b></div>
</body>
</html>

13
testing/web-platform/tests/css/css-text/line-breaking/reference/line-breaking-017-ref.html
Просмотреть файл

@ -1,13 +0,0 @@
<!doctype html>
<html>
<meta charset="utf-8">
<title>CSS Text — reference file for line-breaking test</title>
<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
<style>
.test { margin: 1em 0; }
</style>
<body>
The word "unbroken" below should <b>not</b> be broken:
<div class="test">unbroken<br><b>float</b></div>
</body>
</html>