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

Side by Side Diff: Source/core/dom/Range.cpp

Issue 150653006: Remove the Vector::append overload that takes a Vector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 10 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
« no previous file with comments | « Source/core/dom/DocumentStyleSheetCollector.cpp ('k') | Source/core/dom/StyleEngine.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 Gunnstein Lye (gunnstein@netcom.no) 3 * (C) 2000 Gunnstein Lye (gunnstein@netcom.no)
4 * (C) 2000 Frederik Holljen (frederik.holljen@hig.no) 4 * (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
5 * (C) 2001 Peter Kelly (pmk@post.com) 5 * (C) 2001 Peter Kelly (pmk@post.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
7 * Copyright (C) 2011 Motorola Mobility. All rights reserved. 7 * Copyright (C) 2011 Motorola Mobility. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1824 matching lines...) Expand 10 before | Expand all | Expand 10 after
1835 } 1835 }
1836 1836
1837 for (Node* node = firstNode(); node != stopNode; node = NodeTraversal::next( *node)) { 1837 for (Node* node = firstNode(); node != stopNode; node = NodeTraversal::next( *node)) {
1838 if (node->isElementNode()) { 1838 if (node->isElementNode()) {
1839 if (!nodeSet.contains(node->parentNode())) { 1839 if (!nodeSet.contains(node->parentNode())) {
1840 if (RenderBoxModelObject* renderBoxModelObject = toElement(node) ->renderBoxModelObject()) { 1840 if (RenderBoxModelObject* renderBoxModelObject = toElement(node) ->renderBoxModelObject()) {
1841 Vector<FloatQuad> elementQuads; 1841 Vector<FloatQuad> elementQuads;
1842 renderBoxModelObject->absoluteQuads(elementQuads); 1842 renderBoxModelObject->absoluteQuads(elementQuads);
1843 m_ownerDocument->adjustFloatQuadsForScrollAndAbsoluteZoom(el ementQuads, *renderBoxModelObject); 1843 m_ownerDocument->adjustFloatQuadsForScrollAndAbsoluteZoom(el ementQuads, *renderBoxModelObject);
1844 1844
1845 quads.append(elementQuads); 1845 quads.appendVector(elementQuads);
1846 } 1846 }
1847 } 1847 }
1848 } else if (node->isTextNode()) { 1848 } else if (node->isTextNode()) {
1849 if (RenderObject* renderer = toText(node)->renderer()) { 1849 if (RenderObject* renderer = toText(node)->renderer()) {
1850 RenderText& renderText = toRenderText(*renderer); 1850 RenderText& renderText = toRenderText(*renderer);
1851 int startOffset = (node == startContainer) ? m_start.offset() : 0; 1851 int startOffset = (node == startContainer) ? m_start.offset() : 0;
1852 int endOffset = (node == endContainer) ? m_end.offset() : INT_MA X; 1852 int endOffset = (node == endContainer) ? m_end.offset() : INT_MA X;
1853 1853
1854 Vector<FloatQuad> textQuads; 1854 Vector<FloatQuad> textQuads;
1855 renderText.absoluteQuadsForRange(textQuads, startOffset, endOffs et); 1855 renderText.absoluteQuadsForRange(textQuads, startOffset, endOffs et);
1856 m_ownerDocument->adjustFloatQuadsForScrollAndAbsoluteZoom(textQu ads, renderText); 1856 m_ownerDocument->adjustFloatQuadsForScrollAndAbsoluteZoom(textQu ads, renderText);
1857 1857
1858 quads.append(textQuads); 1858 quads.appendVector(textQuads);
1859 } 1859 }
1860 } 1860 }
1861 } 1861 }
1862 } 1862 }
1863 1863
1864 FloatRect Range::boundingRect() const 1864 FloatRect Range::boundingRect() const
1865 { 1865 {
1866 if (!m_start.container()) 1866 if (!m_start.container())
1867 return FloatRect(); 1867 return FloatRect();
1868 1868
(...skipping 17 matching lines...) Expand all
1886 1886
1887 void showTree(const WebCore::Range* range) 1887 void showTree(const WebCore::Range* range)
1888 { 1888 {
1889 if (range && range->boundaryPointsValid()) { 1889 if (range && range->boundaryPointsValid()) {
1890 range->startContainer()->showTreeAndMark(range->startContainer(), "S", r ange->endContainer(), "E"); 1890 range->startContainer()->showTreeAndMark(range->startContainer(), "S", r ange->endContainer(), "E");
1891 fprintf(stderr, "start offset: %d, end offset: %d\n", range->startOffset (), range->endOffset()); 1891 fprintf(stderr, "start offset: %d, end offset: %d\n", range->startOffset (), range->endOffset());
1892 } 1892 }
1893 } 1893 }
1894 1894
1895 #endif 1895 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentStyleSheetCollector.cpp ('k') | Source/core/dom/StyleEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698