Index: trunk/Source/core/dom/Range.cpp |
=================================================================== |
--- trunk/Source/core/dom/Range.cpp (revision 174395) |
+++ trunk/Source/core/dom/Range.cpp (working copy) |
@@ -565,11 +565,11 @@ |
return 0; |
} |
-PassRefPtrWillBeRawPtr<DocumentFragment> Range::processContents(ActionType action, ExceptionState& exceptionState) |
+PassRefPtr<DocumentFragment> Range::processContents(ActionType action, ExceptionState& exceptionState) |
{ |
typedef Vector<RefPtr<Node> > NodeVector; |
- RefPtrWillBeRawPtr<DocumentFragment> fragment = nullptr; |
+ RefPtr<DocumentFragment> fragment; |
if (action == EXTRACT_CONTENTS || action == CLONE_CONTENTS) |
fragment = DocumentFragment::create(*m_ownerDocument.get()); |
@@ -676,7 +676,7 @@ |
data->deleteData(0, startOffset, exceptionState); |
} |
-PassRefPtr<Node> Range::processContentsBetweenOffsets(ActionType action, PassRefPtrWillBeRawPtr<DocumentFragment> fragment, |
+PassRefPtr<Node> Range::processContentsBetweenOffsets(ActionType action, PassRefPtr<DocumentFragment> fragment, |
Node* container, unsigned startOffset, unsigned endOffset, ExceptionState& exceptionState) |
{ |
ASSERT(container); |
@@ -821,7 +821,7 @@ |
return clonedContainer.release(); |
} |
-PassRefPtrWillBeRawPtr<DocumentFragment> Range::extractContents(ExceptionState& exceptionState) |
+PassRefPtr<DocumentFragment> Range::extractContents(ExceptionState& exceptionState) |
{ |
checkDeleteExtract(exceptionState); |
if (exceptionState.hadException()) |
@@ -830,7 +830,7 @@ |
return processContents(EXTRACT_CONTENTS, exceptionState); |
} |
-PassRefPtrWillBeRawPtr<DocumentFragment> Range::cloneContents(ExceptionState& exceptionState) |
+PassRefPtr<DocumentFragment> Range::cloneContents(ExceptionState& exceptionState) |
{ |
return processContents(CLONE_CONTENTS, exceptionState); |
} |
@@ -974,7 +974,7 @@ |
return plainText(this); |
} |
-PassRefPtrWillBeRawPtr<DocumentFragment> Range::createContextualFragment(const String& markup, ExceptionState& exceptionState) |
+PassRefPtr<DocumentFragment> Range::createContextualFragment(const String& markup, ExceptionState& exceptionState) |
{ |
Node* element = m_start.container()->isElementNode() ? m_start.container() : m_start.container()->parentNode(); |
if (!element || !element->isHTMLElement()) { |
@@ -982,7 +982,7 @@ |
return nullptr; |
} |
- RefPtrWillBeRawPtr<DocumentFragment> fragment = WebCore::createContextualFragment(markup, toHTMLElement(element), AllowScriptingContentAndDoNotMarkAlreadyStarted, exceptionState); |
+ RefPtr<DocumentFragment> fragment = WebCore::createContextualFragment(markup, toHTMLElement(element), AllowScriptingContentAndDoNotMarkAlreadyStarted, exceptionState); |
if (!fragment) |
return nullptr; |
@@ -1266,7 +1266,7 @@ |
if (exceptionState.hadException()) |
return; |
} |
- RefPtrWillBeRawPtr<DocumentFragment> fragment = extractContents(exceptionState); |
+ RefPtr<DocumentFragment> fragment = extractContents(exceptionState); |
if (exceptionState.hadException()) |
return; |
insertNode(newParent, exceptionState); |