зеркало из https://github.com/mozilla/pjs.git
Bug 192469. Reparent views for blocks-in-inlines regardless of why we created the view. r+sr=bzbarsky
This commit is contained in:
Родитель
6c042bceb9
Коммит
3f4a258f57
|
@ -13588,7 +13588,9 @@ nsCSSFrameConstructor::ConstructInline(nsIPresShell* aPresShell,
|
|||
nsHTMLContainerFrame::CreateViewForFrame(aPresContext, blockFrame,
|
||||
aStyleContext, nsnull, PR_FALSE);
|
||||
|
||||
if (aIsPositioned) {
|
||||
nsIView* view;
|
||||
blockFrame->GetView(aPresContext, &view);
|
||||
if (view) {
|
||||
// Move list2's frames into the new view
|
||||
nsIFrame* oldParent;
|
||||
list2->GetParent(&oldParent);
|
||||
|
@ -13621,7 +13623,9 @@ nsCSSFrameConstructor::ConstructInline(nsIPresShell* aPresShell,
|
|||
nsHTMLContainerFrame::CreateViewForFrame(aPresContext, inlineFrame,
|
||||
aStyleContext, nsnull, PR_FALSE);
|
||||
|
||||
if (aIsPositioned) {
|
||||
nsIView* inlineView;
|
||||
inlineFrame->GetView(aPresContext, &inlineView);
|
||||
if (inlineView) {
|
||||
// Move list3's frames into the new view
|
||||
nsIFrame* oldParent;
|
||||
list3->GetParent(&oldParent);
|
||||
|
|
|
@ -13588,7 +13588,9 @@ nsCSSFrameConstructor::ConstructInline(nsIPresShell* aPresShell,
|
|||
nsHTMLContainerFrame::CreateViewForFrame(aPresContext, blockFrame,
|
||||
aStyleContext, nsnull, PR_FALSE);
|
||||
|
||||
if (aIsPositioned) {
|
||||
nsIView* view;
|
||||
blockFrame->GetView(aPresContext, &view);
|
||||
if (view) {
|
||||
// Move list2's frames into the new view
|
||||
nsIFrame* oldParent;
|
||||
list2->GetParent(&oldParent);
|
||||
|
@ -13621,7 +13623,9 @@ nsCSSFrameConstructor::ConstructInline(nsIPresShell* aPresShell,
|
|||
nsHTMLContainerFrame::CreateViewForFrame(aPresContext, inlineFrame,
|
||||
aStyleContext, nsnull, PR_FALSE);
|
||||
|
||||
if (aIsPositioned) {
|
||||
nsIView* inlineView;
|
||||
inlineFrame->GetView(aPresContext, &inlineView);
|
||||
if (inlineView) {
|
||||
// Move list3's frames into the new view
|
||||
nsIFrame* oldParent;
|
||||
list3->GetParent(&oldParent);
|
||||
|
|
Загрузка…
Ссылка в новой задаче