Changeset 88213 in webkit


Ignore:
Timestamp:
Jun 6, 2011, 9:06:51 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-06 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r88202.
​http://trac.webkit.org/changeset/88202
​https://bugs.webkit.org/show_bug.cgi?id=62182

This broke the mac clang bot (Requested by koz on #webkit).

  • dom/Node.cpp: (WebCore::Node::hasNonEmptyBoundingBox):
  • rendering/InlineBox.h:
  • rendering/RenderBlock.cpp: (WebCore::RenderBlock::absoluteRects):
  • rendering/RenderBlock.h:
  • rendering/RenderBox.cpp: (WebCore::RenderBox::absoluteRects):
  • rendering/RenderBox.h:
  • rendering/RenderInline.cpp: (WebCore::RenderInline::absoluteRects):
  • rendering/RenderInline.h:
  • rendering/RenderObject.cpp: (WebCore::RenderObject::absoluteBoundingBoxRect):
  • rendering/RenderObject.h: (WebCore::RenderObject::absoluteRects):
  • rendering/RenderText.cpp: (WebCore::RenderText::absoluteRects):
  • rendering/RenderText.h:
  • rendering/RenderView.cpp: (WebCore::RenderView::absoluteRects):
  • rendering/RenderView.h:
Location:
trunk/Source/WebCore
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r88212 r88213  
     12011-06-06  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r88202.
     4        http://trac.webkit.org/changeset/88202
     5        https://bugs.webkit.org/show_bug.cgi?id=62182
     6
     7        This broke the mac clang bot (Requested by koz__ on #webkit).
     8
     9        * dom/Node.cpp:
     10        (WebCore::Node::hasNonEmptyBoundingBox):
     11        * rendering/InlineBox.h:
     12        * rendering/RenderBlock.cpp:
     13        (WebCore::RenderBlock::absoluteRects):
     14        * rendering/RenderBlock.h:
     15        * rendering/RenderBox.cpp:
     16        (WebCore::RenderBox::absoluteRects):
     17        * rendering/RenderBox.h:
     18        * rendering/RenderInline.cpp:
     19        (WebCore::RenderInline::absoluteRects):
     20        * rendering/RenderInline.h:
     21        * rendering/RenderObject.cpp:
     22        (WebCore::RenderObject::absoluteBoundingBoxRect):
     23        * rendering/RenderObject.h:
     24        (WebCore::RenderObject::absoluteRects):
     25        * rendering/RenderText.cpp:
     26        (WebCore::RenderText::absoluteRects):
     27        * rendering/RenderText.h:
     28        * rendering/RenderView.cpp:
     29        (WebCore::RenderView::absoluteRects):
     30        * rendering/RenderView.h:
     31
    1322011-06-06  Noel Gordon  <noel.gordon@gmail.com>
    233

  • trunk/Source/WebCore/dom/Node.cpp

    r88202 r88213  
    840840    Vector<IntRect> rects;
    841841    FloatPoint absPos = renderer()->localToAbsolute();
    842     renderer()->absoluteRects(rects, flooredIntPoint(absPos));
     842    renderer()->absoluteRects(rects, absPos.x(), absPos.y());
    843843    size_t n = rects.size();
    844844    for (size_t i = 0; i < n; ++i)

  • trunk/Source/WebCore/rendering/InlineBox.h

    r88202 r88213  
    237237    float width() const { return isHorizontal() ? logicalWidth() : logicalHeight(); }
    238238    float height() const { return isHorizontal() ? logicalHeight() : logicalWidth(); }
    239     FloatSize size() const { return IntSize(width(), height()); }
    240239    float right() const { return left() + width(); }
    241240    float bottom() const { return top() + height(); }

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r88205 r88213  
    56655665}
    56665666
    5667 void RenderBlock::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
     5667void RenderBlock::absoluteRects(Vector<IntRect>& rects, int tx, int ty)
    56685668{
    56695669    // For blocks inside inlines, we go ahead and include margins so that we run right up to the
    … …  
    56735673        // FIXME: This is wrong for block-flows that are horizontal.
    56745674        // https://bugs.webkit.org/show_bug.cgi?id=46781
    5675         rects.append(IntRect(accumulatedOffset.x(), accumulatedOffset.y() - collapsedMarginBefore(),
     5675        rects.append(IntRect(tx, ty - collapsedMarginBefore(),
    56765676                             width(), height() + collapsedMarginBefore() + collapsedMarginAfter()));
    5677         continuation()->absoluteRects(rects, accumulatedOffset - toSize(location() +
    5678                 inlineElementContinuation()->containingBlock()->location()));
     5677        continuation()->absoluteRects(rects,
     5678                                      tx - x() + inlineElementContinuation()->containingBlock()->x(),
     5679                                      ty - y() + inlineElementContinuation()->containingBlock()->y());
    56795680    } else
    5680         rects.append(IntRect(accumulatedOffset, size()));
     5681        rects.append(IntRect(tx, ty, width(), height()));
    56815682}
    56825683

  • trunk/Source/WebCore/rendering/RenderBlock.h

    r88202 r88213  
    626626    int logicalRightSelectionOffset(RenderBlock* rootBlock, int position);
    627627   
    628     virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
     628    virtual void absoluteRects(Vector<IntRect>&, int tx, int ty);
    629629    virtual void absoluteQuads(Vector<FloatQuad>&);
    630630

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r88202 r88213  
    456456}
    457457
    458 void RenderBox::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
    459 {
    460     rects.append(IntRect(accumulatedOffset, size()));
     458void RenderBox::absoluteRects(Vector<IntRect>& rects, int tx, int ty)
     459{
     460    rects.append(IntRect(tx, ty, width(), height()));
    461461}
    462462

  • trunk/Source/WebCore/rendering/RenderBox.h

    r88202 r88213  
    231231    virtual int collapsedMarginAfter() const { return marginAfter(); }
    232232
    233     virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
     233    virtual void absoluteRects(Vector<IntRect>&, int tx, int ty);
    234234    virtual void absoluteQuads(Vector<FloatQuad>&);
    235235   

  • trunk/Source/WebCore/rendering/RenderInline.cpp

    r88202 r88213  
    466466}
    467467
    468 void RenderInline::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
     468void RenderInline::absoluteRects(Vector<IntRect>& rects, int tx, int ty)
    469469{
    470470    if (!alwaysCreateLineBoxes())
    471         culledInlineAbsoluteRects(this, rects, toSize(accumulatedOffset));
     471        culledInlineAbsoluteRects(this, rects, IntSize(tx, ty));
    472472    else if (InlineFlowBox* curr = firstLineBox()) {
    473473        for (; curr; curr = curr->nextLineBox())
    474             rects.append(enclosingIntRect(FloatRect(accumulatedOffset + curr->topLeft(), curr->size())));
     474            rects.append(enclosingIntRect(FloatRect(tx + curr->x(), ty + curr->y(), curr->width(), curr->height())));
    475475    } else
    476         rects.append(IntRect(accumulatedOffset, IntSize()));
     476        rects.append(IntRect(tx, ty, 0, 0));
    477477
    478478    if (continuation()) {
    479479        if (continuation()->isBox()) {
    480480            RenderBox* box = toRenderBox(continuation());
    481             continuation()->absoluteRects(rects, toPoint(accumulatedOffset - containingBlock()->location() + box->size()));
     481            continuation()->absoluteRects(rects,
     482                                          tx - containingBlock()->x() + box->x(),
     483                                          ty - containingBlock()->y() + box->y());
    482484        } else
    483             continuation()->absoluteRects(rects, toPoint(accumulatedOffset - containingBlock()->location()));
     485            continuation()->absoluteRects(rects, tx - containingBlock()->x(), ty - containingBlock()->y());
    484486    }
    485487}

  • trunk/Source/WebCore/rendering/RenderInline.h

    r88202 r88213  
    4949    virtual int marginEnd() const;
    5050
    51     virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
     51    virtual void absoluteRects(Vector<IntRect>&, int tx, int ty);
    5252    virtual void absoluteQuads(Vector<FloatQuad>&);
    5353

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r88202 r88213  
    11001100    FloatPoint absPos = localToAbsolute();
    11011101    Vector<IntRect> rects;
    1102     absoluteRects(rects, flooredIntPoint(absPos));
     1102    absoluteRects(rects, absPos.x(), absPos.y());
    11031103
    11041104    size_t n = rects.size();

  • trunk/Source/WebCore/rendering/RenderObject.h

    r88202 r88213  
    591591    IntSize offsetFromAncestorContainer(RenderObject*) const;
    592592   
    593     virtual void absoluteRects(Vector<IntRect>&, const IntPoint&) { }
     593    virtual void absoluteRects(Vector<IntRect>&, int, int) { }
    594594    // FIXME: useTransforms should go away eventually
    595595    IntRect absoluteBoundingBoxRect(bool useTransforms = false);

  • trunk/Source/WebCore/rendering/RenderText.cpp

    r88202 r88213  
    270270}
    271271
    272 void RenderText::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
     272void RenderText::absoluteRects(Vector<IntRect>& rects, int tx, int ty)
    273273{
    274274    for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox())
    275         rects.append(enclosingIntRect(FloatRect(accumulatedOffset + box->topLeft(), box->size())));
     275        rects.append(enclosingIntRect(FloatRect(tx + box->x(), ty + box->y(), box->width(), box->height())));
    276276}
    277277

  • trunk/Source/WebCore/rendering/RenderText.h

    r88202 r88213  
    5757    void dirtyLineBoxes(bool fullLayout);
    5858
    59     virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
     59    virtual void absoluteRects(Vector<IntRect>&, int tx, int ty);
    6060    void absoluteRectsForRange(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false);
    6161

  • trunk/Source/WebCore/rendering/RenderView.cpp

    r88202 r88213  
    322322}
    323323
    324 void RenderView::absoluteRects(Vector<IntRect>& rects, const IntPoint& accumulatedOffset)
    325 {
    326     rects.append(IntRect(accumulatedOffset, m_layer->size()));
     324void RenderView::absoluteRects(Vector<IntRect>& rects, int tx, int ty)
     325{
     326    rects.append(IntRect(IntPoint(tx, ty), m_layer->size()));
    327327}
    328328

  • trunk/Source/WebCore/rendering/RenderView.h

    r88202 r88213  
    8383    bool printing() const;
    8484
    85     virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
     85    virtual void absoluteRects(Vector<IntRect>&, int tx, int ty);
    8686    virtual void absoluteQuads(Vector<FloatQuad>&);
    8787
Note: See TracChangeset for help on using the changeset viewer.