| Index: third_party/WebKit/Source/core/editing/EditingUtilities.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
|
| index fed03353f55ed4fa03b8f0b67ffc02d2b62934ef..cde047642ec8224cb217ec16bef851b9ab36505b 100644
|
| --- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
|
| @@ -1231,7 +1231,7 @@ bool isEmptyTableCell(const Node* node)
|
| return !childLayoutObject->nextSibling();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<HTMLElement> createDefaultParagraphElement(Document& document)
|
| +RawPtr<HTMLElement> createDefaultParagraphElement(Document& document)
|
| {
|
| switch (document.frame()->editor().defaultParagraphSeparator()) {
|
| case EditorParagraphSeparatorIsDiv:
|
| @@ -1244,7 +1244,7 @@ PassRefPtrWillBeRawPtr<HTMLElement> createDefaultParagraphElement(Document& docu
|
| return nullptr;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<HTMLElement> createHTMLElement(Document& document, const QualifiedName& name)
|
| +RawPtr<HTMLElement> createHTMLElement(Document& document, const QualifiedName& name)
|
| {
|
| return HTMLElementFactory::createHTMLElement(name.localName(), document, 0, false);
|
| }
|
| @@ -1267,12 +1267,12 @@ HTMLSpanElement* tabSpanElement(const Node* node)
|
| return isTabHTMLSpanElementTextNode(node) ? toHTMLSpanElement(node->parentNode()) : 0;
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<HTMLSpanElement> createTabSpanElement(Document& document, PassRefPtrWillBeRawPtr<Text> prpTabTextNode)
|
| +static RawPtr<HTMLSpanElement> createTabSpanElement(Document& document, RawPtr<Text> prpTabTextNode)
|
| {
|
| - RefPtrWillBeRawPtr<Text> tabTextNode = prpTabTextNode;
|
| + RawPtr<Text> tabTextNode = prpTabTextNode;
|
|
|
| // Make the span to hold the tab.
|
| - RefPtrWillBeRawPtr<HTMLSpanElement> spanElement = HTMLSpanElement::create(document);
|
| + RawPtr<HTMLSpanElement> spanElement = HTMLSpanElement::create(document);
|
| spanElement->setAttribute(classAttr, AppleTabSpanClass);
|
| spanElement->setAttribute(styleAttr, "white-space:pre");
|
|
|
| @@ -1285,14 +1285,14 @@ static PassRefPtrWillBeRawPtr<HTMLSpanElement> createTabSpanElement(Document& do
|
| return spanElement.release();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<HTMLSpanElement> createTabSpanElement(Document& document, const String& tabText)
|
| +RawPtr<HTMLSpanElement> createTabSpanElement(Document& document, const String& tabText)
|
| {
|
| return createTabSpanElement(document, document.createTextNode(tabText));
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<HTMLSpanElement> createTabSpanElement(Document& document)
|
| +RawPtr<HTMLSpanElement> createTabSpanElement(Document& document)
|
| {
|
| - return createTabSpanElement(document, PassRefPtrWillBeRawPtr<Text>(nullptr));
|
| + return createTabSpanElement(document, RawPtr<Text>(nullptr));
|
| }
|
|
|
| bool isNodeRendered(const Node& node)
|
| @@ -1483,7 +1483,7 @@ VisibleSelection selectionForParagraphIteration(const VisibleSelection& original
|
| // opertion is unreliable. TextIterator's TextIteratorEmitsCharactersBetweenAllVisiblePositions mode needs to be fixed,
|
| // or these functions need to be changed to iterate using actual VisiblePositions.
|
| // FIXME: Deploy these functions everywhere that TextIterators are used to convert between VisiblePositions and indices.
|
| -int indexForVisiblePosition(const VisiblePosition& visiblePosition, RefPtrWillBeRawPtr<ContainerNode>& scope)
|
| +int indexForVisiblePosition(const VisiblePosition& visiblePosition, RawPtr<ContainerNode>& scope)
|
| {
|
| if (visiblePosition.isNull())
|
| return 0;
|
| @@ -1497,7 +1497,7 @@ int indexForVisiblePosition(const VisiblePosition& visiblePosition, RefPtrWillBe
|
| else
|
| scope = document.documentElement();
|
|
|
| - RefPtrWillBeRawPtr<Range> range = Range::create(document, firstPositionInNode(scope.get()), p.parentAnchoredEquivalent());
|
| + RawPtr<Range> range = Range::create(document, firstPositionInNode(scope.get()), p.parentAnchoredEquivalent());
|
|
|
| return TextIterator::rangeLength(range->startPosition(), range->endPosition(), true);
|
| }
|
|
|