Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 18:24:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1030993 - Fix assertion failure in reftest css-ruby/ruby-whitespace-1.html. r=dbaron

Browse Source 
Fixes the assertion failure with text:
"###!!! ASSERTION: Wrong line container
hint: '!aForFrame || (aLineContainer == FindLineContainer(aForFrame) ||
aLineContainer->GetType() == nsGkAtoms::rubyTextContainerFrame ||
(aLineContainer->GetType() == nsGkAtoms::letterFrame &&
aLineContainer->IsFloating()))', file
/home/sgbowen/builds/mozilla-central/layout/generic/nsTextFrame.cpp, line 1259"
which occasionally appears when opening pages with ruby or when running ruby
reftests.

Updates the manifest for ruby reftests to the current expectations (adjust
assertion counts, etc.)
This commit is contained in:
Susanna Bowen 2014-08-15 10:34:20 -07:00
parent aca0a15a6a
commit c622b18e05
10 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/nsCSSFrameConstructor.cpp
View File

@ -4577,7 +4577,8 @@ nsCSSFrameConstructor::FindDisplayData(const nsStyleDisplay* aDisplay,
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRubyBaseContainer),
NS_NewRubyBaseFrame) },
{ NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER,
FCDATA_DECL(FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRuby),
FCDATA_DECL(FCDATA_IS_LINE_PARTICIPANT |
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRuby),
NS_NewRubyBaseContainerFrame) },
{ NS_STYLE_DISPLAY_RUBY_TEXT,
FCDATA_DECL(FCDATA_IS_LINE_PARTICIPANT |
@ -9105,7 +9106,8 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
&nsCSSAnonBoxes::rubyBase
},
{ // Ruby Base Container
FCDATA_DECL(FCDATA_USE_CHILD_ITEMS |
FCDATA_DECL(FCDATA_USE_CHILD_ITEMS |
FCDATA_IS_LINE_PARTICIPANT |
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRuby) |
FCDATA_SKIP_FRAMESET,
NS_NewRubyBaseContainerFrame),

12
layout/generic/nsRubyBaseContainerFrame.cpp
View File

@ -52,6 +52,12 @@ nsRubyBaseContainerFrame::GetFrameName(nsAString& aResult) const
}
#endif
/* virtual */ bool
nsRubyBaseContainerFrame::IsFrameOfType(uint32_t aFlags) const
{
return nsContainerFrame::IsFrameOfType(aFlags &
~(nsIFrame::eLineParticipant));
}
void nsRubyBaseContainerFrame::AppendTextContainer(nsIFrame* aFrame)
{
@ -65,6 +71,12 @@ void nsRubyBaseContainerFrame::ClearTextContainers() {
mTextContainers.Clear();
}
/* virtual */ bool
nsRubyBaseContainerFrame::CanContinueTextRun() const
{
return true;
}
/* virtual */ void
nsRubyBaseContainerFrame::Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,

2
layout/generic/nsRubyBaseContainerFrame.h
View File

@ -30,6 +30,8 @@ public:
// nsIFrame overrides
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
virtual void Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,

6
layout/generic/nsRubyBaseFrame.cpp
View File

@ -95,6 +95,12 @@ nsRubyBaseFrame::GetLogicalBaseline(WritingMode aWritingMode) const
return mBaseline;
}
/* virtual */ bool
nsRubyBaseFrame::CanContinueTextRun() const
{
return true;
}
/* virtual */ void
nsRubyBaseFrame::Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,

1
layout/generic/nsRubyBaseFrame.h
View File

@ -40,6 +40,7 @@ public:
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual nscoord GetLogicalBaseline(mozilla::WritingMode aWritingMode)
const MOZ_OVERRIDE;
virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;

6
layout/generic/nsRubyFrame.cpp
View File

@ -164,6 +164,12 @@ nsRubyFrame::GetLogicalBaseline(WritingMode aWritingMode) const
return mBaseline;
}
/* virtual */ bool
nsRubyFrame::CanContinueTextRun() const
{
return true;
}
/* virtual */ void
nsRubyFrame::Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,

1
layout/generic/nsRubyFrame.h
View File

@ -38,6 +38,7 @@ public:
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual nscoord GetLogicalBaseline(mozilla::WritingMode aWritingMode)
const MOZ_OVERRIDE;
virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;

10
layout/generic/nsRubyTextFrame.cpp
View File

@ -75,9 +75,6 @@ nsRubyTextFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
nsRubyTextFrame::AddInlineMinISize(nsRenderingContext *aRenderingContext,
nsIFrame::InlineMinISizeData *aData)
{
// FIXME: See the fixme in AddInlinePrefISize.
aData->lineContainer = this;
for (nsFrameList::Enumerator e(PrincipalChildList()); !e.AtEnd(); e.Next()) {
e.get()->AddInlineMinISize(aRenderingContext, aData);
}
@ -87,13 +84,6 @@ nsRubyTextFrame::AddInlineMinISize(nsRenderingContext *aRenderingContext,
nsRubyTextFrame::AddInlinePrefISize(nsRenderingContext *aRenderingContext,
nsIFrame::InlinePrefISizeData *aData)
{
// FIXME: We shouldn't need to set this, but it prevents us from tripping an
// assertion in nsTextFrame.cpp because FindLineContainer on a child frame will
// return the ruby text box (us) instead of the ruby text container (our
// parent). A fix would need to be made to FindLineContainer and/or
// CanContinueTextRun so that this line can be removed.
aData->lineContainer = this;
for (nsFrameList::Enumerator e(PrincipalChildList()); !e.AtEnd(); e.Next()) {
e.get()->AddInlinePrefISize(aRenderingContext, aData);
}

6
layout/generic/nsTextFrame.cpp
View File

@ -1026,7 +1026,8 @@ private:
static nsIFrame*
FindLineContainer(nsIFrame* aFrame)
{
while (aFrame && aFrame->CanContinueTextRun()) {
while (aFrame && (aFrame->IsFrameOfType(nsIFrame::eLineParticipant) ||
aFrame->CanContinueTextRun())) {
aFrame = aFrame->GetParent();
}
return aFrame;
@ -1131,7 +1132,8 @@ CanTextCrossFrameBoundary(nsIFrame* aFrame, nsIAtom* aType)
result.mScanSiblings = true;
result.mTextRunCanCrossFrameBoundary = true;
result.mLineBreakerCanCrossFrameBoundary = true;
} else if (aFrame->GetType() == nsGkAtoms::rubyTextFrame) {
} else if (aFrame->GetType() == nsGkAtoms::rubyTextFrame ||
aFrame->GetType() == nsGkAtoms::rubyTextContainerFrame) {
result.mFrameToScan = aFrame->GetFirstPrincipalChild();
result.mOverflowFrameToScan =
aFrame->GetFirstChild(nsIFrame::kOverflowList);

2
layout/reftests/css-ruby/reftest.list
View File

@ -1,4 +1,4 @@
default-preferences pref(layout.css.ruby.enabled,true)
asserts(1) == ruby-whitespace-1.html ruby-whitespace-1-ref.html # bug 1052145
fails asserts(3-7) == ruby-whitespace-1.html ruby-whitespace-1-ref.html # bug 1052924
== ruby-whitespace-2.html ruby-whitespace-2-ref.html