diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/editing/markup.h')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/editing/markup.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/chromium/third_party/WebKit/Source/core/editing/markup.h b/chromium/third_party/WebKit/Source/core/editing/markup.h index f12209269e9..32819bdcb71 100644 --- a/chromium/third_party/WebKit/Source/core/editing/markup.h +++ b/chromium/third_party/WebKit/Source/core/editing/markup.h @@ -28,6 +28,7 @@ #include "core/dom/ParserContentPolicy.h" #include "core/editing/HTMLInterchange.h" +#include "platform/heap/Handle.h" #include "wtf/Forward.h" #include "wtf/Vector.h" @@ -47,29 +48,27 @@ class Range; enum EChildrenOnly { IncludeNode, ChildrenOnly }; enum EAbsoluteURLs { DoNotResolveURLs, ResolveAllURLs, ResolveNonLocalURLs }; -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> createFragmentFromNodes(Document*, const Vector<Node*>&); -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&); +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&); bool isPlainTextMarkup(Node*); // These methods are used by HTMLElement & ShadowRoot to replace the // children with respected fragment/text. -void replaceChildrenWithFragment(ContainerNode*, PassRefPtr<DocumentFragment>, ExceptionState&); +void replaceChildrenWithFragment(ContainerNode*, PassRefPtrWillBeRawPtr<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); -String createMarkup(const Node*, EChildrenOnly = IncludeNode, Vector<Node*>* = 0, EAbsoluteURLs = DoNotResolveURLs, Vector<QualifiedName>* tagNamesToSkip = 0); +String createMarkup(const Range*, WillBeHeapVector<RawPtrWillBeMember<Node> >* = 0, EAnnotateForInterchange = DoNotAnnotateForInterchange, bool convertBlocksToInlines = false, EAbsoluteURLs = DoNotResolveURLs, Node* constrainingAncestor = 0); +String createMarkup(const Node*, EChildrenOnly = IncludeNode, WillBeHeapVector<RawPtrWillBeMember<Node> >* = 0, EAbsoluteURLs = DoNotResolveURLs, Vector<QualifiedName>* tagNamesToSkip = 0); String createFullMarkup(const Node*); -String createFullMarkup(const Range*); String urlToMarkup(const KURL&, const String& title); -void mergeWithNextTextNode(PassRefPtr<Node>, ExceptionState&); +void mergeWithNextTextNode(PassRefPtrWillBeRawPtr<Node>, ExceptionState&); } |