| Index: Source/core/rendering/FastTextAutosizer.h
|
| diff --git a/Source/core/rendering/FastTextAutosizer.h b/Source/core/rendering/FastTextAutosizer.h
|
| index bc6e991641c1b5e0863b3c815f86c5e45d213deb..582e6e6f5e320c88d49aea700ac15cb2a3dc0d08 100644
|
| --- a/Source/core/rendering/FastTextAutosizer.h
|
| +++ b/Source/core/rendering/FastTextAutosizer.h
|
| @@ -33,6 +33,7 @@
|
|
|
| #include "core/rendering/RenderObject.h"
|
| #include "core/rendering/RenderTable.h"
|
| +#include "platform/heap/Handle.h"
|
| #include "wtf/HashMap.h"
|
| #include "wtf/HashSet.h"
|
| #include "wtf/Noncopyable.h"
|
| @@ -49,13 +50,12 @@ class RenderListMarker;
|
| // Single-pass text autosizer. Documentation at:
|
| // http://tinyurl.com/fasttextautosizer
|
|
|
| -class FastTextAutosizer FINAL {
|
| +class FastTextAutosizer FINAL : public NoBaseWillBeGarbageCollectedFinalized<FastTextAutosizer> {
|
| WTF_MAKE_NONCOPYABLE(FastTextAutosizer);
|
| -
|
| public:
|
| - static PassOwnPtr<FastTextAutosizer> create(const Document* document)
|
| + static PassOwnPtrWillBeRawPtr<FastTextAutosizer> create(const Document* document)
|
| {
|
| - return adoptPtr(new FastTextAutosizer(document));
|
| + return adoptPtrWillBeNoop(new FastTextAutosizer(document));
|
| }
|
| static float computeAutosizedFontSize(float specifiedSize, float multiplier);
|
|
|
| @@ -65,6 +65,8 @@ public:
|
| void destroy(const RenderBlock*);
|
| void inflateListItem(RenderListItem*, RenderListMarker*);
|
|
|
| + void trace(Visitor*);
|
| +
|
| class LayoutScope {
|
| public:
|
| explicit LayoutScope(RenderBlock*);
|
| @@ -287,7 +289,7 @@ private:
|
| void writeClusterDebugInfo(Cluster*);
|
| #endif
|
|
|
| - const Document* m_document;
|
| + RawPtrWillBeMember<const Document> m_document;
|
| const RenderBlock* 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.
|
|
|