Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: Source/core/rendering/RenderText.cpp

Issue 598113003: [Regression] Selections are incorrectly invalidated (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed the test to be cross-platform Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderReplaced.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after
1614 1614
1615 if (startPos == endPos) 1615 if (startPos == endPos)
1616 return IntRect(); 1616 return IntRect();
1617 1617
1618 LayoutRect rect; 1618 LayoutRect rect;
1619 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { 1619 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
1620 rect.unite(box->localSelectionRect(startPos, endPos)); 1620 rect.unite(box->localSelectionRect(startPos, endPos));
1621 rect.unite(ellipsisRectForBox(box, startPos, endPos)); 1621 rect.unite(ellipsisRectForBox(box, startPos, endPos));
1622 } 1622 }
1623 1623
1624 if (cb->hasColumns()) 1624 mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, 0);
1625 cb->adjustRectForColumns(rect); 1625 return rect;
1626
1627 return localToContainerQuad(FloatRect(rect), paintInvalidationContainer).enc losingBoundingBox();
1628 } 1626 }
1629 1627
1630 int RenderText::caretMinOffset() const 1628 int RenderText::caretMinOffset() const
1631 { 1629 {
1632 InlineTextBox* box = firstTextBox(); 1630 InlineTextBox* box = firstTextBox();
1633 if (!box) 1631 if (!box)
1634 return 0; 1632 return 0;
1635 int minOffset = box->start(); 1633 int minOffset = box->start();
1636 for (box = box->nextTextBox(); box; box = box->nextTextBox()) 1634 for (box = box->nextTextBox(); box; box = box->nextTextBox())
1637 minOffset = std::min<int>(minOffset, box->start()); 1635 minOffset = std::min<int>(minOffset, box->start());
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1864 } 1862 }
1865 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); 1863 secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
1866 } 1864 }
1867 1865
1868 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() 1866 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox()
1869 { 1867 {
1870 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); 1868 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox);
1871 } 1869 }
1872 1870
1873 } // namespace blink 1871 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderReplaced.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698