From 2525b58059d38fb2f98efc6fa54ee85859d26ed2 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 7 Jun 2011 13:24:18 +0100
Subject: Merge Webkit at r84325: Fix SelectText.cpp

BidiRun is no longer stored on BidiResolver - it has it's
own class. Update our code to reflect this.

See http://trac.webkit.org/changeset/83240

Change-Id: Ib5ec7e585a531605f55bcc5530b2039fd11f8115
---
 Source/WebKit/android/nav/SelectText.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Source')

diff --git a/Source/WebKit/android/nav/SelectText.cpp b/Source/WebKit/android/nav/SelectText.cpp
index f8ea799..c56c53c 100644
--- a/Source/WebKit/android/nav/SelectText.cpp
+++ b/Source/WebKit/android/nav/SelectText.cpp
@@ -27,6 +27,7 @@
 
 #include "CachedPrefix.h"
 #include "BidiResolver.h"
+#include "BidiRunList.h"
 #include "CachedRoot.h"
 #include "LayerAndroid.h"
 #include "ParseCanvas.h"
@@ -98,13 +99,14 @@ void ReverseBidi(UChar* chars, int len) {
     result.reserveCapacity(len);
     TextRun run(chars, len);
     BidiResolver<TextRunIterator, BidiCharacterRun> bidiResolver;
+    BidiRunList<BidiCharacterRun>& bidiRuns = bidiResolver.runs();
     bidiResolver.setStatus(BidiStatus(LeftToRight, LeftToRight, LeftToRight,
         BidiContext::create(0, LeftToRight, false)));
     bidiResolver.setPosition(TextRunIterator(&run, 0));
     bidiResolver.createBidiRunsForLine(TextRunIterator(&run, len));
-    if (!bidiResolver.runCount())
+    if (!bidiRuns.runCount())
         return;
-    BidiCharacterRun* bidiRun = bidiResolver.firstRun();
+    BidiCharacterRun* bidiRun = bidiRuns.firstRun();
     while (bidiRun) {
         int bidiStart = bidiRun->start();
         int bidiStop = bidiRun->stop();
@@ -133,7 +135,7 @@ void ReverseBidi(UChar* chars, int len) {
         }
         bidiRun = bidiRun->next();
     }
-    bidiResolver.deleteRuns();
+    bidiRuns.deleteRuns();
     memcpy(chars, &result[0], len * sizeof(UChar));
 }
 
-- 
cgit v1.1