Reviewed by Darin.
- use unsigned bitfields when storing enums in them, to avoid mangling on win32 (was causing all layout to be RTL)
http://bugzilla.opendarwin.org/show_bug.cgi?id=7618
* css/css_base.cpp:
(WebCore::CSSSelector::operator == ):
(WebCore::CSSSelector::selectorText):
* css/css_base.h:
(WebCore::CSSSelector::CSSSelector):
(WebCore::CSSSelector::pseudoType):
(WebCore::CSSSelector::relation):
* css/css_grammar.y:
* css/cssstyleselector.cpp:
(WebCore::CSSStyleSelector::checkSelector):
(WebCore::CSSStyleSelector::checkOneSelector):
* kcanvas/KCanvasPath.cpp:
(WebCore::operator<<):
* kcanvas/KCanvasPath.h:
(WebCore::KCClipData::windRule):
(WebCore::KCClipDataList::addPath):
* kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
(WebCore::KCanvasClipperQuartz::applyClip):
* khtml/ecma/kjs_html.h:
* khtml/html/HTMLButtonElementImpl.h:
* khtml/html/HTMLInputElementImpl.cpp:
(WebCore::HTMLInputElementImpl::setInputType):
* khtml/html/HTMLInputElementImpl.h:
(DOM::HTMLInputElementImpl::inputType):
* khtml/html/html_tableimpl.h:
* khtml/xbl/xbl_protohandler.cpp:
(XBL::m_button):
* khtml/xbl/xbl_protohandler.h:
* ksvg2/css/SVGRenderStyle.h:
(WebCore::SVGRenderStyle::InheritedFlags::):
(WebCore::SVGRenderStyle::NonInheritedFlags::):
(WebCore::SVGRenderStyle::setBitDefaults):
* ksvg2/svg/SVGAnimateTransformElementImpl.h:
* ksvg2/svg/SVGAnimationElementImpl.cpp:
(SVGAnimationElementImpl::targetAttribute):
(SVGAnimationElementImpl::setTargetAttribute):
* ksvg2/svg/SVGAnimationElementImpl.h:
* ksvg2/svg/SVGLengthImpl.cpp:
(SVGLengthImpl::value):
* ksvg2/svg/SVGLengthImpl.h:
* kwq/KWQKHTMLSettings.h:
* loader/CachedImage.h:
* loader/DocLoader.cpp:
(WebCore::DocLoader::setCachePolicy):
(WebCore::DocLoader::setShowAnimations):
* loader/DocLoader.h:
(WebCore::DocLoader::showAnimations):
* platform/FontDescription.h:
(WebCore::FontDescription::genericFamily):
* platform/QString.cpp:
(HandleNode::):
* platform/QString.h:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::setSelectionState):
(WebCore::RenderBlock::leftRelOffset):
(WebCore::RenderBlock::rightRelOffset):
(WebCore::RenderBlock::leftBottom):
(WebCore::RenderBlock::rightBottom):
(WebCore::RenderBlock::addOverhangingFloats):
(WebCore::RenderBlock::addIntrudingFloats):
* rendering/RenderBlock.h:
(WebCore::RenderBlock::selectionState):
(WebCore::RenderBlock::FloatingObject::FloatingObject):
(WebCore::RenderBlock::FloatingObject::type):
* rendering/RenderTable.h:
(WebCore::RenderTable::getRules):
* rendering/bidi.cpp:
(khtml::BidiContext::BidiContext):
(khtml::operator==):
(khtml::embed):
(khtml::RenderBlock::computeHorizontalPositionsForLine):
(khtml::RenderBlock::bidiReorderLine):
(khtml::RenderBlock::layoutInlineChildren):
* rendering/bidi.h:
(khtml::BidiContext::dir):
(khtml::BidiContext::basicDir):
(khtml::BidiRun::BidiRun):
* rendering/render_canvasimage.h:
* rendering/render_layer.h:
(WebCore::Marquee::whiteSpace):
* rendering/render_object.cpp:
(WebCore::RenderObject::paintBorderImage):
* rendering/render_replaced.cpp:
(WebCore::RenderWidget::setSelectionState):
* rendering/render_replaced.h:
(WebCore::RenderReplaced::selectionState):
* rendering/render_style.cpp:
(WebCore::RenderStyle::getPseudoStyle):
* rendering/render_style.h:
(khtml::BorderValue::BorderValue):
(khtml::BorderValue::style):
(khtml::BorderValue::nonZero):
(khtml::BorderValue::operator==):
(khtml::OutlineValue::operator==):
(khtml::CollapsedBorderValue::style):
(khtml::BorderImage::horizontalRule):
(khtml::BorderImage::verticalRule):
(khtml::BorderData::borderLeftWidth):
(khtml::BorderData::borderRightWidth):
(khtml::BorderData::borderTopWidth):
(khtml::BorderData::borderBottomWidth):
(khtml::BackgroundLayer::backgroundClip):
(khtml::BackgroundLayer::backgroundOrigin):
(khtml::BackgroundLayer::backgroundRepeat):
(khtml::RenderStyle::styleType):
(khtml::RenderStyle::display):
(khtml::RenderStyle::originalDisplay):
(khtml::RenderStyle::position):
(khtml::RenderStyle::floating):
(khtml::RenderStyle::borderLeftStyle):
(khtml::RenderStyle::borderLeftColor):
(khtml::RenderStyle::borderRightStyle):
(khtml::RenderStyle::borderRightColor):
(khtml::RenderStyle::borderTopStyle):
(khtml::RenderStyle::borderTopColor):
(khtml::RenderStyle::borderBottomStyle):
(khtml::RenderStyle::borderBottomColor):
(khtml::RenderStyle::outlineWidth):
(khtml::RenderStyle::outlineStyle):
(khtml::RenderStyle::overflow):
(khtml::RenderStyle::visibility):
(khtml::RenderStyle::verticalAlign):
(khtml::RenderStyle::unicodeBidi):
(khtml::RenderStyle::clear):
(khtml::RenderStyle::tableLayout):
(khtml::RenderStyle::textAlign):
(khtml::RenderStyle::textTransform):
(khtml::RenderStyle::direction):
(khtml::RenderStyle::whiteSpace):
(khtml::RenderStyle::backgroundRepeat):
(khtml::RenderStyle::backgroundClip):
(khtml::RenderStyle::backgroundOrigin):
(khtml::RenderStyle::emptyCells):
(khtml::RenderStyle::captionSide):
(khtml::RenderStyle::listStyleType):
(khtml::RenderStyle::listStylePosition):
(khtml::RenderStyle::cursor):
(khtml::RenderStyle::pageBreakInside):
(khtml::RenderStyle::pageBreakBefore):
(khtml::RenderStyle::pageBreakAfter):
(khtml::RenderStyle::outlineOffset):
(khtml::RenderStyle::appearance):
(khtml::RenderStyle::boxAlign):
(khtml::RenderStyle::boxDirection):
(khtml::RenderStyle::boxLines):
(khtml::RenderStyle::boxOrient):
(khtml::RenderStyle::boxPack):
(khtml::RenderStyle::boxSizing):
(khtml::RenderStyle::marqueeBehavior):
(khtml::RenderStyle::marqueeDirection):
(khtml::RenderStyle::userModify):
(khtml::RenderStyle::userDrag):
(khtml::RenderStyle::userSelect):
(khtml::RenderStyle::marginTopCollapse):
(khtml::RenderStyle::marginBottomCollapse):
(khtml::RenderStyle::wordWrap):
(khtml::RenderStyle::nbspMode):
(khtml::RenderStyle::khtmlLineBreak):
(khtml::RenderStyle::matchNearestMailBlockquoteColor):
(khtml::RenderStyle::setBorderLeftWidth):
(khtml::RenderStyle::setBorderLeftStyle):
(khtml::RenderStyle::setBorderLeftColor):
(khtml::RenderStyle::setBorderRightWidth):
(khtml::RenderStyle::setBorderRightStyle):
(khtml::RenderStyle::setBorderRightColor):
(khtml::RenderStyle::setBorderTopWidth):
(khtml::RenderStyle::setBorderTopStyle):
(khtml::RenderStyle::setBorderTopColor):
(khtml::RenderStyle::setBorderBottomWidth):
(khtml::RenderStyle::setBorderBottomStyle):
(khtml::RenderStyle::setBorderBottomColor):
(khtml::RenderStyle::setOutlineWidth):
(khtml::RenderStyle::setOutlineStyle):
(khtml::RenderStyle::pseudoState):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@13149 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index 09017de..98c80c9 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -200,14 +200,14 @@
relayouting
*/
BidiContext::BidiContext(unsigned char l, QChar::Direction e, BidiContext *p, bool o)
- : level(l), override(o), dir(e)
+ : level(l), override(o), m_dir(e)
{
parent = p;
if (p) {
p->ref();
- basicDir = p->basicDir;
+ m_basicDir = p->basicDir();
} else
- basicDir = e;
+ m_basicDir = e;
count = 0;
}
@@ -233,7 +233,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() || c1.basicDir() != c2.basicDir())
return false;
if (!c1.parent)
return !c2.parent;
@@ -642,8 +642,8 @@
// 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 == QChar::DirES || bidi.status.last == QChar::DirET || bidi.status.last == QChar::DirCS || bidi.status.last == QChar::DirBN || bidi.status.last == QChar::DirB || bidi.status.last == QChar::DirS || bidi.status.last == QChar::DirWS || bidi.status.last == QChar::DirON);
if (bidi.dir == QChar::DirON)
- bidi.dir = bidi.context->dir;
- if (bidi.context->dir == QChar::DirL) {
+ bidi.dir = bidi.context->dir();
+ if (bidi.context->dir() == QChar::DirL) {
// bidi.sor ... bidi.eor ... bidi.last L
if (bidi.status.eor == QChar::DirEN) {
if (bidi.status.lastStrong != QChar::DirL) {
@@ -662,10 +662,10 @@
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.status.last = bidi.context->dir();
+ bidi.status.lastStrong = bidi.context->dir();
bidi.context = c;
- bidi.status.eor = bidi.context->dir;
+ bidi.status.eor = bidi.context->dir();
bidi.eor.obj = 0;
}
} else {
@@ -702,26 +702,26 @@
if (bidi.status.lastStrong != QChar::DirL) {
bidi.dir = QChar::DirEN;
appendRun(bidi);
- if (bidi.context->dir != QChar::DirL)
+ if (bidi.context->dir() != QChar::DirL)
bidi.dir = QChar::DirR;
}
} else if (bidi.status.eor == QChar::DirAN) {
bidi.dir = QChar::DirAN;
appendRun(bidi);
- if (bidi.context->dir != QChar::DirL) {
+ if (bidi.context->dir() != QChar::DirL) {
bidi.eor = bidi.last;
bidi.dir = QChar::DirR;
appendRun(bidi);
}
} else if (bidi.status.eor != QChar::DirL) {
- if (bidi.context->dir == QChar::DirL || bidi.status.lastStrong == QChar::DirL)
+ if (bidi.context->dir() == QChar::DirL || bidi.status.lastStrong == QChar::DirL)
appendRun(bidi);
else
bidi.dir = QChar::DirR;
}
} else if (bidi.status.eor != QChar::DirR && bidi.status.eor != QChar::DirAL) {
// bidi.sor ... bidi.eor ... bidi.last R; bidi.eor=L/EN/AN; EN,AN behave like R (rule N1)
- if (bidi.context->dir == QChar::DirR || bidi.status.lastStrong == QChar::DirR || bidi.status.lastStrong == QChar::DirAL)
+ if (bidi.context->dir() == QChar::DirR || bidi.status.lastStrong == QChar::DirR || bidi.status.lastStrong == QChar::DirAL)
appendRun(bidi);
else
bidi.dir = QChar::DirL;
@@ -907,7 +907,7 @@
case TAAUTO:
numSpaces = 0;
// for right to left fall through to right aligned
- if (bidi.context->basicDir == QChar::DirL)
+ if (bidi.context->basicDir() == QChar::DirL)
break;
case RIGHT:
case KHTML_RIGHT:
@@ -1021,7 +1021,7 @@
BidiContext *c = bidi.context.get();
while (c->parent)
c = c->parent;
- dirCurrent = c->dir;
+ 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.
@@ -1033,7 +1033,7 @@
} else {
dirCurrent = bidi.current.direction();
if (bidi.context->override && dirCurrent != QChar::DirRLE && dirCurrent != QChar::DirLRE && dirCurrent != QChar::DirRLO && dirCurrent != QChar::DirLRO && dirCurrent != QChar::DirPDF)
- dirCurrent = bidi.context->dir;
+ dirCurrent = bidi.context->dir();
else if (dirCurrent == QChar::DirNSM)
dirCurrent = bidi.status.last;
}
@@ -1075,7 +1075,7 @@
// the numbers need to be on a higher embedding level, so let's close that run
bidi.dir = QChar::DirEN;
appendRun(bidi);
- if (bidi.context->dir != QChar::DirL) {
+ if (bidi.context->dir() != QChar::DirL) {
// the neutrals take the embedding direction, which is R
bidi.eor = bidi.last;
bidi.dir = QChar::DirR;
@@ -1086,7 +1086,7 @@
// Arabic numbers are always on a higher embedding level, so let's close that run
bidi.dir = QChar::DirAN;
appendRun(bidi);
- if (bidi.context->dir != QChar::DirL) {
+ if (bidi.context->dir() != QChar::DirL) {
// the neutrals take the embedding direction, which is R
bidi.eor = bidi.last;
bidi.dir = QChar::DirR;
@@ -1094,7 +1094,7 @@
}
} else if(bidi.status.eor != QChar::DirL) {
//last stuff takes embedding dir
- if (bidi.context->dir != QChar::DirL && bidi.status.lastStrong != QChar::DirL) {
+ if (bidi.context->dir() != QChar::DirL && bidi.status.lastStrong != QChar::DirL) {
bidi.eor = bidi.last;
bidi.dir = QChar::DirR;
}
@@ -1128,7 +1128,7 @@
case QChar::DirON:
if (bidi.status.eor != QChar::DirR && bidi.status.eor != QChar::DirAL) {
//last stuff takes embedding dir
- if (bidi.context->dir != QChar::DirR && bidi.status.lastStrong != QChar::DirR
+ if (bidi.context->dir() != QChar::DirR && bidi.status.lastStrong != QChar::DirR
&& bidi.status.lastStrong != QChar::DirAL) {
bidi.eor = bidi.last;
bidi.dir = QChar::DirL;
@@ -1198,7 +1198,7 @@
dirCurrent = QChar::DirAN;
switch (bidi.status.last) {
case QChar::DirL:
- if (bidi.context->dir == QChar::DirL)
+ if (bidi.context->dir() == QChar::DirL)
appendRun(bidi);
break;
case QChar::DirAN:
@@ -1221,7 +1221,7 @@
case QChar::DirON:
if (bidi.status.eor != QChar::DirR && bidi.status.eor != QChar::DirAL) {
// run of L before neutrals, neutrals take embedding dir (N2)
- if (bidi.context->dir == QChar::DirR || bidi.status.lastStrong == QChar::DirR
+ if (bidi.context->dir() == QChar::DirR || bidi.status.lastStrong == QChar::DirR
|| bidi.status.lastStrong == QChar::DirAL) {
// the embedding direction is R
// close the L run
@@ -1540,9 +1540,9 @@
bidi.status.eor = QChar::DirR;
}
- bidi.status.lastStrong = startEmbed->dir;
- bidi.status.last = startEmbed->dir;
- bidi.status.eor = startEmbed->dir;
+ bidi.status.lastStrong = startEmbed->dir();
+ bidi.status.last = startEmbed->dir();
+ bidi.status.eor = startEmbed->dir();
bidi.context = startEmbed;
bidi.dir = QChar::DirON;
