Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1207)

Unified Diff: Source/core/rendering/TextAutosizer.h

Issue 420273005: Oilpan: Remove Document* pointers in objects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/FastTextAutosizer.cpp ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/TextAutosizer.h
diff --git a/Source/core/rendering/TextAutosizer.h b/Source/core/rendering/TextAutosizer.h
index 81eeb63076f5fb015a9b65742e4419580d0edf35..5f7ff37fe654e5cc99a3c6b9996829134ba8c97d 100644
--- a/Source/core/rendering/TextAutosizer.h
+++ b/Source/core/rendering/TextAutosizer.h
@@ -27,6 +27,7 @@
#define TextAutosizer_h
#include "core/HTMLNames.h"
+#include "platform/heap/Handle.h"
#include "platform/text/WritingMode.h"
#include "wtf/HashMap.h"
#include "wtf/Noncopyable.h"
@@ -61,15 +62,19 @@ struct TextAutosizingClusterInfo {
Vector<TextAutosizingClusterInfo> narrowDescendants;
};
-class TextAutosizer FINAL {
+class TextAutosizer FINAL : public NoBaseWillBeGarbageCollectedFinalized<TextAutosizer> {
WTF_MAKE_NONCOPYABLE(TextAutosizer);
-
public:
- static PassOwnPtr<TextAutosizer> create(Document* document) { return adoptPtr(new TextAutosizer(document)); }
+ static PassOwnPtrWillBeRawPtr<TextAutosizer> create(Document* document)
+ {
+ return adoptPtrWillBeNoop(new TextAutosizer(document));
+ }
bool processSubtree(RenderObject* layoutRoot);
void recalculateMultipliers();
+ void trace(Visitor*);
+
private:
friend class FastTextAutosizer;
@@ -126,7 +131,7 @@ private:
void secondPassProcessStaleNonAutosizedClusters();
void processStaleContainer(float multiplier, RenderBlock* cluster, TextAutosizingClusterInfo&);
- Document* m_document;
+ RawPtrWillBeMember<Document> m_document;
HashMap<const RenderObject*, unsigned> m_hashCache;
« no previous file with comments | « Source/core/rendering/FastTextAutosizer.cpp ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698