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

Side by Side Diff: Source/core/editing/InsertParagraphSeparatorCommand.cpp

Issue 182383012: Have positionInParentBeforeNode() / positionInParentAfterNode() take a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 9 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/core/editing/InsertListCommand.cpp ('k') | Source/core/editing/InsertTextCommand.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, 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2005, 2006 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 //--------------------------------------------------------------------- 306 //---------------------------------------------------------------------
307 // Handle the (more complicated) general case, 307 // Handle the (more complicated) general case,
308 308
309 // All of the content in the current block after visiblePos is 309 // All of the content in the current block after visiblePos is
310 // about to be wrapped in a new paragraph element. Add a br before 310 // about to be wrapped in a new paragraph element. Add a br before
311 // it if visiblePos is at the start of a paragraph so that the 311 // it if visiblePos is at the start of a paragraph so that the
312 // content will move down a line. 312 // content will move down a line.
313 if (isStartOfParagraph(visiblePos)) { 313 if (isStartOfParagraph(visiblePos)) {
314 RefPtr<Element> br = createBreakElement(document()); 314 RefPtr<Element> br = createBreakElement(document());
315 insertNodeAt(br.get(), insertionPosition); 315 insertNodeAt(br.get(), insertionPosition);
316 insertionPosition = positionInParentAfterNode(br.get()); 316 insertionPosition = positionInParentAfterNode(*br);
317 // If the insertion point is a break element, there is nothing else 317 // If the insertion point is a break element, there is nothing else
318 // we need to do. 318 // we need to do.
319 if (visiblePos.deepEquivalent().anchorNode()->renderer()->isBR()) { 319 if (visiblePos.deepEquivalent().anchorNode()->renderer()->isBR()) {
320 setEndingSelection(VisibleSelection(insertionPosition, DOWNSTREAM, e ndingSelection().isDirectional())); 320 setEndingSelection(VisibleSelection(insertionPosition, DOWNSTREAM, e ndingSelection().isDirectional()));
321 return; 321 return;
322 } 322 }
323 } 323 }
324 324
325 // Move downstream. Typing style code will take care of carrying along the 325 // Move downstream. Typing style code will take care of carrying along the
326 // style of the upstream position. 326 // style of the upstream position.
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 if (positionAfterSplit.deprecatedNode()->isTextNode()) 419 if (positionAfterSplit.deprecatedNode()->isTextNode())
420 insertTextIntoNode(toText(positionAfterSplit.containerNode()), 0 , nonBreakingSpaceString()); 420 insertTextIntoNode(toText(positionAfterSplit.containerNode()), 0 , nonBreakingSpaceString());
421 } 421 }
422 } 422 }
423 423
424 setEndingSelection(VisibleSelection(firstPositionInNode(blockToInsert.get()) , DOWNSTREAM, endingSelection().isDirectional())); 424 setEndingSelection(VisibleSelection(firstPositionInNode(blockToInsert.get()) , DOWNSTREAM, endingSelection().isDirectional()));
425 applyStyleAfterInsertion(startBlock.get()); 425 applyStyleAfterInsertion(startBlock.get());
426 } 426 }
427 427
428 } // namespace WebCore 428 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/InsertListCommand.cpp ('k') | Source/core/editing/InsertTextCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698