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

Side by Side Diff: Source/web/mac/WebSubstringUtil.mm

Issue 252783002: Make Range.detach() a no-op (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 7 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/web/WebRange.cpp ('k') | Source/web/tests/TextFinderTest.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) 2005, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 NSMutableAttributedString* string = [[NSMutableAttributedString alloc] init] ; 63 NSMutableAttributedString* string = [[NSMutableAttributedString alloc] init] ;
64 NSMutableDictionary* attrs = [NSMutableDictionary dictionary]; 64 NSMutableDictionary* attrs = [NSMutableDictionary dictionary];
65 size_t length = range->endOffset() - range->startOffset(); 65 size_t length = range->endOffset() - range->startOffset();
66 66
67 unsigned position = 0; 67 unsigned position = 0;
68 for (TextIterator it(range); !it.atEnd() && [string length] < length; it.adv ance()) { 68 for (TextIterator it(range); !it.atEnd() && [string length] < length; it.adv ance()) {
69 unsigned numCharacters = it.length(); 69 unsigned numCharacters = it.length();
70 if (!numCharacters) 70 if (!numCharacters)
71 continue; 71 continue;
72 72
73 Node* container = it.range()->startContainer(IGNORE_EXCEPTION); 73 Node* container = it.range()->startContainer();
74 RenderObject* renderer = container->renderer(); 74 RenderObject* renderer = container->renderer();
75 ASSERT(renderer); 75 ASSERT(renderer);
76 if (!renderer) 76 if (!renderer)
77 continue; 77 continue;
78 78
79 RenderStyle* style = renderer->style(); 79 RenderStyle* style = renderer->style();
80 NSFont* font = style->font().primaryFont()->getNSFont(); 80 NSFont* font = style->font().primaryFont()->getNSFont();
81 // If the platform font can't be loaded, it's likely that the site is 81 // If the platform font can't be loaded, it's likely that the site is
82 // using a web font. For now, just use the default font instead. 82 // using a web font. For now, just use the default font instead.
83 // TODO(rsesek): Change the font activation flags to allow other process es 83 // TODO(rsesek): Change the font activation flags to allow other process es
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 Element* editable = frame->selection().rootEditableElementOrDocumentElement( ); 156 Element* editable = frame->selection().rootEditableElementOrDocumentElement( );
157 ASSERT(editable); 157 ASSERT(editable);
158 RefPtrWillBeRawPtr<Range> range(PlainTextRange(location, location + length). createRange(*editable)); 158 RefPtrWillBeRawPtr<Range> range(PlainTextRange(location, location + length). createRange(*editable));
159 if (!range) 159 if (!range)
160 return nil; 160 return nil;
161 161
162 return attributedSubstringFromRange(range.get()); 162 return attributedSubstringFromRange(range.get());
163 } 163 }
164 164
165 } // namespace blink 165 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebRange.cpp ('k') | Source/web/tests/TextFinderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698