Changeset 24485 in webkit

Timestamp:

Jul 20, 2007 12:01:55 PM (17 years ago)

Author:

pewtermoose

Message:

2007-07-20 Mitz Pettel <​mitz@webkit.org>

Reviewed by Darin.

• ​http://bugs.webkit.org/show_bug.cgi?id=14626 Make bidiReorderCharacters independent of RenderBlock

No layout test possible because there is no change in functionality.

This patch generalizes RenderBlock's implementation of the Unicode Bidi Algorithm
in the form of the BidiResolver class template. An instance of a BidiResolver class
can generate a sequence of runs with corresponding level and override attributes,
given a range specified by start and end iterators. The iterators can optionally
call back to the BidiResolver instance to push or pop explicit embedding levels.

The patch replaces BidiState with a specialization of BidiResolver that uses
BidiIterators and generates BidiRuns. It also eliminates some of the file statics
in bidi.cpp, instead relying on BidiResolver data members.

The patch makes the BidiContext part of BidiStatus, thus making BidiStatus the
entire state that needs to be saved and restored in order to restart the bidi
algorithm at a given point. Previously, you had to keep and pass around two
separate structures, namely the BidiContext and the BidiStatus.

bidiReorderCharacters is implemented without relying on render objects, using
a BidiResolver specialization that uses simple character buffer iterators and
simple run structures.

• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• WebCoreSources.bkl:
• platform/BidiContext.cpp: Added. (WebCore::operator==):
• platform/BidiContext.h: Added. (WebCore::BidiContext::BidiContext): (WebCore::BidiContext::ref): (WebCore::BidiContext::deref): (WebCore::BidiContext::parent): (WebCore::BidiContext::level): (WebCore::BidiContext::dir): (WebCore::BidiContext::override):
• platform/BidiReorderCharacters.cpp: Added. (WebCore::CharacterBufferIterator::CharacterBufferIterator): (WebCore::CharacterBufferIterator::offset): (WebCore::CharacterBufferIterator::increment): (WebCore::CharacterBufferIterator::atEnd): (WebCore::CharacterBufferIterator::current): (WebCore::CharacterBufferIterator::direction): (WebCore::CharacterBufferIterator::operator==): (WebCore::CharacterBufferIterator::operator!=): (WebCore::::appendRun): (WebCore::bidiReorderCharacters):
• platform/BidiReorderCharacters.h: Added.
• platform/BidiResolver.h: Added. (WebCore::BidiStatus::BidiStatus): (WebCore::operator==): (WebCore::operator!=): (WebCore::BidiCharacterRun::BidiCharacterRun): (WebCore::BidiCharacterRun::reversed): (WebCore::BidiCharacterRun::dirOverride): (WebCore::BidiCharacterRun::next): (WebCore::BidiResolver::): (WebCore::BidiResolver::context): (WebCore::BidiResolver::setContext): (WebCore::BidiResolver::setLastDir): (WebCore::BidiResolver::setLastStrongDir): (WebCore::BidiResolver::setEorDir): (WebCore::BidiResolver::dir): (WebCore::BidiResolver::setDir): (WebCore::BidiResolver::status): (WebCore::BidiResolver::setStatus): (WebCore::BidiResolver::adjustEmbedding): (WebCore::BidiResolver::setAdjustEmbedding): (WebCore::BidiResolver::firstRun): (WebCore::BidiResolver::lastRun): (WebCore::BidiResolver::runCount): (WebCore::::embed): (WebCore::::deleteRuns): (WebCore::::reverseRuns): (WebCore::::createBidiRunsForLine):
• platform/win/PopupMenuWin.cpp: (WebCore::PopupMenu::paint):
• rendering/RenderBlock.h:
• rendering/RenderFileUploadControl.cpp: (WebCore::RenderFileUploadControl::paintObject):
• rendering/RenderListBox.cpp: (WebCore::RenderListBox::paintItemForeground):
• rendering/RootInlineBox.cpp: (WebCore::RootInlineBox::childRemoved): (WebCore::RootInlineBox::lineBreakBidiStatus): (WebCore::RootInlineBox::setLineBreakInfo):
• rendering/RootInlineBox.h: (WebCore::RootInlineBox::RootInlineBox):
• rendering/bidi.cpp: (WebCore::BidiIterator::BidiIterator): (WebCore::BidiState::deleteRuns): (WebCore::operator==): (WebCore::operator!=): (WebCore::bidiNext): (WebCore::bidiFirst): (WebCore::BidiState::addRun): (WebCore::appendRunsForObject): (WebCore::BidiState::appendRun): (WebCore::RenderBlock::constructLine): (WebCore::RenderBlock::computeHorizontalPositionsForLine): (WebCore::RenderBlock::computeVerticalPositionsForLine): (WebCore::RenderBlock::bidiReorderLine): (WebCore::buildCompactRuns): (WebCore::RenderBlock::layoutInlineChildren): (WebCore::RenderBlock::determineStartPosition): (WebCore::RenderBlock::determineEndPosition): (WebCore::RenderBlock::matchedEndLine): (WebCore::RenderBlock::skipWhitespace):
• rendering/bidi.h: (WebCore::BidiRun::BidiRun): (WebCore::BidiRun::next):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pro (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (8 diffs)
• WebCoreSources.bkl (modified) (1 diff)
• platform/BidiContext.cpp (added)
• platform/BidiContext.h (added)
• platform/BidiReorderCharacters.cpp (added)
• platform/BidiReorderCharacters.h (added)
• platform/BidiResolver.h (added)
• platform/win/PopupMenuWin.cpp (modified) (3 diffs)
• rendering/RenderBlock.h (modified) (4 diffs)
• rendering/RenderFileUploadControl.cpp (modified) (3 diffs)
• rendering/RenderListBox.cpp (modified) (3 diffs)
• rendering/RootInlineBox.cpp (modified) (3 diffs)
• rendering/RootInlineBox.h (modified) (4 diffs)
• rendering/bidi.cpp (modified) (44 diffs)
• rendering/bidi.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-20  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - http://bugs.webkit.org/show_bug.cgi?id=14626
+          Make bidiReorderCharacters independent of RenderBlock
+
+        No layout test possible because there is no change in functionality.
+
+        This patch generalizes RenderBlock's implementation of the Unicode Bidi Algorithm
+        in the form of the BidiResolver class template. An instance of a BidiResolver class
+        can generate a sequence of runs with corresponding level and override attributes,
+        given a range specified by start and end iterators. The iterators can optionally
+        call back to the BidiResolver instance to push or pop explicit embedding levels.
+
+        The patch replaces BidiState with a specialization of BidiResolver that uses
+        BidiIterators and generates BidiRuns. It also eliminates some of the file statics
+        in bidi.cpp, instead relying on BidiResolver data members.
+
+        The patch makes the BidiContext part of BidiStatus, thus making BidiStatus the
+        entire state that needs to be saved and restored in order to restart the bidi
+        algorithm at a given point. Previously, you had to keep and pass around two
+        separate structures, namely the BidiContext and the BidiStatus.
+
+        bidiReorderCharacters is implemented without relying on render objects, using
+        a BidiResolver specialization that uses simple character buffer iterators and
+        simple run structures.
+
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * platform/BidiContext.cpp: Added.
+        (WebCore::operator==):
+        * platform/BidiContext.h: Added.
+        (WebCore::BidiContext::BidiContext):
+        (WebCore::BidiContext::ref):
+        (WebCore::BidiContext::deref):
+        (WebCore::BidiContext::parent):
+        (WebCore::BidiContext::level):
+        (WebCore::BidiContext::dir):
+        (WebCore::BidiContext::override):
+        * platform/BidiReorderCharacters.cpp: Added.
+        (WebCore::CharacterBufferIterator::CharacterBufferIterator):
+        (WebCore::CharacterBufferIterator::offset):
+        (WebCore::CharacterBufferIterator::increment):
+        (WebCore::CharacterBufferIterator::atEnd):
+        (WebCore::CharacterBufferIterator::current):
+        (WebCore::CharacterBufferIterator::direction):
+        (WebCore::CharacterBufferIterator::operator==):
+        (WebCore::CharacterBufferIterator::operator!=):
+        (WebCore::::appendRun):
+        (WebCore::bidiReorderCharacters):
+        * platform/BidiReorderCharacters.h: Added.
+        * platform/BidiResolver.h: Added.
+        (WebCore::BidiStatus::BidiStatus):
+        (WebCore::operator==):
+        (WebCore::operator!=):
+        (WebCore::BidiCharacterRun::BidiCharacterRun):
+        (WebCore::BidiCharacterRun::reversed):
+        (WebCore::BidiCharacterRun::dirOverride):
+        (WebCore::BidiCharacterRun::next):
+        (WebCore::BidiResolver::):
+        (WebCore::BidiResolver::context):
+        (WebCore::BidiResolver::setContext):
+        (WebCore::BidiResolver::setLastDir):
+        (WebCore::BidiResolver::setLastStrongDir):
+        (WebCore::BidiResolver::setEorDir):
+        (WebCore::BidiResolver::dir):
+        (WebCore::BidiResolver::setDir):
+        (WebCore::BidiResolver::status):
+        (WebCore::BidiResolver::setStatus):
+        (WebCore::BidiResolver::adjustEmbedding):
+        (WebCore::BidiResolver::setAdjustEmbedding):
+        (WebCore::BidiResolver::firstRun):
+        (WebCore::BidiResolver::lastRun):
+        (WebCore::BidiResolver::runCount):
+        (WebCore::::embed):
+        (WebCore::::deleteRuns):
+        (WebCore::::reverseRuns):
+        (WebCore::::createBidiRunsForLine):
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::paint):
+        * rendering/RenderBlock.h:
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::RenderFileUploadControl::paintObject):
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::paintItemForeground):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::childRemoved):
+        (WebCore::RootInlineBox::lineBreakBidiStatus):
+        (WebCore::RootInlineBox::setLineBreakInfo):
+        * rendering/RootInlineBox.h:
+        (WebCore::RootInlineBox::RootInlineBox):
+        * rendering/bidi.cpp:
+        (WebCore::BidiIterator::BidiIterator):
+        (WebCore::BidiState::deleteRuns):
+        (WebCore::operator==):
+        (WebCore::operator!=):
+        (WebCore::bidiNext):
+        (WebCore::bidiFirst):
+        (WebCore::BidiState::addRun):
+        (WebCore::appendRunsForObject):
+        (WebCore::BidiState::appendRun):
+        (WebCore::RenderBlock::constructLine):
+        (WebCore::RenderBlock::computeHorizontalPositionsForLine):
+        (WebCore::RenderBlock::computeVerticalPositionsForLine):
+        (WebCore::RenderBlock::bidiReorderLine):
+        (WebCore::buildCompactRuns):
+        (WebCore::RenderBlock::layoutInlineChildren):
+        (WebCore::RenderBlock::determineStartPosition):
+        (WebCore::RenderBlock::determineEndPosition):
+        (WebCore::RenderBlock::matchedEndLine):
+        (WebCore::RenderBlock::skipWhitespace):
+        * rendering/bidi.h:
+        (WebCore::BidiRun::BidiRun):
+        (WebCore::BidiRun::next):
+
 2007-07-20  Darin Adler  <darin@apple.com>
 

