| Index: sky/engine/core/rendering/RenderText.cpp
|
| diff --git a/sky/engine/core/rendering/RenderText.cpp b/sky/engine/core/rendering/RenderText.cpp
|
| index 92dd2bb85472a260544fa5b81a88daa57199984d..a5d0938f26e504cebd49dffdbb1650aa3294a4af 100644
|
| --- a/sky/engine/core/rendering/RenderText.cpp
|
| +++ b/sky/engine/core/rendering/RenderText.cpp
|
| @@ -252,7 +252,7 @@ static FloatRect localQuadForTextBox(InlineTextBox* box, unsigned start, unsigne
|
| return FloatRect();
|
| }
|
|
|
| -void RenderText::absoluteRectsForRange(Vector<IntRect>& rects, unsigned start, unsigned end, bool useSelectionHeight, bool* wasFixed)
|
| +void RenderText::absoluteRectsForRange(Vector<IntRect>& rects, unsigned start, unsigned end, bool useSelectionHeight)
|
| {
|
| // Work around signed/unsigned issues. This function takes unsigneds, and is often passed UINT_MAX
|
| // to mean "all the way to the end". InlineTextBox coordinates are unsigneds, so changing this
|
| @@ -278,12 +278,12 @@ void RenderText::absoluteRectsForRange(Vector<IntRect>& rects, unsigned start, u
|
| r.setX(selectionRect.x().toFloat());
|
| }
|
| }
|
| - rects.append(localToAbsoluteQuad(r, 0, wasFixed).enclosingBoundingBox());
|
| + rects.append(localToAbsoluteQuad(r, 0).enclosingBoundingBox());
|
| } else {
|
| // FIXME: This code is wrong. It's converting local to absolute twice. http://webkit.org/b/65722
|
| FloatRect rect = localQuadForTextBox(box, start, end, useSelectionHeight);
|
| if (!rect.isZero())
|
| - rects.append(localToAbsoluteQuad(rect, 0, wasFixed).enclosingBoundingBox());
|
| + rects.append(localToAbsoluteQuad(rect, 0).enclosingBoundingBox());
|
| }
|
| }
|
| }
|
| @@ -312,7 +312,7 @@ static IntRect ellipsisRectForBox(InlineTextBox* box, unsigned startPos, unsigne
|
| return IntRect();
|
| }
|
|
|
| -void RenderText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed, ClippingOption option) const
|
| +void RenderText::absoluteQuads(Vector<FloatQuad>& quads, ClippingOption option) const
|
| {
|
| for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
|
| FloatRect boundaries = box->calculateBoundaries();
|
| @@ -326,16 +326,16 @@ void RenderText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed, Clippin
|
| else
|
| boundaries.setHeight(ellipsisRect.maxY() - boundaries.y());
|
| }
|
| - quads.append(localToAbsoluteQuad(boundaries, 0, wasFixed));
|
| + quads.append(localToAbsoluteQuad(boundaries, 0));
|
| }
|
| }
|
|
|
| -void RenderText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const
|
| +void RenderText::absoluteQuads(Vector<FloatQuad>& quads) const
|
| {
|
| - absoluteQuads(quads, wasFixed, NoClipping);
|
| + absoluteQuads(quads, NoClipping);
|
| }
|
|
|
| -void RenderText::absoluteQuadsForRange(Vector<FloatQuad>& quads, unsigned start, unsigned end, bool useSelectionHeight, bool* wasFixed)
|
| +void RenderText::absoluteQuadsForRange(Vector<FloatQuad>& quads, unsigned start, unsigned end, bool useSelectionHeight)
|
| {
|
| // Work around signed/unsigned issues. This function takes unsigneds, and is often passed UINT_MAX
|
| // to mean "all the way to the end". InlineTextBox coordinates are unsigneds, so changing this
|
| @@ -361,11 +361,11 @@ void RenderText::absoluteQuadsForRange(Vector<FloatQuad>& quads, unsigned start,
|
| r.setX(selectionRect.x().toFloat());
|
| }
|
| }
|
| - quads.append(localToAbsoluteQuad(r, 0, wasFixed));
|
| + quads.append(localToAbsoluteQuad(r, 0));
|
| } else {
|
| FloatRect rect = localQuadForTextBox(box, start, end, useSelectionHeight);
|
| if (!rect.isZero())
|
| - quads.append(localToAbsoluteQuad(rect, 0, wasFixed));
|
| + quads.append(localToAbsoluteQuad(rect, 0));
|
| }
|
| }
|
| }
|
|
|