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

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

Issue 308963002: Minimize calls to Node::nodeType() as it is virtual (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix typo Created 6 years, 6 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
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 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 m_end.set(m_start.container(), m_start.offset() + numNewChildren, la stChild.get()); 944 m_end.set(m_start.container(), m_start.offset() + numNewChildren, la stChild.get());
945 } 945 }
946 } 946 }
947 947
948 String Range::toString() const 948 String Range::toString() const
949 { 949 {
950 StringBuilder builder; 950 StringBuilder builder;
951 951
952 Node* pastLast = pastLastNode(); 952 Node* pastLast = pastLastNode();
953 for (Node* n = firstNode(); n != pastLast; n = NodeTraversal::next(*n)) { 953 for (Node* n = firstNode(); n != pastLast; n = NodeTraversal::next(*n)) {
954 if (n->nodeType() == Node::TEXT_NODE || n->nodeType() == Node::CDATA_SEC TION_NODE) { 954 Node::NodeType type = n->nodeType();
955 if (type == Node::TEXT_NODE || type == Node::CDATA_SECTION_NODE) {
955 String data = toCharacterData(n)->data(); 956 String data = toCharacterData(n)->data();
956 int length = data.length(); 957 int length = data.length();
957 int start = (n == m_start.container()) ? min(max(0, m_start.offset() ), length) : 0; 958 int start = (n == m_start.container()) ? min(max(0, m_start.offset() ), length) : 0;
958 int end = (n == m_end.container()) ? min(max(start, m_end.offset()), length) : length; 959 int end = (n == m_end.container()) ? min(max(start, m_end.offset()), length) : length;
959 builder.append(data, start, end - start); 960 builder.append(data, start, end - start);
960 } 961 }
961 } 962 }
962 963
963 return builder.toString(); 964 return builder.toString();
964 } 965 }
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
1688 1689
1689 void showTree(const WebCore::Range* range) 1690 void showTree(const WebCore::Range* range)
1690 { 1691 {
1691 if (range && range->boundaryPointsValid()) { 1692 if (range && range->boundaryPointsValid()) {
1692 range->startContainer()->showTreeAndMark(range->startContainer(), "S", r ange->endContainer(), "E"); 1693 range->startContainer()->showTreeAndMark(range->startContainer(), "S", r ange->endContainer(), "E");
1693 fprintf(stderr, "start offset: %d, end offset: %d\n", range->startOffset (), range->endOffset()); 1694 fprintf(stderr, "start offset: %d, end offset: %d\n", range->startOffset (), range->endOffset());
1694 } 1695 }
1695 } 1696 }
1696 1697
1697 #endif 1698 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698