| Index: third_party/WebKit/Source/core/frame/FrameSerializer.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameSerializer.cpp b/third_party/WebKit/Source/core/frame/FrameSerializer.cpp
|
| index 381963456f9fd75b8160285ce28a37512b3ab8bf..a944291997a714fe43eaf41bdcb4600b7186d5a2 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameSerializer.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameSerializer.cpp
|
| @@ -83,7 +83,7 @@ static bool shouldIgnoreElement(const Element& element)
|
| class SerializerMarkupAccumulator : public MarkupAccumulator {
|
| STACK_ALLOCATED();
|
| public:
|
| - SerializerMarkupAccumulator(FrameSerializer::Delegate&, const Document&, WillBeHeapVector<RawPtrWillBeMember<Node>>&);
|
| + SerializerMarkupAccumulator(FrameSerializer::Delegate&, const Document&, HeapVector<Member<Node>>&);
|
| ~SerializerMarkupAccumulator() override;
|
|
|
| protected:
|
| @@ -103,19 +103,19 @@ private:
|
| const String& attributeValue);
|
|
|
| FrameSerializer::Delegate& m_delegate;
|
| - RawPtrWillBeMember<const Document> m_document;
|
| + Member<const Document> m_document;
|
|
|
| // FIXME: |FrameSerializer| uses |m_nodes| for collecting nodes in document
|
| // included into serialized text then extracts image, object, etc. The size
|
| // of this vector isn't small for large document. It is better to use
|
| // callback like functionality.
|
| - WillBeHeapVector<RawPtrWillBeMember<Node>>& m_nodes;
|
| + HeapVector<Member<Node>>& m_nodes;
|
|
|
| // Elements with links rewritten via appendAttribute method.
|
| - WillBeHeapHashSet<RawPtrWillBeMember<const Element>> m_elementsWithRewrittenLinks;
|
| + HeapHashSet<Member<const Element>> m_elementsWithRewrittenLinks;
|
| };
|
|
|
| -SerializerMarkupAccumulator::SerializerMarkupAccumulator(FrameSerializer::Delegate& delegate, const Document& document, WillBeHeapVector<RawPtrWillBeMember<Node>>& nodes)
|
| +SerializerMarkupAccumulator::SerializerMarkupAccumulator(FrameSerializer::Delegate& delegate, const Document& document, HeapVector<Member<Node>>& nodes)
|
| : MarkupAccumulator(ResolveAllURLs)
|
| , m_delegate(delegate)
|
| , m_document(&document)
|
| @@ -260,7 +260,7 @@ void FrameSerializer::serializeFrame(const LocalFrame& frame)
|
| return;
|
| }
|
|
|
| - WillBeHeapVector<RawPtrWillBeMember<Node>> serializedNodes;
|
| + HeapVector<Member<Node>> serializedNodes;
|
| SerializerMarkupAccumulator accumulator(m_delegate, document, serializedNodes);
|
| String text = serializeNodes<EditingStrategy>(accumulator, document, IncludeNode);
|
|
|
| @@ -430,7 +430,7 @@ void FrameSerializer::retrieveResourcesForProperties(const StylePropertySet* sty
|
| // image properties there might be.
|
| unsigned propertyCount = styleDeclaration->propertyCount();
|
| for (unsigned i = 0; i < propertyCount; ++i) {
|
| - RefPtrWillBeRawPtr<CSSValue> cssValue = styleDeclaration->propertyAt(i).value();
|
| + RawPtr<CSSValue> cssValue = styleDeclaration->propertyAt(i).value();
|
| retrieveResourcesForCSSValue(cssValue.get(), document);
|
| }
|
| }
|
|
|