Index: trunk/Source/core/editing/markup.h |
=================================================================== |
--- trunk/Source/core/editing/markup.h (revision 174395) |
+++ trunk/Source/core/editing/markup.h (working copy) |
@@ -28,7 +28,6 @@ |
#include "core/dom/ParserContentPolicy.h" |
#include "core/editing/HTMLInterchange.h" |
-#include "platform/heap/Handle.h" |
#include "wtf/Forward.h" |
#include "wtf/Vector.h" |
@@ -48,18 +47,18 @@ |
enum EChildrenOnly { IncludeNode, ChildrenOnly }; |
enum EAbsoluteURLs { DoNotResolveURLs, ResolveAllURLs, ResolveNonLocalURLs }; |
-PassRefPtrWillBeRawPtr<DocumentFragment> createFragmentFromText(Range* context, const String& text); |
-PassRefPtrWillBeRawPtr<DocumentFragment> createFragmentFromMarkup(Document&, const String& markup, const String& baseURL, ParserContentPolicy = AllowScriptingContent); |
-PassRefPtrWillBeRawPtr<DocumentFragment> createFragmentFromMarkupWithContext(Document&, const String& markup, unsigned fragmentStart, unsigned fragmentEnd, const String& baseURL, ParserContentPolicy); |
-PassRefPtrWillBeRawPtr<DocumentFragment> createFragmentForInnerOuterHTML(const String&, Element*, ParserContentPolicy, const char* method, ExceptionState&); |
-PassRefPtrWillBeRawPtr<DocumentFragment> createFragmentForTransformToFragment(const String&, const String& sourceMIMEType, Document& outputDoc); |
-PassRefPtrWillBeRawPtr<DocumentFragment> createContextualFragment(const String&, HTMLElement*, ParserContentPolicy, ExceptionState&); |
+PassRefPtr<DocumentFragment> createFragmentFromText(Range* context, const String& text); |
+PassRefPtr<DocumentFragment> createFragmentFromMarkup(Document&, const String& markup, const String& baseURL, ParserContentPolicy = AllowScriptingContent); |
+PassRefPtr<DocumentFragment> createFragmentFromMarkupWithContext(Document&, const String& markup, unsigned fragmentStart, unsigned fragmentEnd, const String& baseURL, ParserContentPolicy); |
+PassRefPtr<DocumentFragment> createFragmentForInnerOuterHTML(const String&, Element*, ParserContentPolicy, const char* method, ExceptionState&); |
+PassRefPtr<DocumentFragment> createFragmentForTransformToFragment(const String&, const String& sourceMIMEType, Document& outputDoc); |
+PassRefPtr<DocumentFragment> createContextualFragment(const String&, HTMLElement*, ParserContentPolicy, ExceptionState&); |
bool isPlainTextMarkup(Node*); |
// These methods are used by HTMLElement & ShadowRoot to replace the |
// children with respected fragment/text. |
-void replaceChildrenWithFragment(ContainerNode*, PassRefPtrWillBeRawPtr<DocumentFragment>, ExceptionState&); |
+void replaceChildrenWithFragment(ContainerNode*, PassRefPtr<DocumentFragment>, ExceptionState&); |
void replaceChildrenWithText(ContainerNode*, const String&, ExceptionState&); |
String createMarkup(const Range*, Vector<Node*>* = 0, EAnnotateForInterchange = DoNotAnnotateForInterchange, bool convertBlocksToInlines = false, EAbsoluteURLs = DoNotResolveURLs, Node* constrainingAncestor = 0); |