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

Side by Side Diff: third_party/WebKit/Source/web/WebPluginContainerImpl.h

Issue 1442643003: Oilpan: move WebPluginLoadObserver to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: non-oilpan compile fix Created 5 years, 1 month 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 IntRect& windowRect, 191 IntRect& windowRect,
192 IntRect& clipRect, 192 IntRect& clipRect,
193 IntRect& unobscuredRect, 193 IntRect& unobscuredRect,
194 Vector<IntRect>& cutOutRects); 194 Vector<IntRect>& cutOutRects);
195 void windowCutOutRects( 195 void windowCutOutRects(
196 const IntRect& frameRect, 196 const IntRect& frameRect,
197 Vector<IntRect>& cutOutRects); 197 Vector<IntRect>& cutOutRects);
198 198
199 RawPtrWillBeMember<HTMLPlugInElement> m_element; 199 RawPtrWillBeMember<HTMLPlugInElement> m_element;
200 WebPlugin* m_webPlugin; 200 WebPlugin* m_webPlugin;
201 #if ENABLE(OILPAN)
202 HeapLinkedHashSet<WeakMember<WebPluginLoadObserver>> m_pluginLoadObservers;
203 #else
201 Vector<WebPluginLoadObserver*> m_pluginLoadObservers; 204 Vector<WebPluginLoadObserver*> m_pluginLoadObservers;
205 #endif
202 206
203 WebLayer* m_webLayer; 207 WebLayer* m_webLayer;
204 208
205 IntRect m_pendingInvalidationRect; 209 IntRect m_pendingInvalidationRect;
206 210
207 TouchEventRequestType m_touchEventRequestType; 211 TouchEventRequestType m_touchEventRequestType;
208 bool m_wantsWheelEvents; 212 bool m_wantsWheelEvents;
209 213
210 bool m_inDispose; 214 bool m_inDispose;
211 #if ENABLE(OILPAN) 215 #if ENABLE(OILPAN)
212 // Oilpan: if true, the plugin container must dispose 216 // Oilpan: if true, the plugin container must dispose
213 // of its plugin when being finalized. 217 // of its plugin when being finalized.
214 bool m_shouldDisposePlugin; 218 bool m_shouldDisposePlugin;
215 #endif 219 #endif
216 }; 220 };
217 221
218 DEFINE_TYPE_CASTS(WebPluginContainerImpl, Widget, widget, widget->isPluginContai ner(), widget.isPluginContainer()); 222 DEFINE_TYPE_CASTS(WebPluginContainerImpl, Widget, widget, widget->isPluginContai ner(), widget.isPluginContainer());
219 // Unlike Widget, we need not worry about object type for container. 223 // Unlike Widget, we need not worry about object type for container.
220 // WebPluginContainerImpl is the only subclass of WebPluginContainer. 224 // WebPluginContainerImpl is the only subclass of WebPluginContainer.
221 DEFINE_TYPE_CASTS(WebPluginContainerImpl, WebPluginContainer, container, true, t rue); 225 DEFINE_TYPE_CASTS(WebPluginContainerImpl, WebPluginContainer, container, true, t rue);
222 226
223 } // namespace blink 227 } // namespace blink
224 228
225 #endif 229 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698