Attachment 555962 Details for Bug 613149

[patch] Some extra cleanup

613149.layout.extra.diff (text/plain), 2.47 KB, created by Simon Montagu :smontagu

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Montagu :smontagu

Size: 2.47 KB

patch

obsolete

># HG changeset patch
># User Simon Montagu <smontagu@smontagu.org>
># Date 1314336841 -10800
># Node ID 85acedc965ef1d103d5aa3ceb98bbcb2a62b828d
># Parent  dbd6b7fe7bb089078bfcedda94c9c666c94990b0
>[mq]: 613149.layout.extra
>
>diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
>--- a/layout/base/nsBidiPresUtils.cpp
>+++ b/layout/base/nsBidiPresUtils.cpp
>@@ -267,40 +267,40 @@ struct BidiParagraphData {
>   nsIFrame* FrameAt(PRInt32 aIndex){ return mLogicalFrames[aIndex]; }
> 
>   nsLineBox* GetLineForFrameAt(PRInt32 aIndex){ return mLinePerFrame[aIndex]; }
> 
>   void AppendUnichar(PRUnichar aCh){ mBuffer.Append(aCh); }
> 
>   void AppendString(const nsDependentSubstring& aString){ mBuffer.Append(aString); }
> 
>-  void AppendUnicharFrame(nsIFrame* aFrame, PRUnichar aCh)
>+  void AppendControlCharFrame(PRUnichar aCh)
>   {
>-    mLogicalFrames.AppendElement(aFrame);
>+    mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
>     mLinePerFrame.AppendElement((nsLineBox*)nsnull);
>     AppendUnichar(aCh);
>   }
> 
>   void PushBidiControl(PRUnichar aCh)
>   {
>-    AppendUnicharFrame(NS_BIDI_CONTROL_FRAME, aCh);
>+    AppendControlCharFrame(aCh);
>     mEmbeddingStack.AppendElement(aCh);
>   }
> 
>   void PopBidiControl()
>   {
>-    AppendUnicharFrame(NS_BIDI_CONTROL_FRAME, kPDF);
>+    AppendControlCharFrame(kPDF);
>     NS_ASSERTION(mEmbeddingStack.Length(), "embedding/override underflow");
>     mEmbeddingStack.TruncateLength(mEmbeddingStack.Length() - 1);
>   }
> 
>   void ClearBidiControls()
>   {
>     for (PRUint32 i = 0; i < mEmbeddingStack.Length(); ++i) {
>-      AppendUnicharFrame(NS_BIDI_CONTROL_FRAME, kPDF);
>+      AppendControlCharFrame(kPDF);
>     }
>   }
> 
>   nsBidiLevel NextOddLevel(nsBidiLevel aLevel)
>   {
>     return (aLevel + 1) | 1;
>   }
> 
>@@ -1093,18 +1093,17 @@ nsBidiPresUtils::TraverseFrames(nsBlockF
>         // last frame of an element specifying embedding or override
>         aBpd->PopBidiControl();
>       }
>       if (aContainingParagraph) {
>         ResolveParagraph(aBlockFrame, aBpd);
> 
>         // Treat an element with unicode-bidi: isolate as a neutral character
>         // within its containing paragraph
>-        aContainingParagraph->AppendUnicharFrame(NS_BIDI_CONTROL_FRAME,
>-                                                kObjectSubstitute);
>+        aContainingParagraph->AppendControlCharFrame(kObjectSubstitute);
>       }
>     }
>     childFrame = nextSibling;
>   } while (childFrame);
> }
> 
> void
> nsBidiPresUtils::ResolveParagraphWithinBlock(nsBlockFrame* aBlockFrame,

Flags:

roc: review+

Actions: View | Diff | Review

Attachments on bug 613149: 525110 | 525114 | 525116 | 536698 | 537430 | 555742 | 555776 | 555958 | 555962