Title: [139393] branches/chromium/1312/Source/WebCore/editing
- Revision
- 139393
- Author
- cev...@google.com
- Date
- 2013-01-10 18:17:29 -0800 (Thu, 10 Jan 2013)
Log Message
Merge 138657
BUG=167827
Review URL: https://codereview.chromium.org/11850002
Modified Paths
Diff
Modified: branches/chromium/1312/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp (139392 => 139393)
--- branches/chromium/1312/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2013-01-11 02:01:02 UTC (rev 139392)
+++ branches/chromium/1312/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2013-01-11 02:17:29 UTC (rev 139393)
@@ -119,7 +119,7 @@
enclosingBlock->hasTagName(h5Tag);
}
-void InsertParagraphSeparatorCommand::getAncestorsInsideBlock(const Node* insertionNode, Element* outerBlock, Vector<Element*>& ancestors)
+void InsertParagraphSeparatorCommand::getAncestorsInsideBlock(const Node* insertionNode, Element* outerBlock, Vector<RefPtr<Element> >& ancestors)
{
ancestors.clear();
@@ -130,7 +130,7 @@
}
}
-PassRefPtr<Element> InsertParagraphSeparatorCommand::cloneHierarchyUnderNewBlock(const Vector<Element*>& ancestors, PassRefPtr<Element> blockToInsert)
+PassRefPtr<Element> InsertParagraphSeparatorCommand::cloneHierarchyUnderNewBlock(const Vector<RefPtr<Element> >& ancestors, PassRefPtr<Element> blockToInsert)
{
// Make clones of ancestors in between the start node and the start block.
RefPtr<Element> parent = blockToInsert;
@@ -239,7 +239,7 @@
// Recreate the same structure in the new paragraph.
- Vector<Element*> ancestors;
+ Vector<RefPtr<Element> > ancestors;
getAncestorsInsideBlock(positionOutsideTabSpan(insertionPosition).deprecatedNode(), startBlock.get(), ancestors);
RefPtr<Element> parent = cloneHierarchyUnderNewBlock(ancestors, blockToInsert);
@@ -278,7 +278,7 @@
// Recreate the same structure in the new paragraph.
- Vector<Element*> ancestors;
+ Vector<RefPtr<Element> > ancestors;
getAncestorsInsideBlock(positionAvoidingSpecialElementBoundary(positionOutsideTabSpan(insertionPosition)).deprecatedNode(), startBlock.get(), ancestors);
appendBlockPlaceholder(cloneHierarchyUnderNewBlock(ancestors, blockToInsert));
Modified: branches/chromium/1312/Source/WebCore/editing/InsertParagraphSeparatorCommand.h (139392 => 139393)
--- branches/chromium/1312/Source/WebCore/editing/InsertParagraphSeparatorCommand.h 2013-01-11 02:01:02 UTC (rev 139392)
+++ branches/chromium/1312/Source/WebCore/editing/InsertParagraphSeparatorCommand.h 2013-01-11 02:17:29 UTC (rev 139393)
@@ -46,8 +46,8 @@
void calculateStyleBeforeInsertion(const Position&);
void applyStyleAfterInsertion(Node* originalEnclosingBlock);
- void getAncestorsInsideBlock(const Node* insertionNode, Element* outerBlock, Vector<Element*>& ancestors);
- PassRefPtr<Element> cloneHierarchyUnderNewBlock(const Vector<Element*>& ancestors, PassRefPtr<Element> blockToInsert);
+ void getAncestorsInsideBlock(const Node* insertionNode, Element* outerBlock, Vector<RefPtr<Element> >& ancestors);
+ PassRefPtr<Element> cloneHierarchyUnderNewBlock(const Vector<RefPtr<Element> >& ancestors, PassRefPtr<Element> blockToInsert);
bool shouldUseDefaultParagraphElement(Node*) const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
