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

Side by Side Diff: Source/core/frame/LocalDOMWindow.h

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update OilpanExpectations Created 6 years, 3 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) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
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 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 virtual void trace(Visitor*) OVERRIDE; 332 virtual void trace(Visitor*) OVERRIDE;
333 333
334 protected: 334 protected:
335 DOMWindowLifecycleNotifier& lifecycleNotifier(); 335 DOMWindowLifecycleNotifier& lifecycleNotifier();
336 336
337 private: 337 private:
338 explicit LocalDOMWindow(LocalFrame&); 338 explicit LocalDOMWindow(LocalFrame&);
339 339
340 Page* page(); 340 Page* page();
341 341
342 // FrameDestructionObserver
343 #if !ENABLE(OILPAN)
342 virtual void frameDestroyed() OVERRIDE; 344 virtual void frameDestroyed() OVERRIDE;
345 #endif
343 virtual void willDetachFrameHost() OVERRIDE; 346 virtual void willDetachFrameHost() OVERRIDE;
344 347
345 void clearDocument(); 348 void clearDocument();
346 void resetDOMWindowProperties(); 349 void resetDOMWindowProperties();
347 void willDestroyDocumentInFrame(); 350 void willDestroyDocumentInFrame();
348 351
349 // FIXME: Oilpan: the need for this internal method will fall 352 // FIXME: Oilpan: the need for this internal method will fall
350 // away when EventTargets are no longer using refcounts and 353 // away when EventTargets are no longer using refcounts and
351 // window properties are also on the heap. Inline the minimal 354 // window properties are also on the heap. Inline the minimal
352 // do-not-broadcast handling then and remove the enum + 355 // do-not-broadcast handling then and remove the enum +
353 // removeAllEventListenersInternal(). 356 // removeAllEventListenersInternal().
354 enum BroadcastListenerRemoval { 357 enum BroadcastListenerRemoval {
355 DoNotBroadcastListenerRemoval, 358 DoNotBroadcastListenerRemoval,
356 DoBroadcastListenerRemoval 359 DoBroadcastListenerRemoval
357 }; 360 };
358 361
359 void removeAllEventListenersInternal(BroadcastListenerRemoval); 362 void removeAllEventListenersInternal(BroadcastListenerRemoval);
360 363
361 RefPtrWillBeMember<Document> m_document; 364 RefPtrWillBeMember<Document> m_document;
362 365
363 bool m_shouldPrintWhenFinishedLoading; 366 bool m_shouldPrintWhenFinishedLoading;
364 #if ENABLE(ASSERT) 367 #if ENABLE(ASSERT)
365 bool m_hasBeenReset; 368 bool m_hasBeenReset;
366 #endif 369 #endif
367 370
368 HashSet<DOMWindowProperty*> m_properties; 371 WillBeHeapHashSet<RawPtrWillBeMember<DOMWindowProperty> > m_properties;
369 372
370 mutable RefPtrWillBeMember<Screen> m_screen; 373 mutable RefPtrWillBeMember<Screen> m_screen;
371 mutable RefPtrWillBeMember<History> m_history; 374 mutable RefPtrWillBeMember<History> m_history;
372 mutable RefPtrWillBeMember<BarProp> m_locationbar; 375 mutable RefPtrWillBeMember<BarProp> m_locationbar;
373 mutable RefPtrWillBeMember<BarProp> m_menubar; 376 mutable RefPtrWillBeMember<BarProp> m_menubar;
374 mutable RefPtrWillBeMember<BarProp> m_personalbar; 377 mutable RefPtrWillBeMember<BarProp> m_personalbar;
375 mutable RefPtrWillBeMember<BarProp> m_scrollbars; 378 mutable RefPtrWillBeMember<BarProp> m_scrollbars;
376 mutable RefPtrWillBeMember<BarProp> m_statusbar; 379 mutable RefPtrWillBeMember<BarProp> m_statusbar;
377 mutable RefPtrWillBeMember<BarProp> m_toolbar; 380 mutable RefPtrWillBeMember<BarProp> m_toolbar;
378 mutable RefPtrWillBeMember<Console> m_console; 381 mutable RefPtrWillBeMember<Console> m_console;
(...skipping 24 matching lines...) Expand all
403 } 406 }
404 407
405 inline String LocalDOMWindow::defaultStatus() const 408 inline String LocalDOMWindow::defaultStatus() const
406 { 409 {
407 return m_defaultStatus; 410 return m_defaultStatus;
408 } 411 }
409 412
410 } // namespace blink 413 } // namespace blink
411 414
412 #endif // LocalDOMWindow_h 415 #endif // LocalDOMWindow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698