trunk/WebCore/WebCore.pro

@@ -587 +587 @@
     platform/AtomicString.cpp \
     platform/Base64.cpp \
+    platform/BidiContext.cpp \
+    platform/BidiReorderCharacters.cpp \
     platform/ContextMenu.cpp \
     platform/CString.cpp \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -2888 +2888 @@
                         <File
                                 RelativePath="..\platform\Base64.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\platform\BidiContext.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\platform\BidiContext.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\platform\BidiReorderCharacters.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\platform\BidiReorderCharacters.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\platform\BidiResolver.h"
                                 >
                         </File>

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -280 +280 @@
                 37919C230B7D188600A56998 /* PositionIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37919C210B7D188600A56998 /* PositionIterator.cpp */; };
                 37919C240B7D188600A56998 /* PositionIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 37919C220B7D188600A56998 /* PositionIterator.h */; settings = {ATTRIBUTES = (); }; };
+                0F31CBF92B654730BA0535E8 /* BidiContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 514AF320BE854014A7DA49FB /* BidiContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                F971E27FD70F4382BC66D792 /* BidiContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A579C284B928484FB9A446BC /* BidiContext.cpp */; };
                 448A29BF0A46D9CB0030759F /* JSHTMLOptionsCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */; };
                 448A29C00A46D9CB0030759F /* JSHTMLOptionsCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 448A29BE0A46D9CB0030759F /* JSHTMLOptionsCollection.cpp */; };
@@ -2725 +2727 @@
                 B2FA3E180AB75A6F000E5AC4 /* JSSVGZoomEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3D300AB75A6F000E5AC4 /* JSSVGZoomEvent.cpp */; };
                 B2FA3E190AB75A6F000E5AC4 /* JSSVGZoomEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3D310AB75A6F000E5AC4 /* JSSVGZoomEvent.h */; };
+                B402007C0C4D217800210AA6 /* BidiReorderCharacters.h in Headers */ = {isa = PBXBuildFile; fileRef = B402007A0C4D217800210AA6 /* BidiReorderCharacters.h */; };
+                B402007D0C4D217800210AA6 /* BidiReorderCharacters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B402007B0C4D217800210AA6 /* BidiReorderCharacters.cpp */; };
+                B402FD0B0C4C9C3900210AA6 /* BidiResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = B402FD090C4C9C3900210AA6 /* BidiResolver.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 BC066F6F09FEB2FA00C589A7 /* WebCoreTextRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = BC066F6C09FEB2FA00C589A7 /* WebCoreTextRenderer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 BC06ED060BFD5BAE00856E9D /* JSHTMLTableSectionElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06ED040BFD5BAE00856E9D /* JSHTMLTableSectionElement.cpp */; };
@@ -2911 +2916 @@
                 BCEA4790097CAAC80094C9E4 /* CSSComputedStyleDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA477D097CAAC80094C9E4 /* CSSComputedStyleDeclaration.h */; };
                 BCEA4852097D93020094C9E4 /* bidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4813097D93020094C9E4 /* bidi.cpp */; };
-                BCEA4853097D93020094C9E4 /* bidi.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4814097D93020094C9E4 /* bidi.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                BCEA4853097D93020094C9E4 /* bidi.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4814097D93020094C9E4 /* bidi.h */; };
                 BCEA4854097D93020094C9E4 /* break_lines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4815097D93020094C9E4 /* break_lines.cpp */; };
                 BCEA4855097D93020094C9E4 /* break_lines.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4816097D93020094C9E4 /* break_lines.h */; };
@@ -3517 +3522 @@
                 37919C210B7D188600A56998 /* PositionIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PositionIterator.cpp; sourceTree = "<group>"; };
                 37919C220B7D188600A56998 /* PositionIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PositionIterator.h; sourceTree = "<group>"; };
+                514AF320BE854014A7DA49FB /* BidiContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BidiContext.h; sourceTree = "<group>"; };
+                A579C284B928484FB9A446BC /* BidiContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BidiContext.cpp; sourceTree = "<group>"; };
                 448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLOptionsCollection.h; sourceTree = "<group>"; };
                 448A29BE0A46D9CB0030759F /* JSHTMLOptionsCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLOptionsCollection.cpp; sourceTree = "<group>"; };
@@ -6048 +6055 @@
                 B2FA3D300AB75A6F000E5AC4 /* JSSVGZoomEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGZoomEvent.cpp; sourceTree = "<group>"; };
                 B2FA3D310AB75A6F000E5AC4 /* JSSVGZoomEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGZoomEvent.h; sourceTree = "<group>"; };
+                B402007A0C4D217800210AA6 /* BidiReorderCharacters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BidiReorderCharacters.h; sourceTree = "<group>"; };
+                B402007B0C4D217800210AA6 /* BidiReorderCharacters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BidiReorderCharacters.cpp; sourceTree = "<group>"; };
+                B402FD090C4C9C3900210AA6 /* BidiResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BidiResolver.h; sourceTree = "<group>"; };
                 BC066F6C09FEB2FA00C589A7 /* WebCoreTextRenderer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreTextRenderer.h; sourceTree = "<group>"; };
                 BC06ED040BFD5BAE00856E9D /* JSHTMLTableSectionElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTableSectionElement.cpp; sourceTree = "<group>"; };
@@ -9508 +9518 @@
                                 E11D51910B2E7A5F0056C188 /* Base64.h */,
                                 E11D51920B2E7A5F0056C188 /* Base64.cpp */,
+                                514AF320BE854014A7DA49FB /* BidiContext.h */,
+                                A579C284B928484FB9A446BC /* BidiContext.cpp */,
+                                B402007A0C4D217800210AA6 /* BidiReorderCharacters.h */,
+                                B402007B0C4D217800210AA6 /* BidiReorderCharacters.cpp */,
+                                B402FD090C4C9C3900210AA6 /* BidiResolver.h */,
                                 65F5382009B2B55700F3DC4A /* character-sets.txt */,
                                 93C7B5F30B52D89100B5477E /* CharacterNames.h */,
@@ -11680 +11695 @@
                                 BC772C470C4EB2C60083285F /* XMLHttpRequest.h in Headers */,
                                 BC772C4F0C4EB3040083285F /* MIMETypeRegistry.h in Headers */,
+                                B402FD0B0C4C9C3900210AA6 /* BidiResolver.h in Headers */,
+                                B402007C0C4D217800210AA6 /* BidiReorderCharacters.h in Headers */,
+                                0F31CBF92B654730BA0535E8 /* BidiContext.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -13115 +13133 @@
                                 BC772C4E0C4EB3040083285F /* MIMETypeRegistry.cpp in Sources */,
                                 BC772C5E0C4EB3440083285F /* MIMETypeRegistryMac.mm in Sources */,
