| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 { | 94 { |
| 95 WebRange copy(*this); | 95 WebRange copy(*this); |
| 96 copy.m_private->expand("block", IGNORE_EXCEPTION); | 96 copy.m_private->expand("block", IGNORE_EXCEPTION); |
| 97 return copy; | 97 return copy; |
| 98 } | 98 } |
| 99 | 99 |
| 100 // static | 100 // static |
| 101 WebRange WebRange::fromDocumentRange(WebLocalFrame* frame, int start, int length
) | 101 WebRange WebRange::fromDocumentRange(WebLocalFrame* frame, int start, int length
) |
| 102 { | 102 { |
| 103 LocalFrame* webFrame = toWebLocalFrameImpl(frame)->frame(); | 103 LocalFrame* webFrame = toWebLocalFrameImpl(frame)->frame(); |
| 104 Element* selectionRoot = webFrame->selection().rootEditableElement(); | 104 ContainerNode* selectionRoot = webFrame->selection().rootEditableElement(); |
| 105 ContainerNode* scope = selectionRoot ? selectionRoot : webFrame->document()-
>documentElement(); | 105 ContainerNode* scope = selectionRoot ? selectionRoot : webFrame->document(); |
| 106 return PlainTextRange(start, start + length).createRange(*scope); | 106 return PlainTextRange(start, start + length).createRange(*scope); |
| 107 } | 107 } |
| 108 | 108 |
| 109 WebRange::WebRange(const PassRefPtr<Range>& range) | 109 WebRange::WebRange(const PassRefPtr<Range>& range) |
| 110 : m_private(range) | 110 : m_private(range) |
| 111 { | 111 { |
| 112 } | 112 } |
| 113 | 113 |
| 114 WebRange::operator PassRefPtr<Range>() const | 114 WebRange::operator PassRefPtr<Range>() const |
| 115 { | 115 { |
| 116 return m_private.get(); | 116 return m_private.get(); |
| 117 } | 117 } |
| 118 | 118 |
| 119 } // namespace blink | 119 } // namespace blink |
| OLD | NEW |