Commit ee38e8d0 authored by sigbjornf@opera.com's avatar sigbjornf@opera.com

Oilpan: fix build after r200730.

TBR=oilpan-reviews
BUG=382542
NOTRY=true

Review URL: https://codereview.chromium.org/1290593004

git-svn-id: svn://svn.chromium.org/blink/trunk@200733 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ceecc0dc
...@@ -5648,6 +5648,7 @@ DEFINE_TRACE(Document) ...@@ -5648,6 +5648,7 @@ DEFINE_TRACE(Document)
visitor->trace(m_parser); visitor->trace(m_parser);
visitor->trace(m_contextFeatures); visitor->trace(m_contextFeatures);
visitor->trace(m_styleSheetList); visitor->trace(m_styleSheetList);
visitor->trace(m_documentTiming);
visitor->trace(m_mediaQueryMatcher); visitor->trace(m_mediaQueryMatcher);
visitor->trace(m_scriptedAnimationController); visitor->trace(m_scriptedAnimationController);
visitor->trace(m_textAutosizer); visitor->trace(m_textAutosizer);
......
...@@ -22,6 +22,11 @@ DocumentTiming::DocumentTiming(WeakPtrWillBeRawPtr<Document> document) ...@@ -22,6 +22,11 @@ DocumentTiming::DocumentTiming(WeakPtrWillBeRawPtr<Document> document)
{ {
} }
DEFINE_TRACE(DocumentTiming)
{
visitor->trace(m_document);
}
void DocumentTiming::notifyDocumentTimingChanged() void DocumentTiming::notifyDocumentTimingChanged()
{ {
if (m_document && m_document->loader()) if (m_document && m_document->loader())
......
...@@ -32,7 +32,8 @@ namespace blink { ...@@ -32,7 +32,8 @@ namespace blink {
class Document; class Document;
class DocumentTiming { class DocumentTiming final {
DISALLOW_ALLOCATION();
public: public:
DocumentTiming(WeakPtrWillBeRawPtr<Document>); DocumentTiming(WeakPtrWillBeRawPtr<Document>);
...@@ -50,6 +51,8 @@ public: ...@@ -50,6 +51,8 @@ public:
double domComplete() const { return m_domComplete; } double domComplete() const { return m_domComplete; }
double firstLayout() const { return m_firstLayout; } double firstLayout() const { return m_firstLayout; }
DECLARE_TRACE();
private: private:
void notifyDocumentTimingChanged(); void notifyDocumentTimingChanged();
...@@ -60,7 +63,7 @@ private: ...@@ -60,7 +63,7 @@ private:
double m_domComplete; double m_domComplete;
double m_firstLayout; double m_firstLayout;
WeakPtrWillBeRawPtr<Document> m_document; WeakPtrWillBeMember<Document> m_document;
}; };
} }
......
...@@ -52,6 +52,11 @@ DocumentLoadTiming::DocumentLoadTiming(WeakPtrWillBeRawPtr<DocumentLoader> docum ...@@ -52,6 +52,11 @@ DocumentLoadTiming::DocumentLoadTiming(WeakPtrWillBeRawPtr<DocumentLoader> docum
{ {
} }
DEFINE_TRACE(DocumentLoadTiming)
{
visitor->trace(m_documentLoader);
}
void DocumentLoadTiming::notifyDocumentTimingChanged() void DocumentLoadTiming::notifyDocumentTimingChanged()
{ {
if (m_documentLoader) if (m_documentLoader)
......
...@@ -36,7 +36,8 @@ namespace blink { ...@@ -36,7 +36,8 @@ namespace blink {
class DocumentLoader; class DocumentLoader;
class KURL; class KURL;
class CORE_EXPORT DocumentLoadTiming { class CORE_EXPORT DocumentLoadTiming final {
DISALLOW_ALLOCATION();
public: public:
DocumentLoadTiming(WeakPtrWillBeRawPtr<DocumentLoader>); DocumentLoadTiming(WeakPtrWillBeRawPtr<DocumentLoader>);
...@@ -72,6 +73,8 @@ public: ...@@ -72,6 +73,8 @@ public:
double referenceMonotonicTime() const { return m_referenceMonotonicTime; } double referenceMonotonicTime() const { return m_referenceMonotonicTime; }
DECLARE_TRACE();
private: private:
void setRedirectStart(double); void setRedirectStart(double);
void markRedirectEnd(); void markRedirectEnd();
...@@ -92,7 +95,7 @@ private: ...@@ -92,7 +95,7 @@ private:
bool m_hasCrossOriginRedirect; bool m_hasCrossOriginRedirect;
bool m_hasSameOriginAsPreviousDocument; bool m_hasSameOriginAsPreviousDocument;
WeakPtrWillBeRawPtr<DocumentLoader> m_documentLoader; WeakPtrWillBeMember<DocumentLoader> m_documentLoader;
}; };
} // namespace blink } // namespace blink
......
...@@ -129,6 +129,7 @@ DEFINE_TRACE(DocumentLoader) ...@@ -129,6 +129,7 @@ DEFINE_TRACE(DocumentLoader)
// TODO(sof): start tracing ResourcePtr<>s (and m_mainResource.) // TODO(sof): start tracing ResourcePtr<>s (and m_mainResource.)
visitor->trace(m_writer); visitor->trace(m_writer);
visitor->trace(m_archive); visitor->trace(m_archive);
visitor->trace(m_documentLoadTiming);
visitor->trace(m_applicationCacheHost); visitor->trace(m_applicationCacheHost);
visitor->trace(m_contentSecurityPolicy); visitor->trace(m_contentSecurityPolicy);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment