| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2005 Apple Computer, 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 } | 269 } |
| 270 } | 270 } |
| 271 | 271 |
| 272 SetEndingSelectionWithoutValidation(start_position, end_position); | 272 SetEndingSelectionWithoutValidation(start_position, end_position); |
| 273 | 273 |
| 274 // Handle the case where there is a typing style. | 274 // Handle the case where there is a typing style. |
| 275 if (EditingStyle* typing_style = | 275 if (EditingStyle* typing_style = |
| 276 GetDocument().GetFrame()->GetEditor().TypingStyle()) { | 276 GetDocument().GetFrame()->GetEditor().TypingStyle()) { |
| 277 typing_style->PrepareToApplyAt(end_position, | 277 typing_style->PrepareToApplyAt(end_position, |
| 278 EditingStyle::kPreserveWritingDirection); | 278 EditingStyle::kPreserveWritingDirection); |
| 279 if (!typing_style->IsEmpty()) { | 279 if (!typing_style->IsEmpty() && !EndingSelection().IsNone()) { |
| 280 ApplyStyle(typing_style, editing_state); | 280 ApplyStyle(typing_style, editing_state); |
| 281 if (editing_state->IsAborted()) | 281 if (editing_state->IsAborted()) |
| 282 return; | 282 return; |
| 283 } | 283 } |
| 284 } | 284 } |
| 285 | 285 |
| 286 if (!select_inserted_text_) { | 286 if (!select_inserted_text_) { |
| 287 SelectionInDOMTree::Builder builder; | 287 SelectionInDOMTree::Builder builder; |
| 288 builder.SetAffinity(EndingSelection().Affinity()); | 288 builder.SetAffinity(EndingSelection().Affinity()); |
| 289 builder.SetIsDirectional(EndingSelection().IsDirectional()); | 289 builder.SetIsDirectional(EndingSelection().IsDirectional()); |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 } | 332 } |
| 333 } | 333 } |
| 334 if (editing_state->IsAborted()) | 334 if (editing_state->IsAborted()) |
| 335 return Position(); | 335 return Position(); |
| 336 | 336 |
| 337 // return the position following the new tab | 337 // return the position following the new tab |
| 338 return Position::LastPositionInNode(span_element); | 338 return Position::LastPositionInNode(span_element); |
| 339 } | 339 } |
| 340 | 340 |
| 341 } // namespace blink | 341 } // namespace blink |
| OLD | NEW |