[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/4.0/kdelibs/khtml/rendering
From: Germain Garand <germain () ebooksfrance ! org>
Date: 2008-03-12 8:44:05
Message-ID: 1205311445.655322.1445.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 784732 by ggarand:
automatically merged revision 784702:
rename
paintBackground -> paintOneBackground
paintBackgrounds -> paintAllBackgrounds
M +1 -1 render_body.cpp
M +6 -6 render_box.cpp
M +2 -2 render_box.h
M +1 -1 render_form.cpp
M +5 -5 render_line.cpp
M +2 -2 render_line.h
M +2 -2 render_replaced.cpp
M +1 -1 render_replaced.h
M +2 -2 render_table.cpp
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_body.cpp #784731:784732
@@ -73,7 +73,7 @@
_ty -= borderTopExtra();
QRect cr = QRect(_tx, _ty, w, h).intersected(paintInfo.r);
- paintBackgrounds(paintInfo.p, bgColor, bgLayer, cr, _tx, _ty, w, h);
+ paintAllBackgrounds(paintInfo.p, bgColor, bgLayer, cr, _tx, _ty, w, h);
if(style()->hasBorder())
paintBorder( paintInfo.p, _tx, _ty, w, h, style() );
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_box.cpp #784731:784732
@@ -417,7 +417,7 @@
// hence, paint the background even in the margin areas (unlike for every other \
element!) // I just love these little inconsistencies .. :-( (Dirk)
QRect cr = paintInfo.r.intersected(QRect(bx, by, bw, bh));
- paintBackgrounds(paintInfo.p, bgColor, bgLayer, cr, bx, by, bw, bh);
+ paintAllBackgrounds(paintInfo.p, bgColor, bgLayer, cr, bx, by, bw, bh);
if(style()->hasBorder())
paintBorder( paintInfo.p, _tx, _ty, w, h, style() );
@@ -440,21 +440,21 @@
// since the root could be inline and wrapped in an anonymous block.
if (!isBody() || !document()->isHTMLDocument() || \
document()->documentElement()->renderer()->style()->hasBackground())
- paintBackgrounds(paintInfo.p, style()->backgroundColor(), \
style()->backgroundLayers(), cr, _tx, _ty, w, h); + \
paintAllBackgrounds(paintInfo.p, style()->backgroundColor(), \
style()->backgroundLayers(), cr, _tx, _ty, w, h);
if(style()->hasBorder()) {
paintBorder(paintInfo.p, _tx, _ty, w, h, style());
}
}
-void RenderBox::paintBackgrounds(QPainter *p, const QColor& c, const \
BackgroundLayer* bgLayer, QRect clipr, int _tx, int _ty, int w, int height) +void \
RenderBox::paintAllBackgrounds(QPainter *p, const QColor& c, const BackgroundLayer* \
bgLayer, QRect clipr, int _tx, int _ty, int w, int height) {
if (!bgLayer) return;
- paintBackgrounds(p, c, bgLayer->next(), clipr, _tx, _ty, w, height);
- paintBackground(p, c, bgLayer, clipr, _tx, _ty, w, height);
+ paintAllBackgrounds(p, c, bgLayer->next(), clipr, _tx, _ty, w, height);
+ paintOneBackground(p, c, bgLayer, clipr, _tx, _ty, w, height);
}
-void RenderBox::paintBackground(QPainter *p, const QColor& c, const BackgroundLayer* \
bgLayer, QRect clipr, int _tx, int _ty, int w, int height) +void \
RenderBox::paintOneBackground(QPainter *p, const QColor& c, const BackgroundLayer* \
bgLayer, QRect clipr, int _tx, int _ty, int w, int height) {
paintBackgroundExtended(p, c, bgLayer, clipr, _tx, _ty, w, height,
borderLeft(), borderRight(), paddingLeft(), \
paddingRight(),
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_box.h #784731:784732
@@ -152,8 +152,8 @@
virtual void paintBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty);
void paintRootBoxDecorations( PaintInfo& paintInfo, int _tx, int _ty);
- void paintBackgrounds(QPainter *p, const QColor& c, const BackgroundLayer* \
bgLayer, QRect clipr, int _tx, int _ty, int w, int h);
- virtual void paintBackground(QPainter *p, const QColor& c, const \
BackgroundLayer* bgLayer, QRect clipr, int _tx, int _ty, int w, int h); + void \
paintAllBackgrounds(QPainter *p, const QColor& c, const BackgroundLayer* bgLayer, \
QRect clipr, int _tx, int _ty, int w, int h); + virtual void \
paintOneBackground(QPainter *p, const QColor& c, const BackgroundLayer* bgLayer, \
QRect clipr, int _tx, int _ty, int w, int h);
virtual void paintBackgroundExtended(QPainter* /*p*/, const QColor& /*c*/, const \
BackgroundLayer* /*bgLayer*/,
QRect clipr, int /*_tx*/, int /*_ty*/,
int /*w*/, int /*height*/, int /*bleft*/, \
int /*bright*/, int /*pleft*/, int /*pright*/,
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_form.cpp #784731:784732
@@ -888,7 +888,7 @@
_ty += yOff - borderTopExtra();
QRect cr = QRect(_tx, _ty, w, h).intersected( pI.r );
- paintBackground(pI.p, style()->backgroundColor(), style()->backgroundLayers(), \
cr, _tx, _ty, w, h); + paintOneBackground(pI.p, style()->backgroundColor(), \
style()->backgroundLayers(), cr, _tx, _ty, w, h);
if ( style()->hasBorder() )
paintBorderMinusLegend(pI.p, _tx, _ty, w, h, style(), legend->xPos(), \
legend->width(), legendBottom);
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_line.cpp #784731:784732
@@ -769,16 +769,16 @@
}
-void InlineFlowBox::paintBackgrounds(QPainter* p, const QColor& c, const \
BackgroundLayer* bgLayer, +void InlineFlowBox::paintAllBackgrounds(QPainter* p, const \
QColor& c, const BackgroundLayer* bgLayer,
QRect clipr, int _tx, int _ty, int w, int h)
{
if (!bgLayer)
return;
- paintBackgrounds(p, c, bgLayer->next(), clipr, _tx, _ty, w, h);
- paintBackground(p, c, bgLayer, clipr, _tx, _ty, w, h);
+ paintAllBackgrounds(p, c, bgLayer->next(), clipr, _tx, _ty, w, h);
+ paintOneBackground(p, c, bgLayer, clipr, _tx, _ty, w, h);
}
-void InlineFlowBox::paintBackground(QPainter* p, const QColor& c, const \
BackgroundLayer* bgLayer, +void InlineFlowBox::paintOneBackground(QPainter* p, const \
QColor& c, const BackgroundLayer* bgLayer,
QRect clipr, int _tx, int _ty, int w, int h)
{
CachedImage* bg = bgLayer->backgroundImage();
@@ -836,7 +836,7 @@
if ((!parent() && m_firstLine && styleToUse != object()->style()) ||
(parent() && object()->shouldPaintBackgroundOrBorder())) {
QColor c = styleToUse->backgroundColor();
- paintBackgrounds(pI.p, c, styleToUse->backgroundLayers(), cr, _tx, _ty, w, \
h); + paintAllBackgrounds(pI.p, c, styleToUse->backgroundLayers(), cr, _tx, \
_ty, w, h);
// ::first-line cannot be used to put borders on a line. Always paint \
borders with our // non-first-line style.
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_line.h #784731:784732
@@ -233,9 +233,9 @@
void removeFromLine(InlineBox* child);
virtual void paintBackgroundAndBorder(RenderObject::PaintInfo&, int _tx, int \
_ty);
- void paintBackgrounds(QPainter* p, const QColor& c, const BackgroundLayer* \
bgLayer, + void paintAllBackgrounds(QPainter* p, const QColor& c, const \
BackgroundLayer* bgLayer, QRect clipr, int _tx, int _ty, int w, int h);
- void paintBackground(QPainter* p, const QColor& c, const BackgroundLayer* \
bgLayer, + void paintOneBackground(QPainter* p, const QColor& c, const \
BackgroundLayer* bgLayer, QRect clipr, int _tx, int _ty, int w, int h);
virtual void paint(RenderObject::PaintInfo& i, int _tx, int _ty);
virtual void paintDecorations(RenderObject::PaintInfo&, int _tx, int _ty, bool \
paintedChildren = false);
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_replaced.cpp #784731:784732
@@ -430,7 +430,7 @@
RenderReplaced::updateFromElement();
}
-void RenderWidget::paintBackground(QPainter *p, const QColor& c, const \
BackgroundLayer* bgLayer, QRect clipr, int _tx, int _ty, int w, int height) +void \
RenderWidget::paintOneBackground(QPainter *p, const QColor& c, const BackgroundLayer* \
bgLayer, QRect clipr, int _tx, int _ty, int w, int height) {
bool fudge = !shouldPaintBorder();
paintBackgroundExtended(p, c, bgLayer, clipr, _tx, _ty, w, height,
@@ -447,7 +447,7 @@
if (qobject_cast<QAbstractScrollArea*>(m_widget) || (isRedirectedWidget() &&
style()->backgroundLayers() && style()->backgroundLayers()->hasImage()))
{
- paintBackgrounds(paintInfo.p, style()->backgroundColor(), \
style()->backgroundLayers(), + paintAllBackgrounds(paintInfo.p, \
style()->backgroundColor(), style()->backgroundLayers(), cr, r.x(), r.y(), \
r.width(), r.height()); }
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_replaced.h #784731:784732
@@ -122,7 +122,7 @@
void setDoesNotOwnWidget() { m_ownsWidget = false; }
virtual void paintBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty);
- virtual void paintBackground(QPainter *p, const QColor& c, const \
BackgroundLayer* bgLayer, QRect clipr, int _tx, int _ty, int w, int height); + \
virtual void paintOneBackground(QPainter *p, const QColor& c, const BackgroundLayer* \
bgLayer, QRect clipr, int _tx, int _ty, int w, int height);
virtual bool canHaveBorder() const { return false; }
virtual bool includesPadding() const { return false; }
--- branches/KDE/4.0/kdelibs/khtml/rendering/render_table.cpp #784731:784732
@@ -548,7 +548,7 @@
cr.setWidth(mw);
cr.setHeight(mh);
- paintBackground(pI.p, style()->backgroundColor(), style()->backgroundLayers(), \
cr, _tx, _ty, w, h); + paintOneBackground(pI.p, style()->backgroundColor(), \
style()->backgroundLayers(), cr, _tx, _ty, w, h);
if (style()->hasBorder() && !collapseBorders())
paintBorder(pI.p, _tx, _ty, w, h, style());
@@ -3052,7 +3052,7 @@
pI.p->setClipRegion(creg);
}
KHTMLAssert(bgObj->isBox());
- static_cast<RenderBox*>(bgObj)->paintBackgrounds(pI.p, c, bgLayer, cr, _tx, \
_ty, w, h); + static_cast<RenderBox*>(bgObj)->paintAllBackgrounds(pI.p, c, \
bgLayer, cr, _tx, _ty, w, h); if (hasLayer && tableElt->collapseBorders())
pI.p->restore();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic