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

Back out 2 changesets (bug 817406) for b2g reftest-7 bustage

Browse Source 
CLOSED TREE

Backed out changeset 1499a08f564a (bug 817406)
Backed out changeset d2f3cb3c0233 (bug 817406)
This commit is contained in:
Phil Ringnalda 2015-05-27 19:11:54 -07:00
parent 1acfd64819
commit e1c3131002
18 changed files with 0 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/base/nsCSSFrameConstructor.cpp
View File

@ -2395,15 +2395,6 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle
MOZ_ASSERT(!mDocElementContainingBlock,
"Shouldn't have a doc element containing block here");
// Resolve a new style context for the viewport since it may be affected
// by a new root element style (e.g. a propagated 'direction').
// @see nsStyleContext::ApplyStyleFixups
{
nsRefPtr<nsStyleContext> sc = mPresShell->StyleSet()->
ResolveAnonymousBoxStyle(nsCSSAnonBoxes::viewport, nullptr);
GetRootFrame()->SetStyleContextWithoutNotification(sc);
}
// Make sure to call PropagateScrollToViewport before
// SetUpDocElementContainingBlock, since it sets up our scrollbar state
// properly.

34
layout/reftests/bidi/1161752-1-embed.html
View File

@ -1,34 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<style type="text/css">
html { direction: ltr; }
div
{
background-color: green;
border-left: green none 0px;
border-right: green none 0px;
height: 50px;
left: 20%;
margin-left: 0px;
margin-right: 0px;
position: absolute;
right: 20%;
top: 0px;
width: 20%;
}
</style>
</head>
<body>
<div></div>
</body>
</html>

34
layout/reftests/bidi/1161752-2-embed.html
View File

@ -1,34 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<style type="text/css">
html { direction: rtl; }
div
{
background-color: green;
border-left: green none 0px;
border-right: green none 0px;
height: 50px;
left: 20%;
margin-left: 0px;
margin-right: 0px;
position: absolute;
right: 20%;
top: 0px;
width: 20%;
}
</style>
</head>
<body>
<div></div>
</body>
</html>

32
layout/reftests/bidi/1161752-3-embed.html
View File

@ -1,32 +0,0 @@
<!DOCTYPE html>
<html dir="ltr">
<head>
<meta charset="utf-8">
<title></title>
<style type="text/css">
div
{
background-color: green;
border-left: green none 0px;
border-right: green none 0px;
height: 50px;
left: 20%;
margin-left: 0px;
margin-right: 0px;
position: absolute;
right: 20%;
top: 0px;
width: 20%;
}
</style>
</head>
<body>
<div></div>
</body>
</html>

34
layout/reftests/bidi/1161752-4-embed.html
View File

@ -1,34 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<style type="text/css">
html { direction: ltr; }
div
{
background-color: green;
border-left: green none 0px;
border-right: green none 0px;
height: 50px;
left: 20%;
margin-left: 0px;
margin-right: 0px;
position: fixed;
right: 20%;
top: 0px;
width: 20%;
}
</style>
</head>
<body>
<div></div>
</body>
</html>

30
layout/reftests/bidi/1161752-5-embed-ref.html
View File

@ -1,30 +0,0 @@
<!DOCTYPE html>
<html class="reftest-print">
<head>
<title>Testcase for bug 1161752</title>
<style>
body,html { margin:0; padding:0; }
div
{
height: 56px;
width: 100px;
vertical-align: top;
margin-bottom: 50px;
margin-right: 100px;
margin-left: auto;
}
div div
{
height: 50px;
width: 100px;
background-color: green;
}
</style>
</head>
<body>
<div><div></div></div>
</body>
</html>

34
layout/reftests/bidi/1161752-5-embed.html
View File

@ -1,34 +0,0 @@
<!DOCTYPE html>
<html class="reftest-print">
<head>
<meta charset="utf-8">
<title></title>
<style type="text/css">
html { direction: rtl; }
div
{
background-color: green;
border-left: green none 0px;
border-right: green none 0px;
height: 50px;
left: 100px;
margin-left: 0px;
margin-right: 0px;
position: fixed;
right: 100px;
top: 0px;
width: 100px;
}
</style>
</head>
<body>
<div></div>
</body>
</html>

35
layout/reftests/bidi/1161752-ref.html
View File

@ -1,35 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>Testcase for bug 1161752</title>
<style>
div
{
height: 56px;
width: 100px;
vertical-align: top;
margin-bottom: 50px;
}
div div
{
height: 50px;
width: 100px;
background-color: green;
margin-left: 300px;
}
</style>
</head>
<body>
<p>Test passes if there are three filled green rectangles and <strong>no red</strong>.</p>
<div><div></div></div>
<div><div></div></div>
<div><div></div></div>
<div><div></div></div>
<div><div></div></div>
</body>
</html>

73
layout/reftests/bidi/1161752.html
View File

@ -1,73 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>Testcase for bug 1161752</title>
<style>
object.overlapping-green
{
height: 56px;
width: 500px;
vertical-align: top;
}
div.red-overlapped-reference
{
background-color: red;
bottom: 56px;
height: 50px;
left: 300px;
position: relative;
width: 100px;
z-index: -1;
}
</style>
<script>
function runTest1() {
var root = document.querySelector('#test1').contentDocument.documentElement;
root.style.direction='rtl';
root.offsetHeight;
}
function runTest2() {
var root = document.querySelector('#test2').contentDocument.documentElement;
root.style.display='none';
root.offsetHeight;
root.style.display='block';
root.offsetHeight;
}
function runTest3() {
var doc = document.querySelector('#test3').contentDocument;
var root = doc.documentElement;
doc.removeChild(root);
var newRoot = root.cloneNode(true);
newRoot.setAttribute('dir','rtl');
doc.appendChild(newRoot);
}
function runTest4() {
var root = document.querySelector('#test4').contentDocument.documentElement;
root.style.direction='rtl';
root.offsetHeight;
}
</script>
</head>
<body>
<p>Test passes if there are three filled green rectangles and <strong>no red</strong>.</p>
<div><object id="test1" data="1161752-1-embed.html" type="text/html" class="overlapping-green" onload="runTest1()">This test requires a browser with capability to embed an HTML document thanks to the HTML &lt;object&gt; element.</object></div>
<div class="red-overlapped-reference"></div>
<div><object id="test2" data="1161752-2-embed.html" type="text/html" class="overlapping-green" onload="runTest2()">This test requires a browser with capability to embed an HTML document thanks to the HTML &lt;object&gt; element.</object></div>
<div class="red-overlapped-reference"></div>
<div><object id="test3" data="1161752-3-embed.html" type="text/html" class="overlapping-green" onload="runTest3()">This test requires a browser with capability to embed an HTML document thanks to the HTML &lt;object&gt; element.</object></div>
<div class="red-overlapped-reference"></div>
<div><object id="test4" data="1161752-4-embed.html" type="text/html" class="overlapping-green" onload="runTest4()">This test requires a browser with capability to embed an HTML document thanks to the HTML &lt;object&gt; element.</object></div>
<div class="red-overlapped-reference"></div>
<div><object id="test5" data="1161752-5-embed.html" type="text/html" class="overlapping-green">This test requires a browser with capability to embed an HTML document thanks to the HTML &lt;object&gt; element.</object></div>
<div class="red-overlapped-reference"></div>
</body>
</html>

4
layout/reftests/bidi/817406-1-ref.html
View File

@ -1,4 +0,0 @@
<!DOCTYPE html>
<html style="width: 50%; margin-left: auto;">
<div style="background: green; height: 10em;"></div>
</html>

4
layout/reftests/bidi/817406-1.html
View File

@ -1,4 +0,0 @@
<!DOCTYPE html>
<html dir="rtl" style="width: 50%;">
<div style="background: green; height: 10em;"></div>
</html>

4
layout/reftests/bidi/817406-2-ref.html
View File

@ -1,4 +0,0 @@
<!DOCTYPE html>
<html style="width: 50%; right: 0; position: absolute;">
<div style="background: green; height: 10em;"></div>
</html>

