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

Do bidi resolution during GetPrefWidth() and GetMinWidth() as well as Reflow(). Bug 365130, r+sr=roc

Browse Source
This commit is contained in:
smontagu@smontagu.org 2007-05-28 07:40:56 -07:00
parent 6e0c9344e7
commit d16cf8e31c
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
layout/generic/nsBlockFrame.cpp
View File

@ -637,6 +637,10 @@ nsBlockFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
AutoNoisyIndenter indent(gNoisyIntrinsic);
#endif
#ifdef IBMBIDI
ResolveBidi();
#endif // IBMBIDI
PRInt32 lineNumber = 0;
InlineMinWidthData data;
for (line_iterator line = begin_lines(), line_end = end_lines();
@ -694,6 +698,10 @@ nsBlockFrame::GetPrefWidth(nsIRenderingContext *aRenderingContext)
AutoNoisyIndenter indent(gNoisyIntrinsic);
#endif
#ifdef IBMBIDI
ResolveBidi();
#endif // IBMBIDI
PRInt32 lineNumber = 0;
InlinePrefWidthData data;
for (line_iterator line = begin_lines(), line_end = end_lines();
@ -876,16 +884,7 @@ nsBlockFrame::Reflow(nsPresContext* aPresContext,
marginRoot, marginRoot, needSpaceManager);
#ifdef IBMBIDI
if (! mLines.empty()) {
if (aPresContext->BidiEnabled()) {
nsBidiPresUtils* bidiUtils = aPresContext->GetBidiUtils();
if (bidiUtils) {
bidiUtils->Resolve(aPresContext, this,
mLines.front()->mFirstChild,
IsVisualFormControl(aPresContext));
}
}
}
ResolveBidi();
#endif // IBMBIDI
if (RenumberLists(aPresContext)) {
@ -6347,6 +6346,27 @@ nsBlockFrame::BlockNeedsSpaceManager(nsIFrame* aBlock)
// XXX keep the text-run data in the first-in-flow of the block
#ifdef IBMBIDI
nsresult
nsBlockFrame::ResolveBidi()
{
nsPresContext* presContext = PresContext();
if (!presContext->BidiEnabled()) {
return NS_OK;
}
if (mLines.empty()) {
return NS_OK;
}
nsBidiPresUtils* bidiUtils = presContext->GetBidiUtils();
if (!bidiUtils)
return NS_OK;
return bidiUtils->Resolve(presContext, this,
mLines.front()->mFirstChild,
IsVisualFormControl(presContext));
}
PRBool
nsBlockFrame::IsVisualFormControl(nsPresContext* aPresContext)
{

5
layout/generic/nsBlockFrame.h
View File

@ -355,6 +355,11 @@ protected:
nsIFrame* aPrevSibling);
#ifdef IBMBIDI
/**
* Perform Bidi resolution on this frame
*/
nsresult ResolveBidi();
/**
* Test whether the frame is a form control in a visual Bidi page.
* This is necessary for backwards-compatibility, because most visual