[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2005-08-05 11:31:00
Message-ID: 1123241460.964566.4367.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 443213 by carewolf:

This code is no longer here in WebCore, so don't increase diff by keeping it.


 M  +0 -43     render_inline.cpp  
 M  +0 -5      render_inline.h  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_inline.cpp #443212:443213
@@ -267,53 +267,10 @@
 
     i.phase = oldphase;
     if (style()->visibility() == VISIBLE && i.phase == PaintActionOutline) {
-#ifdef APPLE_CHANGES
-        if (style()->outlineStyleIsAuto())
-            paintFocusRing(i.p, _tx, _ty);
-        else
-#endif
         paintOutlines(i.p, _tx, _ty);
     }
 }
 
-#ifdef APPLE_CHANGES
-void RenderInline::addFocusRingRects(QPainter *p, int _tx, int _ty)
-{
-    for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
-        p->addFocusRingRect(_tx + curr->xPos(),
-                            _ty + curr->yPos(),
-                            curr->width(),
-                            curr->height());
-    }
-
-    for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
-        if (!curr->isText())
-            curr->addFocusRingRects(p, _tx + curr->xPos(), _ty + curr->yPos());
-    }
-
-    if (continuation())
-        continuation()->addFocusRingRects(p,
-                                          _tx - containingBlock()->xPos() + continuation()->xPos(),
-                                          _ty - containingBlock()->yPos() + continuation()->yPos());
-}
-
-void RenderInline::paintFocusRing(QPainter *p, int tx, int ty)
-{
-    int ow = style()->outlineWidth();
-    if (ow == 0 || m_isContinuation) // Continuations get painted by the original inline.
-        return;
-
-    QColor oc = style()->outlineColor();
-    if (!oc.isValid())
-        oc = style()->color();
-
-    p->initFocusRing(ow,  style()->outlineOffset(), oc);
-    addFocusRingRects(p, tx, ty);
-    p->drawFocusRing();
-    p->clearFocusRing();
-}
-#endif
-
 /**
  * Appends the given coordinate-pair to the point-array if it is not
  * equal to the last element.
--- branches/KDE/3.5/kdelibs/khtml/rendering/render_inline.h #443212:443213
@@ -75,11 +75,6 @@
     virtual int offsetLeft() const;
     virtual int offsetTop() const;
 
-#ifdef APPLE_CHANGES
-    virtual void addFocusRingRects(QPainter *painter, int _tx, int _ty);
-    void paintFocusRing(QPainter *p, int tx, int ty);
-#endif
-
     virtual void caretPos(int offset, int flags, int &_x, int &_y, int &width, int &height);
 
 protected:
[prev in list] [next in list] [prev in thread] [next in thread]