4
layout/reftests/bidi/817406-2.html
View File

@ -1,4 +0,0 @@
<!DOCTYPE html>
<html style="width: 50%; direction: rtl; position: absolute;">
<div style="background: green; height: 10em;"></div>
</html>

6
layout/reftests/bidi/817406-3.html
View File

@ -1,6 +0,0 @@
<!DOCTYPE html>
<html style="width: 50%;">
<body onload="document.documentElement.dir = 'rtl'">
<div style="background: green; height: 10em;"></div>
</body>
</html>

6
layout/reftests/bidi/817406-4-ref.html
View File

@ -1,6 +0,0 @@
<!DOCTYPE html>
<html style="width: 50%;">
<body style="">
<div style="background: green; height: 10em;"></div>
</body>
</html>

6
layout/reftests/bidi/817406-4.html
View File

@ -1,6 +0,0 @@
<!DOCTYPE html>
<html style="width: 50%;">
<body style="direction: rtl;">
<div style="background: green; height: 10em;"></div>
</body>
</html>

6
layout/reftests/bidi/reftest.list
View File

@ -139,10 +139,6 @@ skip-if(B2G||Mulet) == 726420-1.html 726420-1-ref.html # Initial mulet triage: p
== 746987-4.html 746987-4-ref.html
== 779003-1.html 779003-1-ref.html
== 779003-1-dynamic.html 779003-1-ref.html
== 817406-1.html 817406-1-ref.html
== 817406-2.html 817406-2-ref.html
== 817406-3.html 817406-1-ref.html
== 817406-4.html 817406-4-ref.html
== 847242-1.html 847242-1-ref.html
skip-if((B2G&&browserIsRemote)||Mulet) == 869833-1.xul 869833-1-ref.xul # Initial mulet triage: parity with B2G/B2G Desktop
== 922530-1.html 922530-1-ref.html
@ -152,5 +148,3 @@ skip-if((B2G&&browserIsRemote)||Mulet) == 869833-1.xul 869833-1-ref.xul # Initia
== 1069941-inline-bidi-margin-1.html 1069941-inline-bidi-margin-1-ref.html
skip-if(B2G||Mulet) != 1155359-1.xul 1155359-1-ref.xul
== 1157726-1.html 1157726-1-ref.html
== 1161752.html 1161752-ref.html
== 1161752-5-embed.html 1161752-5-embed-ref.html

18
layout/style/nsStyleContext.cpp
View File

@ -448,7 +448,6 @@ nsStyleContext::GetUniqueStyleData(const nsStyleStructID& aSID)
UNIQUE_CASE(Display)
UNIQUE_CASE(Text)
UNIQUE_CASE(TextReset)
UNIQUE_CASE(Visibility)
#undef UNIQUE_CASE
@ -594,23 +593,6 @@ nsStyleContext::ApplyStyleFixups(bool aSkipParentDisplayBasedStyleFixup)
mBits |= NS_STYLE_HAS_PSEUDO_ELEMENT_DATA;
}
// CSS 2.1 10.1: Propagate the root element's 'direction' to the ICB.
// (PageContentFrame/CanvasFrame etc will inherit 'direction')
if (mPseudoTag == nsCSSAnonBoxes::viewport) {
nsPresContext* presContext = PresContext();
mozilla::dom::Element* docElement = presContext->Document()->GetRootElement();
if (docElement) {
nsRefPtr<nsStyleContext> rootStyle =
presContext->StyleSet()->ResolveStyleFor(docElement, nullptr);
auto dir = rootStyle->StyleVisibility()->mDirection;
if (dir != StyleVisibility()->mDirection) {
nsStyleVisibility* uniqueVisibility =
(nsStyleVisibility*)GetUniqueStyleData(eStyleStruct_Visibility);
uniqueVisibility->mDirection = dir;
}
}
}
// Correct tables.
const nsStyleDisplay* disp = StyleDisplay();
if (disp->mDisplay == NS_STYLE_DISPLAY_TABLE) {