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

Side by Side Diff: Source/web/WebFrameImpl.cpp

Issue 171773008: Rename childNodeCount() / childNode() methods for clarity (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Further renaming for consistency 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGUseElement.cpp ('k') | Source/web/WebNode.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 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 m_findMatchesCache.append(FindMatch(resultRange.get(), m_lastMatchCount + matchCount)); 1711 m_findMatchesCache.append(FindMatch(resultRange.get(), m_lastMatchCount + matchCount));
1712 1712
1713 // Set the new start for the search range to be the end of the previous 1713 // Set the new start for the search range to be the end of the previous
1714 // result range. There is no need to use a VisiblePosition here, 1714 // result range. There is no need to use a VisiblePosition here,
1715 // since findPlainText will use a TextIterator to go over the visible 1715 // since findPlainText will use a TextIterator to go over the visible
1716 // text nodes. 1716 // text nodes.
1717 searchRange->setStart(resultRange->endContainer(exceptionState), resultR ange->endOffset(exceptionState), exceptionState); 1717 searchRange->setStart(resultRange->endContainer(exceptionState), resultR ange->endOffset(exceptionState), exceptionState);
1718 1718
1719 Node* shadowTreeRoot = searchRange->shadowRoot(); 1719 Node* shadowTreeRoot = searchRange->shadowRoot();
1720 if (searchRange->collapsed(exceptionState) && shadowTreeRoot) 1720 if (searchRange->collapsed(exceptionState) && shadowTreeRoot)
1721 searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount() , exceptionState); 1721 searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->countChildren(), exceptionState);
1722 1722
1723 m_resumeScopingFromRange = resultRange; 1723 m_resumeScopingFromRange = resultRange;
1724 timedOut = (currentTime() - startTime) >= maxScopingDuration; 1724 timedOut = (currentTime() - startTime) >= maxScopingDuration;
1725 } while (!timedOut); 1725 } while (!timedOut);
1726 1726
1727 // Remember what we search for last time, so we can skip searching if more 1727 // Remember what we search for last time, so we can skip searching if more
1728 // letters are added to the search string (and last outcome was 0). 1728 // letters are added to the search string (and last outcome was 0).
1729 m_lastSearchString = searchText; 1729 m_lastSearchString = searchText;
1730 1730
1731 if (matchCount > 0) { 1731 if (matchCount > 0) {
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
2518 2518
2519 // There is a possibility that the frame being detached was the only 2519 // There is a possibility that the frame being detached was the only
2520 // pending one. We need to make sure final replies can be sent. 2520 // pending one. We need to make sure final replies can be sent.
2521 flushCurrentScopingEffort(m_findRequestIdentifier); 2521 flushCurrentScopingEffort(m_findRequestIdentifier);
2522 2522
2523 cancelPendingScopingEffort(); 2523 cancelPendingScopingEffort();
2524 } 2524 }
2525 } 2525 }
2526 2526
2527 } // namespace blink 2527 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/svg/SVGUseElement.cpp ('k') | Source/web/WebNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698