| 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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 RemoveNode(node_after_downstream_start, editing_state); | 424 RemoveNode(node_after_downstream_start, editing_state); |
| 425 return true; | 425 return true; |
| 426 } | 426 } |
| 427 | 427 |
| 428 // FIXME: This code doesn't belong in here. | 428 // FIXME: This code doesn't belong in here. |
| 429 // We detect the case where the start is an empty line consisting of BR not | 429 // We detect the case where the start is an empty line consisting of BR not |
| 430 // wrapped in a block element. | 430 // wrapped in a block element. |
| 431 if (upstream_start_is_br && downstream_start_is_br) { | 431 if (upstream_start_is_br && downstream_start_is_br) { |
| 432 GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets(); | 432 GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets(); |
| 433 if (!(IsStartOfBlock( | 433 if (!(IsStartOfBlock( |
| 434 VisiblePosition::BeforeNode(node_after_upstream_start)) && | 434 VisiblePosition::BeforeNode(*node_after_upstream_start)) && |
| 435 IsEndOfBlock( | 435 IsEndOfBlock( |
| 436 VisiblePosition::AfterNode(*node_after_upstream_start)))) { | 436 VisiblePosition::AfterNode(*node_after_upstream_start)))) { |
| 437 starts_at_empty_line_ = true; | 437 starts_at_empty_line_ = true; |
| 438 ending_position_ = downstream_end_; | 438 ending_position_ = downstream_end_; |
| 439 } | 439 } |
| 440 } | 440 } |
| 441 | 441 |
| 442 return false; | 442 return false; |
| 443 } | 443 } |
| 444 | 444 |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1247 visitor->Trace(delete_into_blockquote_style_); | 1247 visitor->Trace(delete_into_blockquote_style_); |
| 1248 visitor->Trace(start_root_); | 1248 visitor->Trace(start_root_); |
| 1249 visitor->Trace(end_root_); | 1249 visitor->Trace(end_root_); |
| 1250 visitor->Trace(start_table_row_); | 1250 visitor->Trace(start_table_row_); |
| 1251 visitor->Trace(end_table_row_); | 1251 visitor->Trace(end_table_row_); |
| 1252 visitor->Trace(temporary_placeholder_); | 1252 visitor->Trace(temporary_placeholder_); |
| 1253 CompositeEditCommand::Trace(visitor); | 1253 CompositeEditCommand::Trace(visitor); |
| 1254 } | 1254 } |
| 1255 | 1255 |
| 1256 } // namespace blink | 1256 } // namespace blink |
| OLD | NEW |