Reviewed by Geoff.
- http://bugs.webkit.org/show_bug.cgi?id=11968
BidiContext's m_basicDir is redundant
No test possible (no functionality change)
* rendering/bidi.cpp:
(WebCore::BidiContext::BidiContext):
(WebCore::operator==):
(WebCore::RenderBlock::computeHorizontalPositionsForLine): Use the block's
direction to resolve 'automatic' text-align.
* rendering/bidi.h:
(WebCore::BidiContext::dir):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@18439 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index a27fa62..bc00616 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -203,11 +203,8 @@
: level(l), override(o), m_dir(e)
{
parent = p;
- if (p) {
+ if (p)
p->ref();
- m_basicDir = p->basicDir();
- } else
- m_basicDir = e;
count = 0;
}
@@ -233,7 +230,7 @@
{
if (&c1 == &c2)
return true;
- if (c1.level != c2.level || c1.override != c2.override || c1.dir() != c2.dir() || c1.basicDir() != c2.basicDir())
+ if (c1.level != c2.level || c1.override != c2.override || c1.dir() != c2.dir())
return false;
if (!c1.parent)
return !c2.parent;
@@ -921,7 +918,7 @@
case TAAUTO:
numSpaces = 0;
// for right to left fall through to right aligned
- if (bidi.context->basicDir() == WTF::Unicode::LeftToRight)
+ if (style()->direction() == LTR)
break;
case RIGHT:
case KHTML_RIGHT: