| Index: third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| diff --git a/third_party/WebKit/Source/core/layout/TextAutosizer.h b/third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| index 773909c9e32c4a380d0e0eabdd2cda777f37ec60..49919087d901b12a1fb48b5560e39599d5c7713c 100644
|
| --- a/third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| +++ b/third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| @@ -51,13 +51,12 @@ class LayoutBlock;
|
| // Single-pass text autosizer. Documentation at:
|
| // http://tinyurl.com/TextAutosizer
|
|
|
| -class CORE_EXPORT TextAutosizer final : public NoBaseWillBeGarbageCollectedFinalized<TextAutosizer> {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(TextAutosizer);
|
| +class CORE_EXPORT TextAutosizer final : public GarbageCollectedFinalized<TextAutosizer> {
|
| WTF_MAKE_NONCOPYABLE(TextAutosizer);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<TextAutosizer> create(const Document* document)
|
| + static RawPtr<TextAutosizer> create(const Document* document)
|
| {
|
| - return adoptPtrWillBeNoop(new TextAutosizer(document));
|
| + return new TextAutosizer(document);
|
| }
|
| static float computeAutosizedFontSize(float specifiedSize, float multiplier);
|
|
|
| @@ -76,7 +75,7 @@ public:
|
| explicit LayoutScope(LayoutBlock*);
|
| ~LayoutScope();
|
| protected:
|
| - RawPtrWillBeMember<TextAutosizer> m_textAutosizer;
|
| + Member<TextAutosizer> m_textAutosizer;
|
| LayoutBlock* m_block;
|
| };
|
|
|
| @@ -92,7 +91,7 @@ public:
|
| explicit DeferUpdatePageInfo(Page*);
|
| ~DeferUpdatePageInfo();
|
| private:
|
| - RefPtrWillBeMember<LocalFrame> m_mainFrame;
|
| + Member<LocalFrame> m_mainFrame;
|
| };
|
|
|
| private:
|
| @@ -304,7 +303,7 @@ private:
|
| void writeClusterDebugInfo(Cluster*);
|
| #endif
|
|
|
| - RawPtrWillBeMember<const Document> m_document;
|
| + Member<const Document> m_document;
|
| const LayoutBlock* m_firstBlockToBeginLayout;
|
| #if ENABLE(ASSERT)
|
| BlockSet m_blocksThatHaveBegunLayout; // Used to ensure we don't compute properties of a block before beginLayout() is called on it.
|
|
|