| OLD | NEW |
| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 { | 73 { |
| 74 return m_private->text(); | 74 return m_private->text(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 // static | 77 // static |
| 78 WebRange WebRange::fromDocumentRange(WebLocalFrame* frame, int start, int length
) | 78 WebRange WebRange::fromDocumentRange(WebLocalFrame* frame, int start, int length
) |
| 79 { | 79 { |
| 80 LocalFrame* webFrame = toWebLocalFrameImpl(frame)->frame(); | 80 LocalFrame* webFrame = toWebLocalFrameImpl(frame)->frame(); |
| 81 Element* selectionRoot = webFrame->selection().rootEditableElement(); | 81 Element* selectionRoot = webFrame->selection().rootEditableElement(); |
| 82 ContainerNode* scope = selectionRoot ? selectionRoot : webFrame->document()-
>documentElement(); | 82 ContainerNode* scope = selectionRoot ? selectionRoot : webFrame->document()-
>documentElement(); |
| 83 const EphemeralRange range = PlainTextRange(start, start + length).createRan
ge(*scope); | 83 return createRange(PlainTextRange(start, start + length).createRange(*scope)
); |
| 84 if (range.isNull()) | |
| 85 return WebRange(); | |
| 86 return Range::create(range.document(), range.startPosition(), range.endPosit
ion()); | |
| 87 } | 84 } |
| 88 | 85 |
| 89 WebRange::WebRange(const PassRefPtrWillBeRawPtr<Range>& range) | 86 WebRange::WebRange(const PassRefPtrWillBeRawPtr<Range>& range) |
| 90 : m_private(range) | 87 : m_private(range) |
| 91 { | 88 { |
| 92 } | 89 } |
| 93 | 90 |
| 94 WebRange::operator PassRefPtrWillBeRawPtr<Range>() const | 91 WebRange::operator PassRefPtrWillBeRawPtr<Range>() const |
| 95 { | 92 { |
| 96 return m_private.get(); | 93 return m_private.get(); |
| 97 } | 94 } |
| 98 | 95 |
| 99 } // namespace blink | 96 } // namespace blink |
| OLD | NEW |