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

Unified Diff: Source/core/loader/FrameLoader.h

Issue 1172613003: Oilpan: fix build after r196753. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameLoader.h
diff --git a/Source/core/loader/FrameLoader.h b/Source/core/loader/FrameLoader.h
index b62372db8fbb43d1d8fb809abe62f59c1b143e91..82b5b1d0fa8418561dc01d8e46e09650b1bee5db 100644
--- a/Source/core/loader/FrameLoader.h
+++ b/Source/core/loader/FrameLoader.h
@@ -228,9 +228,14 @@ private:
RefPtrWillBeMember<HistoryItem> m_currentItem;
RefPtrWillBeMember<HistoryItem> m_provisionalItem;
- struct DeferredHistoryLoad {
+ class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<DeferredHistoryLoad> {
DISALLOW_COPY(DeferredHistoryLoad);
public:
+ static PassOwnPtrWillBeRawPtr<DeferredHistoryLoad> create(ResourceRequest request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoadType)
+ {
+ return adoptPtrWillBeNoop(new DeferredHistoryLoad(request, item, loadType, historyLoadType));
+ }
+
DeferredHistoryLoad(ResourceRequest request, HistoryItem* item, FrameLoadType loadType,
HistoryLoadType historyLoadType)
: m_request(request)
@@ -240,8 +245,6 @@ private:
{
}
- DeferredHistoryLoad() { }
-
DEFINE_INLINE_TRACE()
{
visitor->trace(m_item);
@@ -253,7 +256,7 @@ private:
HistoryLoadType m_historyLoadType;
};
- OwnPtr<DeferredHistoryLoad> m_deferredHistoryLoad;
+ OwnPtrWillBeMember<DeferredHistoryLoad> m_deferredHistoryLoad;
bool m_inStopAllLoaders;
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698