wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout changeset bba3ada5314c (bug 480686) due to perma-orange.

Browse Source
This commit is contained in:
Mounir Lamouri 2011-06-27 00:00:47 +02:00
parent dd84e816fe
commit 57a439636b
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/base/crashtests/480686-1.html
View File

@ -1,13 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
span { background: url(../../../testing/crashtest/images/tree.gif); }
</style>
</head>
<body><div style="direction: rtl;"><div style="-moz-column-width: 1px;"><span>Q<input></span></div></div></body>
</html>

1
layout/base/crashtests/crashtests.list
View File

@ -259,7 +259,6 @@ load 479114-1.html
load 477333-1.xhtml
load 477731-1.html
asserts(6) load 479360-1.xhtml # Bug 439258
load 480686-1.html
load 481806-1.html
asserts(6) load 483604-1.xhtml # Bug 439258
load 485501-1.html

8
layout/base/nsCSSRendering.cpp
View File

@ -344,15 +344,11 @@ protected:
}
PRBool AreOnSameLine(nsIFrame* aFrame1, nsIFrame* aFrame2) {
// Assumes that aFrame1 and aFrame2 are both decsendants of mBlockFrame.
PRBool isValid1, isValid2;
nsBlockInFlowLineIterator it1(mBlockFrame, aFrame1, &isValid1);
nsBlockInFlowLineIterator it2(mBlockFrame, aFrame2, &isValid2);
return isValid1 && isValid2 &&
// Make sure aFrame1 and aFrame2 are in the same continuation of
// mBlockFrame.
it1.GetContainer() == it2.GetContainer() &&
// And on the same line in it
it1.GetLine() == it2.GetLine();
return isValid1 && isValid2 && it1.GetLine() == it2.GetLine();
}
};