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

Side by Side Diff: third_party/WebKit/Source/core/loader/ImageLoader.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 13 matching lines...) Expand all
24 #define ImageLoader_h 24 #define ImageLoader_h
25 25
26 #include "core/CoreExport.h" 26 #include "core/CoreExport.h"
27 #include "core/fetch/ImageResource.h" 27 #include "core/fetch/ImageResource.h"
28 #include "core/fetch/ImageResourceObserver.h" 28 #include "core/fetch/ImageResourceObserver.h"
29 #include "core/fetch/ResourceClient.h" 29 #include "core/fetch/ResourceClient.h"
30 #include "platform/heap/Handle.h" 30 #include "platform/heap/Handle.h"
31 #include "wtf/HashSet.h" 31 #include "wtf/HashSet.h"
32 #include "wtf/WeakPtr.h" 32 #include "wtf/WeakPtr.h"
33 #include "wtf/text/AtomicString.h" 33 #include "wtf/text/AtomicString.h"
34 #include <memory>
34 35
35 namespace blink { 36 namespace blink {
36 37
37 class IncrementLoadEventDelayCount; 38 class IncrementLoadEventDelayCount;
38 class FetchRequest; 39 class FetchRequest;
39 class Document; 40 class Document;
40 class Element; 41 class Element;
41 class ImageLoader; 42 class ImageLoader;
42 class LayoutImageResource; 43 class LayoutImageResource;
43 44
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 Member<Element> m_element; 152 Member<Element> m_element;
152 Member<ImageResource> m_image; 153 Member<ImageResource> m_image;
153 // FIXME: Oilpan: We might be able to remove this Persistent hack when 154 // FIXME: Oilpan: We might be able to remove this Persistent hack when
154 // ImageResourceClient is traceable. 155 // ImageResourceClient is traceable.
155 GC_PLUGIN_IGNORE("http://crbug.com/383741") 156 GC_PLUGIN_IGNORE("http://crbug.com/383741")
156 Persistent<Element> m_keepAlive; 157 Persistent<Element> m_keepAlive;
157 158
158 Timer<ImageLoader> m_derefElementTimer; 159 Timer<ImageLoader> m_derefElementTimer;
159 AtomicString m_failedLoadURL; 160 AtomicString m_failedLoadURL;
160 WeakPtr<Task> m_pendingTask; // owned by Microtask 161 WeakPtr<Task> m_pendingTask; // owned by Microtask
161 OwnPtr<IncrementLoadEventDelayCount> m_loadDelayCounter; 162 std::unique_ptr<IncrementLoadEventDelayCount> m_loadDelayCounter;
162 bool m_hasPendingLoadEvent : 1; 163 bool m_hasPendingLoadEvent : 1;
163 bool m_hasPendingErrorEvent : 1; 164 bool m_hasPendingErrorEvent : 1;
164 bool m_imageComplete : 1; 165 bool m_imageComplete : 1;
165 bool m_loadingImageDocument : 1; 166 bool m_loadingImageDocument : 1;
166 bool m_elementIsProtected : 1; 167 bool m_elementIsProtected : 1;
167 bool m_suppressErrorEvents : 1; 168 bool m_suppressErrorEvents : 1;
168 }; 169 };
169 170
170 } // namespace blink 171 } // namespace blink
171 172
172 #endif 173 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoaderClient.h ('k') | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698