зеркало из https://github.com/mozilla/gecko-dev.git
Back out 1cd8c9b40035 (bug 725376), df43cc1f72e1 (bug 725535), and 8a820e4ee7f6 (bug 726364) for reftest orange
This commit is contained in:
Phil Ringnalda
Родитель
4463a612a1
Коммит
b8cb208b51
|
|
@ -752,9 +752,6 @@ nsGenericDOMDataNode::SplitData(PRUint32 aOffset, nsIContent** aReturn,
|
|||
return rv;
|
||||
}
|
||||
|
||||
nsIDocument* document = GetCurrentDoc();
|
||||
mozAutoDocUpdate updateBatch(document, UPDATE_CONTENT_MODEL, true);
|
||||
|
||||
// Use Clone for creating the new node so that the new node is of same class
|
||||
// as this node!
|
||||
nsCOMPtr<nsIContent> newContent = CloneDataNode(mNodeInfo, false);
|
||||
|
|
|
|||
|
|
@ -554,7 +554,6 @@ _TEST_FILES2 = \
|
|||
file_bug717511.html^headers^ \
|
||||
file_bug717511_2.html \
|
||||
file_bug717511_2.html^headers^ \
|
||||
test_bug726364.html \
|
||||
$(NULL)
|
||||
|
||||
_CHROME_FILES = \
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=726364
|
||||
-->
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Test for Bug 726364</title>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
|
||||
</head>
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=726364">Mozilla Bug 726364</a>
|
||||
<p id="display"><div id="v">ABC</div></p>
|
||||
<div id="content" style="display: none">
|
||||
|
||||
</div>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
|
||||
/** Test for Bug 726364 **/
|
||||
function boom()
|
||||
{
|
||||
var v = document.getElementById("v");
|
||||
var t = v.firstChild;
|
||||
is(v.childNodes.length,1, "child count");
|
||||
|
||||
var f = function(event) {
|
||||
window.removeEventListener("DOMCharacterDataModified", f, true);
|
||||
is(v.childNodes[0],t, "first child is the same");
|
||||
is(v.childNodes.length,2, "child count");
|
||||
r.setEnd(v, 0);
|
||||
SimpleTest.finish();
|
||||
};
|
||||
window.addEventListener("DOMCharacterDataModified", f, true);
|
||||
|
||||
var r = document.createRange();
|
||||
r.setStart(t, 2);
|
||||
t.splitText(1);
|
||||
}
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
addLoadEvent(boom);
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html style="-moz-transform-style: preserve-3d">
|
||||
<body>
|
||||
<script>
|
||||
document.addEventListener("MozReftestInvalidate", function() {document.documentElement.style.MozTransform = 'rotate(0)';}, false);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -349,4 +349,3 @@ load 698335.html
|
|||
needs-focus pref(accessibility.browsewithcaret,true) load 699353-1.html
|
||||
load 707098.html
|
||||
load 722137.html
|
||||
load 725535.html
|
||||
|
|
|
|||
|
|
@ -7674,6 +7674,9 @@ DoApplyRenderingChangeToTree(nsIFrame* aFrame,
|
|||
"should only be called within ApplyRenderingChangeToTree");
|
||||
|
||||
for ( ; aFrame; aFrame = nsLayoutUtils::GetNextContinuationOrSpecialSibling(aFrame)) {
|
||||
NS_ASSERTION(!(aChange & nsChangeHint_UpdateTransformLayer) || aFrame->IsTransformed(),
|
||||
"Only transformed frames should have UpdateTransformLayer hint");
|
||||
|
||||
// Get view if this frame has one and trigger an update. If the
|
||||
// frame doesn't have a view, find the nearest containing view
|
||||
// (adjusting r's coordinate system to reflect the nesting) and
|
||||
|
|
@ -7715,9 +7718,6 @@ ApplyRenderingChangeToTree(nsPresContext* aPresContext,
|
|||
nsIFrame* aFrame,
|
||||
nsChangeHint aChange)
|
||||
{
|
||||
NS_ASSERTION(!(aChange & nsChangeHint_UpdateTransformLayer) || aFrame->IsTransformed(),
|
||||
"Only transformed frames should have UpdateTransformLayer hint");
|
||||
|
||||
nsIPresShell *shell = aPresContext->PresShell();
|
||||
if (shell->IsPaintingSuppressed()) {
|
||||
// Don't allow synchronous rendering changes when painting is turned off.
|
||||
|
|
|
|||
|
|
@ -364,22 +364,6 @@ nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState)
|
|||
nscoord colGap = GetColumnGap(this, colStyle);
|
||||
PRInt32 numColumns = colStyle->mColumnCount;
|
||||
|
||||
bool isBalancing = colStyle->mColumnFill == NS_STYLE_COLUMN_FILL_BALANCE;
|
||||
if (isBalancing) {
|
||||
const PRUint32 MAX_NESTED_COLUMN_BALANCING = 5;
|
||||
PRUint32 cnt = 1;
|
||||
for (const nsHTMLReflowState* rs = aReflowState.parentReflowState;
|
||||
rs && cnt < MAX_NESTED_COLUMN_BALANCING;
|
||||
rs = rs->parentReflowState) {
|
||||
if (rs->mFlags.mIsColumnBalancing) {
|
||||
++cnt;
|
||||
}
|
||||
}
|
||||
if (cnt == MAX_NESTED_COLUMN_BALANCING) {
|
||||
numColumns = 1;
|
||||
}
|
||||
}
|
||||
|
||||
nscoord colWidth;
|
||||
if (colStyle->mColumnWidth.GetUnit() == eStyleUnit_Coord) {
|
||||
colWidth = colStyle->mColumnWidth.GetCoordValue();
|
||||
|
|
@ -433,7 +417,7 @@ nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState)
|
|||
}
|
||||
|
||||
// If column-fill is set to 'balance', then we want to balance the columns.
|
||||
if (isBalancing) {
|
||||
if (colStyle->mColumnFill == NS_STYLE_COLUMN_FILL_BALANCE) {
|
||||
// Balancing!
|
||||
|
||||
if (numColumns <= 0) {
|
||||
|
|
@ -673,7 +657,6 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
|
|||
aReflowState.ComputedHeight());
|
||||
kidReflowState.mFlags.mIsTopOfPage = true;
|
||||
kidReflowState.mFlags.mTableIsSplittable = false;
|
||||
kidReflowState.mFlags.mIsColumnBalancing = aConfig.mBalanceColCount < PR_INT32_MAX;
|
||||
|
||||
#ifdef DEBUG_roc
|
||||
printf("*** Reflowing child #%d %p: availHeight=%d\n",
|
||||
|
|
|
|||
|
|
@ -367,7 +367,7 @@ public:
|
|||
// and never insider a column frame
|
||||
PRUint16 mHeightDependsOnAncestorCell:1; // Does frame height depend on
|
||||
// an ancestor table-cell?
|
||||
PRUint16 mIsColumnBalancing:1; // nsColumnSetFrame is balancing columns
|
||||
|
||||
} mFlags;
|
||||
|
||||
private:
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче