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

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

Issue 696703005: Remove RenderSelectionInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated after Kouhei's comment. Created 6 years, 1 month 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
« no previous file with comments | « Source/core/rendering/RenderSelectionInfo.h ('k') | Source/core/rendering/RenderView.cpp » ('j') | 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 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 if (startPos == endPos) 1622 if (startPos == endPos)
1623 return IntRect(); 1623 return IntRect();
1624 1624
1625 LayoutRect rect; 1625 LayoutRect rect;
1626 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) { 1626 for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
1627 rect.unite(box->localSelectionRect(startPos, endPos)); 1627 rect.unite(box->localSelectionRect(startPos, endPos));
1628 rect.unite(ellipsisRectForBox(box, startPos, endPos)); 1628 rect.unite(ellipsisRectForBox(box, startPos, endPos));
1629 } 1629 }
1630 1630
1631 mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, 0); 1631 mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, 0);
1632 // FIXME: groupedMapping() leaks the squashing abstraction.
1633 if (paintInvalidationContainer->layer()->groupedMapping())
1634 RenderLayer::mapRectToPaintBackingCoordinates(paintInvalidationContainer , rect);
1632 return rect; 1635 return rect;
1633 } 1636 }
1634 1637
1635 int RenderText::caretMinOffset() const 1638 int RenderText::caretMinOffset() const
1636 { 1639 {
1637 InlineTextBox* box = firstTextBox(); 1640 InlineTextBox* box = firstTextBox();
1638 if (!box) 1641 if (!box)
1639 return 0; 1642 return 0;
1640 int minOffset = box->start(); 1643 int minOffset = box->start();
1641 for (box = box->nextTextBox(); box; box = box->nextTextBox()) 1644 for (box = box->nextTextBox(); box; box = box->nextTextBox())
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1869 } 1872 }
1870 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); 1873 secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
1871 } 1874 }
1872 1875
1873 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() 1876 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox()
1874 { 1877 {
1875 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); 1878 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox);
1876 } 1879 }
1877 1880
1878 } // namespace blink 1881 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderSelectionInfo.h ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698