+                                F971E27FD70F4382BC66D792 /* BidiContext.cpp in Sources */,
+                                B402007D0C4D217800210AA6 /* BidiReorderCharacters.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/WebCoreSources.bkl

@@ -163 +163 @@
         platform/AtomicString.cpp
         platform/Base64.cpp
+        platform/BidiContext.cpp
+        platform/BidiReorderCharacters.cpp
         platform/CString.cpp
         platform/ContextMenu.cpp

trunk/WebCore/platform/win/PopupMenuWin.cpp

@@ -22 +22 @@
 #include "PopupMenu.h"
 
+#include "BidiReorderCharacters.h"
 #include "Document.h"
 #include "FloatRect.h"
@@ -493 +494 @@
         const UChar* string = itemText.characters();
         TextStyle textStyle(0, 0, 0, false, true);
-        RenderBlock::CharacterBuffer characterBuffer;
+        CharacterBuffer characterBuffer;
 
         if (clientStyle->direction() == RTL && clientStyle->unicodeBidi() == Override)
@@ -500 +501 @@
             // If necessary, reorder characters by running the string through the bidi algorithm
             characterBuffer.append(string, length);
-            RenderBlock::bidiReorderCharacters(client()->clientDocument(), clientStyle, characterBuffer);
+            bidiReorderCharacters(characterBuffer, clientStyle->direction() == RTL, clientStyle->unicodeBidi() == Override, clientStyle->visuallyOrdered());
             string = characterBuffer.data();
         }

trunk/WebCore/rendering/RenderBlock.h

@@ -32 +32 @@
 namespace WebCore {
 
+class BidiIterator;
+class BidiRun;
 class Position;
+class RootInlineBox;
+
+template <class Iterator, class Run> class BidiResolver;
+typedef BidiResolver<BidiIterator, BidiRun> BidiState;
 
 enum CaretType { CursorCaret, DragCaret };
@@ -38 +44 @@
 class RenderBlock : public RenderFlow {
 public:
-    typedef Vector<UChar, 1024> CharacterBuffer;
-    static void bidiReorderCharacters(Document*, RenderStyle*, CharacterBuffer&);
-
     RenderBlock(Node*);
     virtual ~RenderBlock();
@@ -122 +125 @@
 
     // the implementation of the following functions is in bidi.cpp
-    void bidiReorderLine(const BidiIterator& start, const BidiIterator& end, BidiState& bidi);
-    RootInlineBox* determineStartPosition(bool fullLayout, BidiIterator& start, BidiState& bidi);
+    void bidiReorderLine(const BidiIterator& start, const BidiIterator& end, BidiState&);
+    RootInlineBox* determineStartPosition(bool fullLayout, BidiIterator& start, BidiState&);
     RootInlineBox* determineEndPosition(RootInlineBox* startBox, BidiIterator& cleanLineStart,
-                                        BidiStatus& cleanLineBidiStatus, BidiContext*& cleanLineBidiContext,
+                                        BidiStatus& cleanLineBidiStatus,
                                         int& yPos);
-    bool matchedEndLine(const BidiIterator& start, const BidiStatus& status, BidiContext* context,
-                        const BidiIterator& endLineStart, const BidiStatus& endLineStatus, BidiContext* endLineContext,
+    bool matchedEndLine(const BidiIterator& start, const BidiStatus& status,
+                        const BidiIterator& endLineStart, const BidiStatus& endLineStatus,
                         RootInlineBox*& endLine, int& endYPos, int& repaintBottom, int& repaintTop);
     bool generatesLineBoxesForInlineChild(RenderObject*);
@@ -135 +138 @@
     RootInlineBox* constructLine(const BidiIterator& start, const BidiIterator& end);
     InlineFlowBox* createLineBoxes(RenderObject*);
-    void computeHorizontalPositionsForLine(RootInlineBox*, BidiState&);
+    void computeHorizontalPositionsForLine(RootInlineBox*, bool reachedEnd);
     void computeVerticalPositionsForLine(RootInlineBox*);
     void checkLinesForOverflow();

trunk/WebCore/rendering/RenderFileUploadControl.cpp

@@ -22 +22 @@
 #include "RenderFileUploadControl.h"
 
+#include "BidiReorderCharacters.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
@@ -178 +179 @@
         const UChar* string = displayedFilename.characters();
         TextStyle textStyle(0, 0, 0, false, true);
-        RenderBlock::CharacterBuffer characterBuffer;
+        CharacterBuffer characterBuffer;
 
         if (style()->direction() == RTL && style()->unicodeBidi() == Override)
@@ -185 +186 @@
             // If necessary, reorder characters by running the string through the bidi algorithm
             characterBuffer.append(string, length);
-            RenderBlock::bidiReorderCharacters(document(), style(), characterBuffer);
+            bidiReorderCharacters(characterBuffer, style()->direction() == RTL, style()->unicodeBidi() == Override, style()->visuallyOrdered());
             string = characterBuffer.data();
         }

trunk/WebCore/rendering/RenderListBox.cpp

@@ -32 +32 @@
 #include "RenderListBox.h"
 
+#include "BidiReorderCharacters.h"
 #include "Document.h"
 #include "EventHandler.h"
@@ -332 +333 @@
     const UChar* string = itemText.characters();
     TextStyle textStyle(0, 0, 0, false, true);
-    RenderBlock::CharacterBuffer characterBuffer;
+    CharacterBuffer characterBuffer;
 
     if (itemStyle->direction() == RTL && itemStyle->unicodeBidi() == Override)
@@ -339 +340 @@
         // If necessary, reorder characters by running the string through the bidi algorithm
         characterBuffer.append(string, length);
-        RenderBlock::bidiReorderCharacters(document(), itemStyle, characterBuffer);
+        bidiReorderCharacters(characterBuffer, itemStyle->direction() == RTL, itemStyle->unicodeBidi() == Override, itemStyle->visuallyOrdered());
         string = characterBuffer.data();
     }

trunk/WebCore/rendering/RootInlineBox.cpp

@@ -23 +23 @@
 #include "RootInlineBox.h"
 
+#include "BidiResolver.h"
 #include "Document.h"
 #include "EllipsisBox.h"
@@ -195 +196 @@
 {
     if (box->object() == m_lineBreakObj)
-        setLineBreakInfo(0, 0, 0, 0);
+        setLineBreakInfo(0, 0, BidiStatus());
 
     for (RootInlineBox* prev = prevRootBox(); prev && prev->lineBreakObj() == box->object(); prev = prev->prevRootBox()) {
-        prev->setLineBreakInfo(0, 0, 0, 0);
+        prev->setLineBreakInfo(0, 0, BidiStatus());
         prev->markDirty();
     }
@@ -354 +355 @@
 }
 
-void RootInlineBox::setLineBreakInfo(RenderObject* obj, unsigned breakPos, BidiStatus* status, BidiContext* context)
+BidiStatus RootInlineBox::lineBreakBidiStatus() const
+{ 
+    return BidiStatus(m_lineBreakBidiStatusEor, m_lineBreakBidiStatusLastStrong, m_lineBreakBidiStatusLast, m_lineBreakContext);
+}
+
+void RootInlineBox::setLineBreakInfo(RenderObject* obj, unsigned breakPos, const BidiStatus& status)
 {
     m_lineBreakObj = obj;
     m_lineBreakPos = breakPos;
-    m_lineBreakContext = context;
-    if (status) {
-        m_lineBreakBidiStatusEor = status->eor;
-        m_lineBreakBidiStatusLastStrong = status->lastStrong;
-        m_lineBreakBidiStatusLast = status->last;
-    }
+    m_lineBreakBidiStatusEor = status.eor;
+    m_lineBreakBidiStatusLastStrong = status.lastStrong;
+    m_lineBreakBidiStatusLast = status.last;
+    m_lineBreakContext = status.context;
 }
 

trunk/WebCore/rendering/RootInlineBox.h

@@ -24 +24 @@
 #define RootInlineBox_h
 
-#include "bidi.h"
+#include "BidiContext.h"
 #include "InlineFlowBox.h"
 
 namespace WebCore {
 
+class BidiStatus;
 class EllipsisBox;
 class HitTestResult;
@@ -40 +41 @@
         , m_lineBreakObj(0)
         , m_lineBreakPos(0)
-        , m_lineBreakContext(0)
     {
     }
@@ -65 +65 @@
 
     RenderObject* lineBreakObj() const { return m_lineBreakObj; }
-    BidiStatus lineBreakBidiStatus() const { 
-        BidiStatus status;
-        status.eor = m_lineBreakBidiStatusEor;
-        status.lastStrong = m_lineBreakBidiStatusLastStrong;
-        status.last = m_lineBreakBidiStatusLast;
-        return status;
-    }
-    BidiContext* lineBreakBidiContext() const { return m_lineBreakContext.get(); }
-    void setLineBreakInfo(RenderObject*, unsigned breakPos, BidiStatus*, BidiContext*);
+    BidiStatus lineBreakBidiStatus() const;
+    void setLineBreakInfo(RenderObject*, unsigned breakPos, const BidiStatus&);
 
     unsigned lineBreakPos() const { return m_lineBreakPos; }
@@ -159 +152 @@
     RenderObject* m_lineBreakObj;
     unsigned m_lineBreakPos;
-
     RefPtr<BidiContext> m_lineBreakContext;
 

trunk/WebCore/rendering/bidi.cpp

@@ -46 +46 @@
 const unsigned cMaxLineDepth = 200;
 
-// an iterator which traverses all the objects within a block
-struct BidiIterator {
-    BidiIterator() : block(0), obj(0), pos(0) {}
-    BidiIterator(RenderBlock* b, RenderObject* o, unsigned int p) 
-        : block(b), obj(o), pos(p) {}
-    
-    void increment(BidiState& state);
+class BidiIterator {
+public:
+    BidiIterator()
+        : block(0)
+        , obj(0)
+        , pos(0)
+    {
+    }
+
+    BidiIterator(RenderBlock* b, RenderObject* o, unsigned p)
+        : block(b)
+        , obj(o)
+        , pos(p)
+    {
+    }
+
+    void increment(BidiResolver<BidiIterator, BidiRun>& state);
     bool atEnd() const;
-    
+
     UChar current() const;
-    Direction direction() const;
+    WTF::Unicode::Direction direction() const;
 
     RenderBlock* block;
@@ -62 +72 @@
     unsigned int pos;
 };
-
-struct BidiState {
-    BidiState() : context(0), dir(OtherNeutral), adjustEmbedding(false), reachedEndOfLine(false) {}
-    
-    BidiIterator sor;
-    BidiIterator eor;
-    BidiIterator last;
-    BidiIterator current;
-    RefPtr<BidiContext> context;
-    BidiStatus status;
-    Direction dir;
-    bool adjustEmbedding;
-    BidiIterator endOfLine;
-    bool reachedEndOfLine;
-    BidiIterator lastBeforeET;
-};
-
-inline bool operator==(const BidiStatus& status1, const BidiStatus& status2)
-{
-    return status1.eor == status2.eor && status1.last == status2.last && status1.lastStrong == status2.lastStrong;
-}
-
-inline bool operator!=(const BidiStatus& status1, const BidiStatus& status2)
-{
-    return !(status1 == status2);
-}
 
 // Used to track a list of chained bidi runs.
@@ -94 +78 @@
 static BidiRun* sLogicallyLastBidiRun;
 static int sBidiRunCount;
-static BidiRun* sCompactFirstBidiRun;
-static BidiRun* sCompactLastBidiRun;
-static int sCompactBidiRunCount;
-static bool sBuildingCompactRuns;
 
 // Midpoint globals.  The goal is not to do any allocation when dealing with
@@ -109 +89 @@
 static bool isLineEmpty = true;
 static bool previousLineBrokeCleanly = true;
-static bool emptyRun = true;
 static int numSpaces;
-
-static void embed(Direction, BidiState&);
-static void appendRun(BidiState&);
-static void deleteBidiRuns(RenderArena*);
-
-void RenderBlock::bidiReorderCharacters(Document* document, RenderStyle* style, CharacterBuffer& characterBuffer)
-{
-    unsigned bufferLength = characterBuffer.size();
-    // Create a local copy of the buffer.
-    String string(characterBuffer.data(), bufferLength);
-
-    // Create anonymous RenderBlock    
-    RenderStyle* blockStyle = new (document->renderArena()) RenderStyle();
-    blockStyle->inheritFrom(style);
-    blockStyle->setDisplay(BLOCK);
-    blockStyle->setWhiteSpace(PRE);
-    RenderBlock* block = new (document->renderArena()) RenderBlock(document);
-    block->setStyle(blockStyle);
-    
-    // Create RenderText
-    RenderText* text = new (document->renderArena()) RenderText(document, string.impl());
-    text->setStyle(blockStyle);
-    block->appendChildNode(text, false);
-    
-    // Call bidiReorderLine
-    BidiState bidi;
-    PassRefPtr<BidiContext> startEmbed;
-    if (style->direction() == LTR) {
-        startEmbed = new BidiContext(0, LeftToRight, NULL, style->unicodeBidi() == Override);
-        bidi.status.eor = LeftToRight;
-    } else {
-        startEmbed = new BidiContext(1, RightToLeft, NULL, style->unicodeBidi() == Override);
-        bidi.status.eor = RightToLeft;
-    }
-    bidi.status.lastStrong = startEmbed->dir();
-    bidi.status.last = startEmbed->dir();
-    bidi.status.eor = startEmbed->dir();
-    bidi.context = startEmbed;
-    bidi.dir = OtherNeutral;
-    betweenMidpoints = false;
-    
-    block->bidiReorderLine(BidiIterator(block, text, 0), BidiIterator(block, text, bufferLength), bidi);
-    
-    // Fill the characterBuffer.
-    int index = 0;
-    BidiRun* r = sFirstBidiRun; 
-    while (r) {
-        bool reversed = r->reversed(style->visuallyOrdered());
-        // If there's only one run, and it doesn't need to be reversed, return early
-        if (sBidiRunCount == 1 && !reversed)
-            break;
-        for (int i = r->start; i < r->stop; ++i) {
-            if (reversed)
-                characterBuffer[index] = string[r->stop + r->start - i - 1];
-            else
-                characterBuffer[index] = string[i];
-            ++index;
-        }
-        r = r->nextRun;
-    }
-
-    // Tear down temporary RenderBlock, RenderText, and BidiRuns
-    block->removeChildNode(text, false);
-    text->destroy();
-    block->destroy();
-    deleteBidiRuns(document->renderArena());
-}
 
 static int getBPMWidth(int childValue, Length cssUnit)
@@ -267 +179 @@
 }
 
-static void deleteBidiRuns(RenderArena* arena)
-{
-    emptyRun = true;
-    if (!sFirstBidiRun)
+template <>
+void BidiState::deleteRuns()
+{
+    if (!m_firstRun)
         return;
 
-    BidiRun* curr = sFirstBidiRun;
+    BidiRun* curr = m_firstRun;
     while (curr) {
-        BidiRun* s = curr->nextRun;
-        curr->destroy(arena);
+        BidiRun* s = curr->next();
+        curr->destroy(curr->obj->renderArena());
         curr = s;
     }
-    
-    sFirstBidiRun = 0;
-    sLastBidiRun = 0;
-    sBidiRunCount = 0;
+
+    m_firstRun = 0;
+    m_lastRun = 0;
+    m_runCount = 0;
 }
 
 // ---------------------------------------------------------------------
 
-/* a small helper class used internally to resolve Bidi embedding levels.
-   Each line of text caches the embedding level at the start of the line for faster
-   relayouting
-*/
-BidiContext::BidiContext(unsigned char l, Direction e, BidiContext *p, bool o)
-    : level(l), override(o), m_dir(e)
-{
-    parent = p;
-    if (p)
-        p->ref();
-    count = 0;
-}
-
-BidiContext::~BidiContext()
-{
-    if (parent) 
-        parent->deref();
-}
-
-void BidiContext::ref() const
-{
-    count++;
-}
-
-void BidiContext::deref() const
-{
-    count--;
-    if (count <= 0)
-        delete this;
-}
-
-bool operator==(const BidiContext& c1, const BidiContext& c2)
-{
-    if (&c1 == &c2)
-        return true;
-    if (c1.level != c2.level || c1.override != c2.override || c1.dir() != c2.dir())
-        return false;
-    if (!c1.parent)
-        return !c2.parent;
-    return c2.parent && *c1.parent == *c2.parent;
-}
-
-inline bool operator!=(const BidiContext& c1, const BidiContext& c2)
-{
-    return !(c1 == c2);
-}
-
-// ---------------------------------------------------------------------
-
 inline bool operator==(const BidiIterator& it1, const BidiIterator& it2)
 {
-    if (it1.pos != it2.pos)
-        return false;
-    if (it1.obj != it2.obj)
-        return false;
-    return true;
+    return it1.pos == it2.pos && it1.obj == it2.obj;
 }
 
 inline bool operator!=(const BidiIterator& it1, const BidiIterator& it2)
 {
-    if (it1.pos != it2.pos)
-        return true;
-    if (it1.obj != it2.obj)
-        return true;
-    return false;
+    return it1.pos != it2.pos || it1.obj != it2.obj;
 }
 
