From e1c3131002ebf2354afa1ef7856196c87225da97 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Wed, 27 May 2015 19:11:54 -0700 Subject: [PATCH] Back out 2 changesets (bug 817406) for b2g reftest-7 bustage CLOSED TREE Backed out changeset 1499a08f564a (bug 817406) Backed out changeset d2f3cb3c0233 (bug 817406) --- layout/base/nsCSSFrameConstructor.cpp | 9 --- layout/reftests/bidi/1161752-1-embed.html | 34 --------- layout/reftests/bidi/1161752-2-embed.html | 34 --------- layout/reftests/bidi/1161752-3-embed.html | 32 -------- layout/reftests/bidi/1161752-4-embed.html | 34 --------- layout/reftests/bidi/1161752-5-embed-ref.html | 30 -------- layout/reftests/bidi/1161752-5-embed.html | 34 --------- layout/reftests/bidi/1161752-ref.html | 35 --------- layout/reftests/bidi/1161752.html | 73 ------------------- layout/reftests/bidi/817406-1-ref.html | 4 - layout/reftests/bidi/817406-1.html | 4 - layout/reftests/bidi/817406-2-ref.html | 4 - layout/reftests/bidi/817406-2.html | 4 - layout/reftests/bidi/817406-3.html | 6 -- layout/reftests/bidi/817406-4-ref.html | 6 -- layout/reftests/bidi/817406-4.html | 6 -- layout/reftests/bidi/reftest.list | 6 -- layout/style/nsStyleContext.cpp | 18 ----- 18 files changed, 373 deletions(-) delete mode 100644 layout/reftests/bidi/1161752-1-embed.html delete mode 100644 layout/reftests/bidi/1161752-2-embed.html delete mode 100644 layout/reftests/bidi/1161752-3-embed.html delete mode 100644 layout/reftests/bidi/1161752-4-embed.html delete mode 100644 layout/reftests/bidi/1161752-5-embed-ref.html delete mode 100644 layout/reftests/bidi/1161752-5-embed.html delete mode 100644 layout/reftests/bidi/1161752-ref.html delete mode 100644 layout/reftests/bidi/1161752.html delete mode 100644 layout/reftests/bidi/817406-1-ref.html delete mode 100644 layout/reftests/bidi/817406-1.html delete mode 100644 layout/reftests/bidi/817406-2-ref.html delete mode 100644 layout/reftests/bidi/817406-2.html delete mode 100644 layout/reftests/bidi/817406-3.html delete mode 100644 layout/reftests/bidi/817406-4-ref.html delete mode 100644 layout/reftests/bidi/817406-4.html diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index c2cc1e23557..667c9ad3cb5 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -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 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. diff --git a/layout/reftests/bidi/1161752-1-embed.html b/layout/reftests/bidi/1161752-1-embed.html deleted file mode 100644 index f8bae49cc41..00000000000 --- a/layout/reftests/bidi/1161752-1-embed.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - -
- - - diff --git a/layout/reftests/bidi/1161752-2-embed.html b/layout/reftests/bidi/1161752-2-embed.html deleted file mode 100644 index b6a24ce01db..00000000000 --- a/layout/reftests/bidi/1161752-2-embed.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - -
- - - diff --git a/layout/reftests/bidi/1161752-3-embed.html b/layout/reftests/bidi/1161752-3-embed.html deleted file mode 100644 index d18228fe026..00000000000 --- a/layout/reftests/bidi/1161752-3-embed.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - -
- - - diff --git a/layout/reftests/bidi/1161752-4-embed.html b/layout/reftests/bidi/1161752-4-embed.html deleted file mode 100644 index 78e0e27a1f3..00000000000 --- a/layout/reftests/bidi/1161752-4-embed.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - -
- - - diff --git a/layout/reftests/bidi/1161752-5-embed-ref.html b/layout/reftests/bidi/1161752-5-embed-ref.html deleted file mode 100644 index 138bc0327aa..00000000000 --- a/layout/reftests/bidi/1161752-5-embed-ref.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - Testcase for bug 1161752 - - - - -
- - - diff --git a/layout/reftests/bidi/1161752-5-embed.html b/layout/reftests/bidi/1161752-5-embed.html deleted file mode 100644 index 4dffa00682a..00000000000 --- a/layout/reftests/bidi/1161752-5-embed.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - -
- - - diff --git a/layout/reftests/bidi/1161752-ref.html b/layout/reftests/bidi/1161752-ref.html deleted file mode 100644 index c6ffce33fbd..00000000000 --- a/layout/reftests/bidi/1161752-ref.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - Testcase for bug 1161752 - - - - -

Test passes if there are three filled green rectangles and no red.

- - -
-
-
-
-
- - - diff --git a/layout/reftests/bidi/1161752.html b/layout/reftests/bidi/1161752.html deleted file mode 100644 index e3fa245f56f..00000000000 --- a/layout/reftests/bidi/1161752.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - Testcase for bug 1161752 - - - - - -

Test passes if there are three filled green rectangles and no red.

- - -
This test requires a browser with capability to embed an HTML document thanks to the HTML <object> element.
-
- -
This test requires a browser with capability to embed an HTML document thanks to the HTML <object> element.
-
- -
This test requires a browser with capability to embed an HTML document thanks to the HTML <object> element.
-
- -
This test requires a browser with capability to embed an HTML document thanks to the HTML <object> element.
-
- -
This test requires a browser with capability to embed an HTML document thanks to the HTML <object> element.
-
- - - diff --git a/layout/reftests/bidi/817406-1-ref.html b/layout/reftests/bidi/817406-1-ref.html deleted file mode 100644 index 1e3e7470281..00000000000 --- a/layout/reftests/bidi/817406-1-ref.html +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/layout/reftests/bidi/817406-1.html b/layout/reftests/bidi/817406-1.html deleted file mode 100644 index d01fa724e54..00000000000 --- a/layout/reftests/bidi/817406-1.html +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/layout/reftests/bidi/817406-2-ref.html b/layout/reftests/bidi/817406-2-ref.html deleted file mode 100644 index fd1f20e0cff..00000000000 --- a/layout/reftests/bidi/817406-2-ref.html +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/layout/reftests/bidi/817406-2.html b/layout/reftests/bidi/817406-2.html deleted file mode 100644 index ebc3ebb98c0..00000000000 --- a/layout/reftests/bidi/817406-2.html +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/layout/reftests/bidi/817406-3.html b/layout/reftests/bidi/817406-3.html deleted file mode 100644 index 90313bde4a6..00000000000 --- a/layout/reftests/bidi/817406-3.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -
- - diff --git a/layout/reftests/bidi/817406-4-ref.html b/layout/reftests/bidi/817406-4-ref.html deleted file mode 100644 index e6e1c8d1fa4..00000000000 --- a/layout/reftests/bidi/817406-4-ref.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -
- - diff --git a/layout/reftests/bidi/817406-4.html b/layout/reftests/bidi/817406-4.html deleted file mode 100644 index 3e90274248b..00000000000 --- a/layout/reftests/bidi/817406-4.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -
- - diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list index 40a1c196491..61ded927a9f 100644 --- a/layout/reftests/bidi/reftest.list +++ b/layout/reftests/bidi/reftest.list @@ -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 diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp index 0205b37abed..7746215c927 100644 --- a/layout/style/nsStyleContext.cpp +++ b/layout/style/nsStyleContext.cpp @@ -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 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) {