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

Unified Diff: Source/core/rendering/FastTextAutosizer.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/dom/Document.cpp ('k') | Source/core/rendering/FastTextAutosizer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/rendering/FastTextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698