@@ -366 +221 @@
         if (!oldEndOfInline && !current->isFloating() && !current->isReplaced() && !current->isPositioned()) {
             next = current->firstChild();
-            if (next && bidi.adjustEmbedding && next->isInlineFlow()) {
+            if (next && bidi.adjustEmbedding() && next->isInlineFlow()) {
                 EUnicodeBidi ub = next->style()->unicodeBidi();
                 if (ub != UBNormal) {
@@ -373 +228 @@
                         ? (dir == RTL ? RightToLeftEmbedding : LeftToRightEmbedding)
                         : (dir == RTL ? RightToLeftOverride : LeftToRightOverride));
-                    embed(d, bidi);
+                    bidi.embed(d);
                 }
             }
@@ -387 +242 @@
 
             while (current && current != block) {
-                if (bidi.adjustEmbedding && current->isInlineFlow() && current->style()->unicodeBidi() != UBNormal)
-                    embed(PopDirectionalFormat, bidi);
+                if (bidi.adjustEmbedding() && current->isInlineFlow() && current->style()->unicodeBidi() != UBNormal)
+                    bidi.embed(PopDirectionalFormat);
 
                 next = current->nextSibling();
                 if (next) {
-                    if (bidi.adjustEmbedding && next->isInlineFlow()) {
+                    if (bidi.adjustEmbedding() && next->isInlineFlow()) {
                         EUnicodeBidi ub = next->style()->unicodeBidi();
                         if (ub != UBNormal) {
@@ -399 +254 @@
                                 ? (dir == RTL ? RightToLeftEmbedding: LeftToRightEmbedding)
                                 : (dir == RTL ? RightToLeftOverride : LeftToRightOverride));
-                            embed(d, bidi);
+                            bidi.embed(d);
                         }
                     }
@@ -434 +289 @@
     RenderObject* o = block->firstChild();
     if (o->isInlineFlow()) {
-        if (bidi.adjustEmbedding) {
+        if (bidi.adjustEmbedding()) {
             EUnicodeBidi ub = o->style()->unicodeBidi();
             if (ub != UBNormal) {
@@ -441 +296 @@
                     ? (dir == RTL ? RightToLeftEmbedding : LeftToRightEmbedding)
                     : (dir == RTL ? RightToLeftOverride : LeftToRightOverride));
-                embed(d, bidi);
+                bidi.embed(d);
             }
         }
@@ -504 +359 @@
 // -------------------------------------------------------------------------------------------------
 
-static void addRun(BidiRun* bidiRun)
-{
-    if (!sFirstBidiRun)
-        sFirstBidiRun = sLastBidiRun = bidiRun;
-    else {
-        sLastBidiRun->nextRun = bidiRun;
-        sLastBidiRun = bidiRun;
-    }
-    sBidiRunCount++;
-    bidiRun->compact = sBuildingCompactRuns;
+template <>
+inline void BidiState::addRun(BidiRun* bidiRun)
+{
+    if (!m_firstRun)
+        m_firstRun = bidiRun;
+    else
+        m_lastRun->m_next = bidiRun;
+    m_lastRun = bidiRun;
+    m_runCount++;
+
+    sLogicallyLastBidiRun = bidiRun;
 
     // Compute the number of spaces in this run,
@@ -519 +375 @@
         RenderText* text = static_cast<RenderText*>(bidiRun->obj);
         if (text->characters()) {
-            for (int i = bidiRun->start; i < bidiRun->stop; i++) {
+            for (int i = bidiRun->m_start; i < bidiRun->m_stop; i++) {
                 UChar c = text->characters()[i];
                 if (c == ' ' || c == '\n' || c == '\t')
@@ -526 +382 @@
         }
     }
-}
-
-static void reverseRuns(int start, int end)
-{
-    if (start >= end)
-        return;
-
-    ASSERT(start >= 0 && end < sBidiRunCount);
-    
-    // Get the item before the start of the runs to reverse and put it in
-    // |beforeStart|.  |curr| should point to the first run to reverse.
-    BidiRun* curr = sFirstBidiRun;
-    BidiRun* beforeStart = 0;
-    int i = 0;
-    while (i < start) {
-        i++;
-        beforeStart = curr;
-        curr = curr->nextRun;
-    }
-
-    BidiRun* startRun = curr;
-    while (i < end) {
-        i++;
-        curr = curr->nextRun;
-    }
-    BidiRun* endRun = curr;
-    BidiRun* afterEnd = curr->nextRun;
-
-    i = start;
-    curr = startRun;
-    BidiRun* newNext = afterEnd;
-    while (i <= end) {
-        // Do the reversal.
-        BidiRun* next = curr->nextRun;
-        curr->nextRun = newNext;
-        newNext = curr;
-        curr = next;
-        i++;
-    }
-
-    // Now hook up beforeStart and afterEnd to the newStart and newEnd.
-    if (beforeStart)
-        beforeStart->nextRun = endRun;
-    else
-        sFirstBidiRun = endRun;
-
-    startRun->nextRun = afterEnd;
-    if (!afterEnd)
-        sLastBidiRun = startRun;
 }
 
@@ -637 +444 @@
 }
 
-static void appendRunsForObject(int start, int end, RenderObject* obj, BidiState &bidi)
+static void appendRunsForObject(int start, int end, RenderObject* obj, BidiState& bidi)
 {
     if (start > end || obj->isFloating() ||
@@ -660 +467 @@
     else {
         if (!smidpoints || !haveNextMidpoint || (obj != nextMidpoint.obj)) {
-            addRun(new (obj->renderArena()) BidiRun(start, end, obj, bidi.context.get(), bidi.dir));
+            bidi.addRun(new (obj->renderArena()) BidiRun(start, end, obj, bidi.context(), bidi.dir()));
             return;
         }
@@ -671 +478 @@
             if (nextMidpoint.pos != UINT_MAX) { // UINT_MAX means stop at the object and don't include any of it.
                 if (int(nextMidpoint.pos+1) > start)
-                    addRun(new (obj->renderArena())
-                        BidiRun(start, nextMidpoint.pos+1, obj, bidi.context.get(), bidi.dir));
+                    bidi.addRun(new (obj->renderArena())
+                        BidiRun(start, nextMidpoint.pos+1, obj, bidi.context(), bidi.dir()));
                 return appendRunsForObject(nextMidpoint.pos+1, end, obj, bidi);
             }
         }
         else
-           addRun(new (obj->renderArena()) BidiRun(start, end, obj, bidi.context.get(), bidi.dir));
-    }
-}
-
-static void appendRun(BidiState &bidi)
-{
-    if (emptyRun || !bidi.eor.obj)
+           bidi.addRun(new (obj->renderArena()) BidiRun(start, end, obj, bidi.context(), bidi.dir()));
+    }
+}
+
+template <>
+void BidiState::appendRun()
+{
+    if (emptyRun || eor.atEnd())
         return;
-#if defined(BIDI_DEBUG) && BIDI_DEBUG > 1
-    kdDebug(6041) << "appendRun: dir="<<(int)dir<<endl;
-#endif
-
-    bool b = bidi.adjustEmbedding;
-    bidi.adjustEmbedding = false;
-
-    int start = bidi.sor.pos;
-    RenderObject *obj = bidi.sor.obj;
-    while (obj && obj != bidi.eor.obj && obj != bidi.endOfLine.obj) {
-        appendRunsForObject(start, obj->length(), obj, bidi);        
+    bool b = m_adjustEmbedding;
+    m_adjustEmbedding = false;
+
+    int start = sor.pos;
+    RenderObject *obj = sor.obj;
+    while (obj && obj != eor.obj && obj != endOfLine.obj) {
+        appendRunsForObject(start, obj->length(), obj, *this);        
         start = 0;
-        obj = bidiNext(bidi.sor.block, obj, bidi);
+        obj = bidiNext(sor.block, obj, *this);
     }
     if (obj) {
-        unsigned pos = obj == bidi.eor.obj ? bidi.eor.pos : UINT_MAX;
-        if (obj == bidi.endOfLine.obj && bidi.endOfLine.pos <= pos) {
-            bidi.reachedEndOfLine = true;
-            pos = bidi.endOfLine.pos;
+        unsigned pos = obj == eor.obj ? eor.pos : UINT_MAX;
+        if (obj == endOfLine.obj && endOfLine.pos <= pos) {
+            reachedEndOfLine = true;
+            pos = endOfLine.pos;
         }
         // It's OK to add runs for zero-length RenderObjects, just don't make the run larger than it should be
         int end = obj->length() ? pos+1 : 0;
-        appendRunsForObject(start, end, obj, bidi);
-    }
-    
-    bidi.eor.increment(bidi);
-    bidi.sor = bidi.eor;
-    bidi.dir = OtherNeutral;
-    bidi.status.eor = OtherNeutral;
-    bidi.adjustEmbedding = b;
-}
-
-static void embed(Direction d, BidiState& bidi)
-{
-    bool b = bidi.adjustEmbedding;
-    bidi.adjustEmbedding = false;
-    if (d == PopDirectionalFormat) {
-        BidiContext *c = bidi.context->parent;
-        if (c) {
-            if (!emptyRun && bidi.eor != bidi.last) {
-                ASSERT(bidi.status.eor != OtherNeutral);
-                // bidi.sor ... bidi.eor ... bidi.last eor; need to append the bidi.sor-bidi.eor run or extend it through bidi.last
-                ASSERT(bidi.status.last == EuropeanNumberSeparator
-                    || bidi.status.last == EuropeanNumberTerminator
-                    || bidi.status.last == CommonNumberSeparator
-                    || bidi.status.last == BoundaryNeutral
-                    || bidi.status.last == BlockSeparator
-                    || bidi.status.last == SegmentSeparator
-                    || bidi.status.last == WhiteSpaceNeutral
-                    || bidi.status.last == OtherNeutral);
-                if (bidi.dir == OtherNeutral)
-                    bidi.dir = bidi.context->dir();
-                if (bidi.context->dir() == LeftToRight) {
-                    // bidi.sor ... bidi.eor ... bidi.last L
-                    if (bidi.status.eor == EuropeanNumber) {
-                        if (bidi.status.lastStrong != LeftToRight) {
-                            bidi.dir = EuropeanNumber;
-                            appendRun(bidi);
-                        }
-                    } else if (bidi.status.eor == ArabicNumber) {
-                        bidi.dir = ArabicNumber;
-                        appendRun(bidi);
-                    } else if (bidi.status.eor != LeftToRight)
-                        appendRun(bidi);
-                } else if (bidi.status.eor != RightToLeft && bidi.status.eor != RightToLeftArabic)
-                    appendRun(bidi);
-                bidi.eor = bidi.last;
-            }
-            appendRun(bidi);
-            emptyRun = true;
-            // sor for the new run is determined by the higher level (rule X10)
-            bidi.status.last = bidi.context->dir();
-            bidi.status.lastStrong = bidi.context->dir();
-            bidi.context = c;
-            bidi.status.eor = bidi.context->dir();
-            bidi.eor.obj = 0;
-        }
-    } else {
-        Direction runDir;
-        if (d == RightToLeftEmbedding || d == RightToLeftOverride)
-            runDir = RightToLeft;
-        else
-            runDir = LeftToRight;
-        bool override = d == LeftToRightOverride || d == RightToLeftOverride;
-
-        unsigned char level = bidi.context->level;
-        if (runDir == RightToLeft) {
-            if (level%2) // we have an odd level
-                level += 2;
-            else
-                level++;
-        } else {
-            if (level%2) // we have an odd level
-                level++;
-            else
-                level += 2;
-        }
-
-        if (level < 61) {
-            if (!emptyRun && bidi.eor != bidi.last) {
-                ASSERT(bidi.status.eor != OtherNeutral);
-                // bidi.sor ... bidi.eor ... bidi.last eor; need to append the bidi.sor-bidi.eor run or extend it through bidi.last
-                ASSERT(bidi.status.last == EuropeanNumberSeparator
-                    || bidi.status.last == EuropeanNumberTerminator
-                    || bidi.status.last == CommonNumberSeparator
-                    || bidi.status.last == BoundaryNeutral
-                    || bidi.status.last == BlockSeparator
-                    || bidi.status.last == SegmentSeparator
-                    || bidi.status.last == WhiteSpaceNeutral
-                    || bidi.status.last == OtherNeutral);
-                if (bidi.dir == OtherNeutral)
-                    bidi.dir = runDir;
-                if (runDir == LeftToRight) {
-                    // bidi.sor ... bidi.eor ... bidi.last L
-                    if (bidi.status.eor == EuropeanNumber) {
-                        if (bidi.status.lastStrong != LeftToRight) {
-                            bidi.dir = EuropeanNumber;
-                            appendRun(bidi);
-                            if (bidi.context->dir() != LeftToRight)
-                                bidi.dir = RightToLeft;
-                        }
-                    } else if (bidi.status.eor == ArabicNumber) {
-                        bidi.dir = ArabicNumber;
-                        appendRun(bidi);
-                        if (bidi.context->dir() != LeftToRight) {
-                            bidi.eor = bidi.last;
-                            bidi.dir = RightToLeft;
-                            appendRun(bidi);
-                        }
-                    } else if (bidi.status.eor != LeftToRight) {
-                        if (bidi.context->dir() == LeftToRight || bidi.status.lastStrong == LeftToRight)
-                            appendRun(bidi);
-                        else
-                            bidi.dir = RightToLeft;
-                    }
-                } else if (bidi.status.eor != RightToLeft && bidi.status.eor != RightToLeftArabic) {
-                    // bidi.sor ... bidi.eor ... bidi.last R; bidi.eor=L/EN/AN; EN,AN behave like R (rule N1)
-                    if (bidi.context->dir() == RightToLeft || bidi.status.lastStrong == RightToLeft || bidi.status.lastStrong == RightToLeftArabic)
-                        appendRun(bidi);
-                    else
-                        bidi.dir = LeftToRight;
-                }
-                bidi.eor = bidi.last;
-            }
-            appendRun(bidi);
-            emptyRun = true;
-            bidi.context = new BidiContext(level, runDir, bidi.context.get(), override);
-            bidi.status.last = runDir;
-            bidi.status.lastStrong = runDir;
-            bidi.status.eor = runDir;
-            bidi.eor.obj = 0;
-        }
-    }
-    bidi.adjustEmbedding = b;
+        appendRunsForObject(start, end, obj, *this);
+    }
+    
+    eor.increment(*this);
+    sor = eor;
+    m_direction = OtherNeutral;
+    m_status.eor = OtherNeutral;
+    m_adjustEmbedding = b;
 }
 
@@ -901 +581 @@
 
     InlineFlowBox* parentBox = 0;
-    for (BidiRun* r = sFirstBidiRun; r; r = r->nextRun) {
+    for (BidiRun* r = sFirstBidiRun; r; r = r->next()) {
         // Create a box for our object.
         bool isOnlyRun = (sBidiRunCount == 1);
@@ -920 +600 @@
             if (r->box->isInlineTextBox()) {
                 InlineTextBox *text = static_cast<InlineTextBox*>(r->box);
-                text->setStart(r->start);
-                text->setLen(r->stop - r->start);
+                text->setStart(r->m_start);
+                text->setLen(r->m_stop - r->m_start);
                 bool visuallyOrdered = r->obj->style()->visuallyOrdered();
                 text->m_reversed = r->reversed(visuallyOrdered);
@@ -950 +630 @@
 }
 
-void RenderBlock::computeHorizontalPositionsForLine(RootInlineBox* lineBox, BidiState& bidi)
+void RenderBlock::computeHorizontalPositionsForLine(RootInlineBox* lineBox, bool reachedEnd)
 {
     // First determine our total width.
@@ -957 +637 @@
     BidiRun* r = 0;
     bool needsWordSpacing = false;
-    for (r = sFirstBidiRun; r; r = r->nextRun) {
+    for (r = sFirstBidiRun; r; r = r->next()) {
         if (!r->box || r->obj->isPositioned() || r->box->isLineBreak())
             continue; // Positioned objects are only participating to figure out their
@@ -964 +644 @@
         if (r->obj->isText()) {
             RenderText* rt = static_cast<RenderText*>(r->obj);
-            int textWidth = rt->width(r->start, r->stop-r->start, totWidth, m_firstLine);
+            int textWidth = rt->width(r->m_start, r->m_stop - r->m_start, totWidth, m_firstLine);
             int effectiveWidth = textWidth;
             int rtLength = rt->textLength();
             if (rtLength != 0) {
-                if (r->start == 0 && needsWordSpacing && DeprecatedChar(rt->characters()[r->start]).isSpace())
+                if (!r->m_start && needsWordSpacing && DeprecatedChar(rt->characters()[r->m_start]).isSpace())
                     effectiveWidth += rt->style(m_firstLine)->font().wordSpacing();
-                needsWordSpacing = !DeprecatedChar(rt->characters()[r->stop-1]).isSpace() && r->stop == rtLength;          
+                needsWordSpacing = !DeprecatedChar(rt->characters()[r->m_stop - 1]).isSpace() && r->m_stop == rtLength;          
             }
             r->box->setWidth(textWidth);
@@ -1007 +687 @@
             break;
         case JUSTIFY:
-            if (numSpaces != 0 && !bidi.current.atEnd() && !lineBox->endsWithBreak())
+            if (numSpaces != 0 && !reachedEnd && !lineBox->endsWithBreak())
                 break;
             // fall through
@@ -1033 +713 @@
 
     if (numSpaces > 0) {
-        for (r = sFirstBidiRun; r; r = r->nextRun) {
+        for (r = sFirstBidiRun; r; r = r->next()) {
             if (!r->box) continue;
 
@@ -1040 +720 @@
                 // get the number of spaces in the run
                 int spaces = 0;
-                for ( int i = r->start; i < r->stop; i++ ) {
+                for (int i = r->m_start; i < r->m_stop; i++) {
                     UChar c = static_cast<RenderText*>(r->obj)->characters()[i];
                     if (c == ' ' || c == '\n' || c == '\t')
@@ -1079 +759 @@
         
     // Now make sure we place replaced render objects correctly.
-    for (BidiRun* r = sFirstBidiRun; r; r = r->nextRun) {
+    for (BidiRun* r = sFirstBidiRun; r; r = r->next()) {
         if (!r->box)
             continue; // Skip runs with no line boxes.
@@ -1103 +783 @@
     }
 
-    sFirstBidiRun = 0;
-    sLastBidiRun = 0;
-    sBidiRunCount = 0;
-
-    ASSERT(bidi.dir == OtherNeutral);
-
-    emptyRun = true;
-
-    bidi.eor.obj = 0;
-
     numSpaces = 0;
 
-    bidi.current = start;
-    bidi.last = bidi.current;
-    bool pastEnd = false;
-    BidiState stateAtEnd;
-
-    while (true) {
-        Direction dirCurrent;
-        if (pastEnd && (previousLineBrokeCleanly || bidi.current.atEnd())) {
-            BidiContext *c = bidi.context.get();
-            while (c->parent)
-                c = c->parent;
-            dirCurrent = c->dir();
-            if (previousLineBrokeCleanly) {
-                // A deviation from the Unicode Bidi Algorithm in order to match
-                // Mac OS X text and WinIE: a hard line break resets bidi state.
-                stateAtEnd.context = c;
-                stateAtEnd.status.eor = dirCurrent;
-                stateAtEnd.status.last = dirCurrent;
-                stateAtEnd.status.lastStrong = dirCurrent;
-            }
-        } else {
-            dirCurrent = bidi.current.direction();
-            if (bidi.context->override
-                    && dirCurrent != RightToLeftEmbedding
-                    && dirCurrent != LeftToRightEmbedding
-                    && dirCurrent != RightToLeftOverride
-                    && dirCurrent != LeftToRightOverride
-                    && dirCurrent != PopDirectionalFormat)
-                dirCurrent = bidi.context->dir();
-            else if (dirCurrent == NonSpacingMark)
-                dirCurrent = bidi.status.last;
-        }
-
-        ASSERT(bidi.status.eor != OtherNeutral);
-        switch (dirCurrent) {
-
-        // embedding and overrides (X1-X9 in the Bidi specs)
-        case RightToLeftEmbedding:
-        case LeftToRightEmbedding:
-        case RightToLeftOverride:
-        case LeftToRightOverride:
-        case PopDirectionalFormat:
-            embed(dirCurrent, bidi);
-            break;
-
-            // strong types
-        case LeftToRight:
-            switch(bidi.status.last) {
-                case RightToLeft:
-                case RightToLeftArabic:
-                case EuropeanNumber:
-                case ArabicNumber:
-                    if (bidi.status.last != EuropeanNumber || bidi.status.lastStrong != LeftToRight)
-                        appendRun(bidi);
-                    break;
-                case LeftToRight:
-                    break;
-                case EuropeanNumberSeparator:
-                case EuropeanNumberTerminator:
-                case CommonNumberSeparator:
-                case BoundaryNeutral:
-                case BlockSeparator:
-                case SegmentSeparator:
-                case WhiteSpaceNeutral:
-                case OtherNeutral:
-                    if (bidi.status.eor == EuropeanNumber) {
-                        if (bidi.status.lastStrong != LeftToRight) {
-                            // the numbers need to be on a higher embedding level, so let's close that run
-                            bidi.dir = EuropeanNumber;
-                            appendRun(bidi);
-                            if (bidi.context->dir() != LeftToRight) {
-                                // the neutrals take the embedding direction, which is R
-                                bidi.eor = bidi.last;
-                                bidi.dir = RightToLeft;
-                                appendRun(bidi);
-                            }
-                        }
-                    } else if (bidi.status.eor == ArabicNumber) {
-                        // Arabic numbers are always on a higher embedding level, so let's close that run
-                        bidi.dir = ArabicNumber;
-                        appendRun(bidi);
-                        if (bidi.context->dir() != LeftToRight) {
-                            // the neutrals take the embedding direction, which is R
-                            bidi.eor = bidi.last;
-                            bidi.dir = RightToLeft;
-                            appendRun(bidi);
-                        }
-                    } else if(bidi.status.eor != LeftToRight) {
-                        //last stuff takes embedding dir
-                        if (bidi.context->dir() != LeftToRight && bidi.status.lastStrong != LeftToRight) {
-                            bidi.eor = bidi.last; 
-                            bidi.dir = RightToLeft;
-                        }
-                        appendRun(bidi); 
-                    }
-                default:
-                    break;
-            }
-            bidi.eor = bidi.current;
-            bidi.status.eor = LeftToRight;
-            bidi.status.lastStrong = LeftToRight;
-            bidi.dir = LeftToRight;
-            break;
-        case RightToLeftArabic:
-        case RightToLeft:
-            switch (bidi.status.last) {
-                case LeftToRight:
-                case EuropeanNumber:
-                case ArabicNumber:
-                    appendRun(bidi);
-                case RightToLeft:
-                case RightToLeftArabic:
-                    break;
-                case EuropeanNumberSeparator:
-                case EuropeanNumberTerminator:
-                case CommonNumberSeparator:
-                case BoundaryNeutral:
-                case BlockSeparator:
-                case SegmentSeparator:
-                case WhiteSpaceNeutral:
-                case OtherNeutral:
-                    if (bidi.status.eor != RightToLeft && bidi.status.eor != RightToLeftArabic) {
-                        //last stuff takes embedding dir
-                        if (bidi.context->dir() != RightToLeft && bidi.status.lastStrong != RightToLeft
-                            && bidi.status.lastStrong != RightToLeftArabic) {
-                            bidi.eor = bidi.last;
-                            bidi.dir = LeftToRight;
-                        }
-                        appendRun(bidi);
-                    }
-                default:
-                    break;
-            }
-            bidi.eor = bidi.current;
-            bidi.status.eor = RightToLeft;
-            bidi.status.lastStrong = dirCurrent;
-            bidi.dir = RightToLeft;
-            break;
-
-            // weak types:
-
-        case EuropeanNumber:
-            if (bidi.status.lastStrong != RightToLeftArabic) {
-                // if last strong was AL change EN to AN
-                switch (bidi.status.last) {
-                    case EuropeanNumber:
-                    case LeftToRight:
-                        break;
-                    case RightToLeft:
-                    case RightToLeftArabic:
-                    case ArabicNumber:
-                        bidi.eor = bidi.last;
-                        appendRun(bidi);
-                        bidi.dir = EuropeanNumber;
-                        break;
-                    case EuropeanNumberSeparator:
-                    case CommonNumberSeparator:
-                        if (bidi.status.eor == EuropeanNumber)
-                            break;
-                    case EuropeanNumberTerminator:
-                    case BoundaryNeutral:
-                    case BlockSeparator:
-                    case SegmentSeparator:
-                    case WhiteSpaceNeutral:
-                    case OtherNeutral:
-                        if (bidi.status.eor == RightToLeft) {
-                            // neutrals go to R
-                            bidi.eor = bidi.status.last == EuropeanNumberTerminator ? bidi.lastBeforeET : bidi.last;
-                            appendRun(bidi);
-                            bidi.dir = EuropeanNumber;
-                        } else if (bidi.status.eor != LeftToRight &&
-                                 (bidi.status.eor != EuropeanNumber || bidi.status.lastStrong != LeftToRight) &&
-                                 bidi.dir != LeftToRight) {
-                            // numbers on both sides, neutrals get right to left direction
-                            appendRun(bidi);
-                            bidi.eor = bidi.status.last == EuropeanNumberTerminator ? bidi.lastBeforeET : bidi.last;
-                            bidi.dir = RightToLeft;
-                            appendRun(bidi);
-                            bidi.dir = EuropeanNumber;
-                        }
-                    default:
-                        break;
-                }
-                bidi.eor = bidi.current;
-                bidi.status.eor = EuropeanNumber;
-                if (bidi.dir == OtherNeutral)
-                    bidi.dir = LeftToRight;
-                break;
-            }
-        case ArabicNumber:
-            dirCurrent = ArabicNumber;
-            switch (bidi.status.last) {
-                case LeftToRight:
-                    if (bidi.context->dir() == LeftToRight)
-                        appendRun(bidi);
-                    break;
-                case ArabicNumber:
-                    break;
-                case RightToLeft:
-                case RightToLeftArabic:
-                case EuropeanNumber:
-                    bidi.eor = bidi.last;
-                    appendRun(bidi);
-                    break;
-                case CommonNumberSeparator:
-                    if (bidi.status.eor == ArabicNumber)
-                        break;
-                case EuropeanNumberSeparator:
-                case EuropeanNumberTerminator:
-                case BoundaryNeutral:
-                case BlockSeparator:
-                case SegmentSeparator:
-                case WhiteSpaceNeutral:
-                case OtherNeutral:
-                    if (bidi.status.eor != RightToLeft && bidi.status.eor != RightToLeftArabic) {
-                        // run of L before neutrals, neutrals take embedding dir (N2)
-                        if (bidi.context->dir() == RightToLeft || bidi.status.lastStrong == RightToLeft
-                            || bidi.status.lastStrong == RightToLeftArabic) {
-                            // the embedding direction is R
-                            // close the L run
-                            appendRun(bidi);
-                            // neutrals become an R run
-                            bidi.dir = RightToLeft;
-                        } else {
-                            // the embedding direction is L
-                            // append neutrals to the L run and close it
-                            bidi.dir = LeftToRight;
-                        }
-                    }
-                    bidi.eor = bidi.last;
-                    appendRun(bidi);
-                default:
-                    break;
-            }
-            bidi.eor = bidi.current;
-            bidi.status.eor = ArabicNumber;
-            if (bidi.dir == OtherNeutral)
-                bidi.dir = ArabicNumber;
-            break;
-        case EuropeanNumberSeparator:
-        case CommonNumberSeparator:
-            break;
-        case EuropeanNumberTerminator:
-            if (bidi.status.last == EuropeanNumber) {
-                dirCurrent = EuropeanNumber;
-                bidi.eor = bidi.current;
-                bidi.status.eor = dirCurrent;
-            } else if (bidi.status.last != EuropeanNumberTerminator)
-                bidi.lastBeforeET = emptyRun ? bidi.eor : bidi.last;
-            break;
-
-        // boundary neutrals should be ignored
-        case BoundaryNeutral:
-            if (bidi.eor == bidi.last)
-                bidi.eor = bidi.current;
-            break;
-            // neutrals
-        case BlockSeparator:
-            // ### what do we do with newline and paragraph seperators that come to here?
-            break;
-        case SegmentSeparator:
-            // ### implement rule L1
-            break;
-        case WhiteSpaceNeutral:
-            break;
-        case OtherNeutral:
-            break;
-        default:
-            break;
-        }
-
-        if (pastEnd) {
-            if (bidi.eor == bidi.current) {
-                if (!bidi.reachedEndOfLine) {
-                    bidi.eor = bidi.endOfLine;
-                    switch (bidi.status.eor) {
-                        case LeftToRight:
-                        case RightToLeft:
-                        case ArabicNumber:
-                            bidi.dir = bidi.status.eor;
-                            break;
-                        case EuropeanNumber:
-                            bidi.dir = bidi.status.lastStrong == LeftToRight ? LeftToRight : EuropeanNumber;
-                            break;
-                        default:
-                            ASSERT(false);
-                    }
-                    appendRun(bidi);
-                }
-                bidi = stateAtEnd;
-                bidi.dir = OtherNeutral;
-                break;
-            }
-        }
-
-        // set status.last as needed.
-        switch (dirCurrent) {
-            case EuropeanNumberTerminator:
-                if (bidi.status.last != EuropeanNumber)
-                    bidi.status.last = EuropeanNumberTerminator;
-                break;
-            case EuropeanNumberSeparator:
-            case CommonNumberSeparator:
-            case SegmentSeparator:
-            case WhiteSpaceNeutral:
-            case OtherNeutral:
-                switch(bidi.status.last) {
-                    case LeftToRight:
-                    case RightToLeft:
-                    case RightToLeftArabic:
-                    case EuropeanNumber:
-                    case ArabicNumber:
-                        bidi.status.last = dirCurrent;
-                        break;
-                    default:
-                        bidi.status.last = OtherNeutral;
-                    }
-                break;
-            case NonSpacingMark:
-            case BoundaryNeutral:
-            case RightToLeftEmbedding:
-            case LeftToRightEmbedding:
-            case RightToLeftOverride:
-            case LeftToRightOverride:
-            case PopDirectionalFormat:
-                // ignore these
-                break;
-            case EuropeanNumber:
-                // fall through
-            default:
-                bidi.status.last = dirCurrent;
-        }
-
-        bidi.last = bidi.current;
-
-        if (emptyRun && !(dirCurrent == RightToLeftEmbedding
-                || dirCurrent == LeftToRightEmbedding
-                || dirCurrent == RightToLeftOverride
-                || dirCurrent == LeftToRightOverride
-                || dirCurrent == PopDirectionalFormat)) {
-            bidi.sor = bidi.current;
-            emptyRun = false;
-        }
-
-        // this causes the operator ++ to open and close embedding levels as needed
-        // for the CSS unicode-bidi property
-        bidi.adjustEmbedding = true;
-        bidi.current.increment(bidi);
-        bidi.adjustEmbedding = false;
-        if (emptyRun && (dirCurrent == RightToLeftEmbedding
-                || dirCurrent == LeftToRightEmbedding
-                || dirCurrent == RightToLeftOverride
-                || dirCurrent == LeftToRightOverride
-                || dirCurrent == PopDirectionalFormat)) {
-            // exclude the embedding char itself from the new run so that ATSUI will never see it
-            bidi.eor.obj = 0;
-            bidi.last = bidi.current;
-            bidi.sor = bidi.current;
-        }
-
-        if (!pastEnd && (bidi.current == end || bidi.current.atEnd())) {
-            if (emptyRun)
-                break;
-            stateAtEnd = bidi;
-            bidi.endOfLine = bidi.last;
-            pastEnd = true;
-        }
-    }
-
-    sLogicallyLastBidiRun = sLastBidiRun;
-
-    // reorder line according to run structure...
-    // do not reverse for visually ordered web sites
-    if (!style()->visuallyOrdered()) {
-
-        // first find highest and lowest levels
-        unsigned char levelLow = 128;
-        unsigned char levelHigh = 0;
-        BidiRun* r = sFirstBidiRun;
-        while (r) {
-            if (r->level > levelHigh)
-                levelHigh = r->level;
-            if (r->level < levelLow)
-                levelLow = r->level;
-            r = r->nextRun;
-        }
-
-        // implements reordering of the line (L2 according to Bidi spec):
-        // L2. From the highest level found in the text to the lowest odd level on each line,
-        // reverse any contiguous sequence of characters that are at that level or higher.
-
-        // reversing is only done up to the lowest odd level
-        if (!(levelLow%2))
-            levelLow++;
-
-        int count = sBidiRunCount - 1;
-
-        while (levelHigh >= levelLow) {
-            int i = 0;
-            BidiRun* currRun = sFirstBidiRun;
-            while (i < count) {
-                while (i < count && currRun && currRun->level < levelHigh) {
-                    i++;
-                    currRun = currRun->nextRun;
-                }
-                int start = i;
-                while (i <= count && currRun && currRun->level >= levelHigh) {
-                    i++;
-                    currRun = currRun->nextRun;
-                }
-                int end = i-1;
-                reverseRuns(start, end);
-            }
-            levelHigh--;
-        }
-    }
-    bidi.endOfLine.obj = 0;
+    bidi.createBidiRunsForLine(start, end, style()->visuallyOrdered(), previousLineBrokeCleanly);
+
+    sFirstBidiRun = bidi.firstRun();
+    sLastBidiRun = bidi.lastRun();
+    sBidiRunCount = bidi.runCount();
 }
 
 static void buildCompactRuns(RenderObject* compactObj, BidiState& bidi)
 {
-    sBuildingCompactRuns = true;
-    if (!compactObj->isRenderBlock()) {
-        // Just append a run for our object.
-        isLineEmpty = false;
-        addRun(new (compactObj->renderArena()) BidiRun(0, compactObj->length(), compactObj, bidi.context.get(), bidi.dir));
-    }
-    else {
-        // Format the compact like it is its own single line.  We build up all the runs for
-        // the little compact and then reorder them for bidi.
-        RenderBlock* compactBlock = static_cast<RenderBlock*>(compactObj);
-        bidi.adjustEmbedding = true;
-        BidiIterator start(compactBlock, bidiFirst(compactBlock, bidi), 0);
-        bidi.adjustEmbedding = false;
-        BidiIterator end = start;
-    
-        betweenMidpoints = false;
-        isLineEmpty = true;
-        previousLineBrokeCleanly = true;
-        
-        end = compactBlock->findNextLineBreak(start, bidi);
-        if (!isLineEmpty)
-            compactBlock->bidiReorderLine(start, end, bidi);
-    }
-
-    sCompactFirstBidiRun = sFirstBidiRun;
-    sCompactLastBidiRun = sLastBidiRun;
-    sCompactBidiRunCount = sBidiRunCount;
+    ASSERT(compactObj->isRenderBlock());
+    ASSERT(!bidi.firstRun());
+
+    // Format the compact like it is its own single line.  We build up all the runs for
+    // the little compact and then reorder them for bidi.
+    RenderBlock* compactBlock = static_cast<RenderBlock*>(compactObj);
+    bidi.setAdjustEmbedding(true);
+    BidiIterator start(compactBlock, bidiFirst(compactBlock, bidi), 0);
+    bidi.setAdjustEmbedding(false);
+    BidiIterator end = start;
+
+    betweenMidpoints = false;
+    isLineEmpty = true;
+    previousLineBrokeCleanly = true;
+    
+    end = compactBlock->findNextLineBreak(start, bidi);
+    if (!isLineEmpty)
+        compactBlock->bidiReorderLine(start, end, bidi);
+
+    for (BidiRun* run = bidi.firstRun(); run; run = run->next())
+        run->compact = true;
     
     sNumMidpoints = 0;
     sCurrMidpoint = 0;
     betweenMidpoints = false;
-    sBuildingCompactRuns = false;
 }
 
@@ -1651 +902 @@
         }
 
-        BidiContext *startEmbed;
-        if (style()->direction() == LTR) {
-            startEmbed = new BidiContext(0, LeftToRight, NULL, style()->unicodeBidi() == Override);
-            bidi.status.eor = LeftToRight;
-        } else {
-            startEmbed = new BidiContext(1, RightToLeft, NULL, style()->unicodeBidi() == Override);
-            bidi.status.eor = RightToLeft;
-        }
-
-        bidi.status.lastStrong = startEmbed->dir();
-        bidi.status.last = startEmbed->dir();
-        bidi.status.eor = startEmbed->dir();
-        bidi.context = startEmbed;
-        bidi.dir = OtherNeutral;
+        BidiContext* startEmbed;
+        if (style()->direction() == LTR)
+            startEmbed = new BidiContext(0, LeftToRight, style()->unicodeBidi() == Override);
+        else
+            startEmbed = new BidiContext(1, RightToLeft, style()->unicodeBidi() == Override);
+
+        bidi.setLastStrongDir(startEmbed->dir());
+        bidi.setLastDir(startEmbed->dir());
+        bidi.setEorDir(startEmbed->dir());
+        bidi.setContext(startEmbed);
         
         if (!smidpoints)
@@ -1671 +918 @@
         sNumMidpoints = 0;
         sCurrMidpoint = 0;
-        sCompactFirstBidiRun = sCompactLastBidiRun = 0;
-        sCompactBidiRunCount = 0;
         
         // We want to skip ahead to the first dirty line
@@ -1682 +927 @@
         BidiIterator cleanLineStart;
         BidiStatus cleanLineBidiStatus;
-        BidiContext* cleanLineBidiContext = 0;
         int endLineYPos = 0;
         RootInlineBox* endLine = (fullLayout || !startLine) ? 
-                                 0 : determineEndPosition(startLine, cleanLineStart, cleanLineBidiStatus, cleanLineBidiContext, endLineYPos);
-        if (endLine && cleanLineBidiContext)
-            cleanLineBidiContext->ref();
+                                 0 : determineEndPosition(startLine, cleanLineStart, cleanLineBidiStatus, endLineYPos);
+
         if (startLine) {
             useRepaintBounds = true;
@@ -1709 +952 @@
         while (!end.atEnd()) {
             start = end;
-            if (endLine && (endLineMatched = matchedEndLine(start, bidi.status, bidi.context.get(), cleanLineStart, cleanLineBidiStatus, cleanLineBidiContext, endLine, endLineYPos, repaintBottom, repaintTop)))
+            if (endLine && (endLineMatched = matchedEndLine(start, bidi.status(), cleanLineStart, cleanLineBidiStatus, endLine, endLineYPos, repaintBottom, repaintTop)))
                 break;
 
@@ -1721 +964 @@
             end = findNextLineBreak(start, bidi);
             if (start.atEnd()) {
-                deleteBidiRuns(renderArena());
+                bidi.deleteRuns();
                 break;
             }
@@ -1730 +973 @@
                 // At the same time we figure out where border/padding/margin should be applied for
                 // inline flow boxes.
-                if (sCompactFirstBidiRun) {
-                    // We have a compact line sharing this line.  Link the compact runs
-                    // to our runs to create a single line of runs.
-                    sCompactLastBidiRun->nextRun = sFirstBidiRun;
-                    sFirstBidiRun = sCompactFirstBidiRun;
-                    sBidiRunCount += sCompactBidiRunCount;
-                }
 
                 RootInlineBox* lineBox = 0;
@@ -1743 +979 @@
                     if (lineBox) {
                         lineBox->setEndsWithBreak(previousLineBrokeCleanly);
-                        
+
                         // Now we position all of our text runs horizontally.
-                        computeHorizontalPositionsForLine(lineBox, bidi);
+                        computeHorizontalPositionsForLine(lineBox, end.atEnd());
         
                         // Now position our text runs vertically.
@@ -1758 +994 @@
                 }
 
-                deleteBidiRuns(renderArena());
+                bidi.deleteRuns();
                 
                 if (end == start) {
-                    bidi.adjustEmbedding = true;
+                    bidi.setAdjustEmbedding(true);
                     end.increment(bidi);
-                    bidi.adjustEmbedding = false;
+                    bidi.setAdjustEmbedding(false);
                 }
 
                 if (lineBox) {
-                    lineBox->setLineBreakInfo(end.obj, end.pos, &bidi.status, bidi.context.get());
+                    lineBox->setLineBreakInfo(end.obj, end.pos, bidi.status());
                     if (useRepaintBounds) {
                         repaintTop = min(repaintTop, lineBox->topOverflow());
@@ -1780 +1016 @@
             sNumMidpoints = 0;
             sCurrMidpoint = 0;
-            sCompactFirstBidiRun = sCompactLastBidiRun = 0;
-            sCompactBidiRunCount = 0;
         }
         
@@ -1812 +1046 @@
                 }
             }
-            if (cleanLineBidiContext)
-                cleanLineBidiContext->deref();
         }
     }
@@ -1890 +1122 @@
         startObj = last->lineBreakObj();
         pos = last->lineBreakPos();
-        bidi.status = last->lineBreakBidiStatus();
-        bidi.context = last->lineBreakBidiContext();
+        bidi.setStatus(last->lineBreakBidiStatus());
     } else {
-        bidi.adjustEmbedding = true;
+        bidi.setAdjustEmbedding(true);
         startObj = bidiFirst(this, bidi, 0);
-        bidi.adjustEmbedding = false;
+        bidi.setAdjustEmbedding(false);
     }
         
@@ -1903 +1134 @@
 }
 
-RootInlineBox* RenderBlock::determineEndPosition(RootInlineBox* startLine, BidiIterator& cleanLineStart,
-                                                 BidiStatus& cleanLineBidiStatus, BidiContext*& cleanLineBidiContext,
-                                                 int& yPos)
+RootInlineBox* RenderBlock::determineEndPosition(RootInlineBox* startLine, BidiIterator& cleanLineStart, BidiStatus& cleanLineBidiStatus, int& yPos)
 {
     RootInlineBox* last = 0;
@@ -1925 +1154 @@
     cleanLineStart = BidiIterator(this, prev->lineBreakObj(), prev->lineBreakPos());
     cleanLineBidiStatus = prev->lineBreakBidiStatus();
-    cleanLineBidiContext = prev->lineBreakBidiContext();
     yPos = prev->blockHeight();
     
@@ -1935 +1163 @@
 }
 
-bool RenderBlock::matchedEndLine(const BidiIterator& start, const BidiStatus& status, BidiContext* context,
-                                 const BidiIterator& endLineStart, const BidiStatus& endLineStatus, BidiContext* endLineContext, 
+bool RenderBlock::matchedEndLine(const BidiIterator& start, const BidiStatus& status,
+                                 const BidiIterator& endLineStart, const BidiStatus& endLineStatus, 
                                  RootInlineBox*& endLine, int& endYPos, int& repaintBottom, int& repaintTop)
 {
     if (start == endLineStart)
-        return status == endLineStatus && *context == *endLineContext;
+        return status == endLineStatus;
     else {
         // The first clean line doesn't match, but we can check a handful of following lines to try
@@ -1949 +1177 @@
             if (line->lineBreakObj() == start.obj && line->lineBreakPos() == start.pos) {
                 // We have a match.
-                if (line->lineBreakBidiStatus() != status || *line->lineBreakBidiContext() != *context)
+                if (line->lineBreakBidiStatus() != status)
                     return false; // ...but the bidi state doesn't match.
                 RootInlineBox* result = line->nextRootBox();
@@ -2037 +1265 @@
     // object iteration process.
     int w = lineWidth(m_height);
-    bidi.adjustEmbedding = true;
+    bidi.setAdjustEmbedding(true);
 
     while (!it.atEnd() && !requiresLineBox(it)) {
@@ -2079 +1307 @@
     }
 
-    bidi.adjustEmbedding = false;
+    bidi.setAdjustEmbedding(false);
     return w;
 }

trunk/WebCore/rendering/bidi.h

@@ -25 +25 @@
 #define bidi_h
 
-#include <wtf/unicode/Unicode.h>
+#include "BidiResolver.h"
 
 namespace WebCore {
 
-    class RenderArena;
-    class RenderBlock;
-    class RenderObject;
-    class InlineBox;
+class BidiIterator;
+class RenderArena;
+class RenderBlock;
+class RenderObject;
+class InlineBox;
 
-    struct BidiStatus {
-        BidiStatus()
-            : eor(WTF::Unicode::OtherNeutral)
-            , lastStrong(WTF::Unicode::OtherNeutral)
-            , last(WTF::Unicode::OtherNeutral)
-        {
-        }
+struct BidiRun : BidiCharacterRun {
+    BidiRun(int start, int stop, RenderObject* o, BidiContext* context, WTF::Unicode::Direction dir)
+        : BidiCharacterRun(start, stop, context, dir)
+        , obj(o)
+        , box(0)
+        , compact(false)
+    {
+    }
 
-        WTF::Unicode::Direction eor;
-        WTF::Unicode::Direction lastStrong;
-        WTF::Unicode::Direction last;
-    };
+    void destroy(RenderArena*);
 
-    class BidiContext {
-    public:
-        BidiContext(unsigned char level, WTF::Unicode::Direction embedding, BidiContext* parent = 0, bool override = false);
-        ~BidiContext();
+    // Overloaded new operator.
+    void* operator new(size_t, RenderArena*) throw();
 
-        void ref() const;
-        void deref() const;
+    // Overridden to prevent the normal delete from being called.
+    void operator delete(void*, size_t);
 
-        WTF::Unicode::Direction dir() const { return static_cast<WTF::Unicode::Direction>(m_dir); }
+    BidiRun* next() { return static_cast<BidiRun*>(m_next); }
 
-        unsigned char level;
-        bool override : 1;
-        unsigned m_dir : 5; // WTF::Unicode::Direction
+private:
+    // The normal operator new is disallowed.
+    void* operator new(size_t) throw();
 
-        BidiContext* parent;
-
-        // refcounting....
-        mutable int count;
-    };
-
-    struct BidiRun {
-        BidiRun(int start_, int stop_, RenderObject* o, BidiContext* context, WTF::Unicode::Direction dir)
-            : start(start_)
-            , stop(stop_)
-            , obj(o)
-            , box(0)
-            , override(context->override)
-            , nextRun(0)
-        {
-            if (dir == WTF::Unicode::OtherNeutral)
-                dir = context->dir();
-
-            level = context->level;
-
-            // add level of run (cases I1 & I2)
-            if (level % 2) {
-                if(dir == WTF::Unicode::LeftToRight || dir == WTF::Unicode::ArabicNumber || dir == WTF::Unicode::EuropeanNumber)
-                    level++;
-            } else {
-                if (dir == WTF::Unicode::RightToLeft)
-                    level++;
-                else if (dir == WTF::Unicode::ArabicNumber || dir == WTF::Unicode::EuropeanNumber)
-                    level += 2;
-            }
-        }
-
-        void destroy(RenderArena*);
-
-        // Overloaded new operator.
-        void* operator new(size_t, RenderArena*) throw();
-
-        // Overridden to prevent the normal delete from being called.
-        void operator delete(void*, size_t);
-
-    private:
-        // The normal operator new is disallowed.
-        void* operator new(size_t) throw();
-
-    public:
-        int start;
-        int stop;
-
-        RenderObject* obj;
-        InlineBox* box;
-
-        // explicit + implicit levels here
-        unsigned char level;
-        bool override : 1;
-        bool compact : 1;
-
-        BidiRun* nextRun;
-        
-        bool reversed(bool visuallyOrdered) { return level % 2 && !visuallyOrdered; }
-        bool dirOverride(bool visuallyOrdered) { return override || visuallyOrdered; }
-    };
-
-    struct BidiIterator;
-    struct BidiState;
+public:
+    RenderObject* obj;
+    InlineBox* box;
+    bool compact;
+};
 
 } // namespace WebCore