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

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

Issue 232133004: Split WebLocalFrame into a distinct subclass of WebFrame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix Mac Created 6 years, 8 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/WebTestingSupport.cpp ('k') | Source/web/tests/ChromeClientImplTest.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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 NSDictionary* attributes = [string attributesAtIndex:0 effectiveRange:NU LL]; 140 NSDictionary* attributes = [string attributesAtIndex:0 effectiveRange:NU LL];
141 NSFont* font = [attributes objectForKey:NSFontAttributeName]; 141 NSFont* font = [attributes objectForKey:NSFontAttributeName];
142 if (font) 142 if (font)
143 stringPoint.move(0, ceil(-[font descender])); 143 stringPoint.move(0, ceil(-[font descender]));
144 } 144 }
145 145
146 baselinePoint = stringPoint; 146 baselinePoint = stringPoint;
147 return string; 147 return string;
148 } 148 }
149 149
150 NSAttributedString* WebSubstringUtil::attributedSubstringInRange(WebFrame* webFr ame, size_t location, size_t length) 150 NSAttributedString* WebSubstringUtil::attributedSubstringInRange(WebLocalFrame* webFrame, size_t location, size_t length)
151 { 151 {
152 LocalFrame* frame = toWebFrameImpl(webFrame)->frame(); 152 LocalFrame* frame = toWebFrameImpl(webFrame)->frame();
153 if (frame->view()->needsLayout()) 153 if (frame->view()->needsLayout())
154 frame->view()->layout(); 154 frame->view()->layout();
155 155
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/WebTestingSupport.cpp ('k') | Source/web/tests/ChromeClientImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698