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

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

Issue 569643002: Simplify and weaken DOMWindowProperty unregistration (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add test 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 | Annotate | Revision Log
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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 359
360 void removeAllEventListenersInternal(BroadcastListenerRemoval); 360 void removeAllEventListenersInternal(BroadcastListenerRemoval);
361 361
362 RefPtrWillBeMember<Document> m_document; 362 RefPtrWillBeMember<Document> m_document;
363 363
364 bool m_shouldPrintWhenFinishedLoading; 364 bool m_shouldPrintWhenFinishedLoading;
365 #if ENABLE(ASSERT) 365 #if ENABLE(ASSERT)
366 bool m_hasBeenReset; 366 bool m_hasBeenReset;
367 #endif 367 #endif
368 368
369 WillBeHeapHashSet<RawPtrWillBeMember<DOMWindowProperty> > m_properties; 369 WillBeHeapHashSet<RawPtrWillBeWeakMember<DOMWindowProperty> > m_properties;
370 370
371 mutable RefPtrWillBeMember<Screen> m_screen; 371 mutable RefPtrWillBeMember<Screen> m_screen;
372 mutable RefPtrWillBeMember<History> m_history; 372 mutable RefPtrWillBeMember<History> m_history;
373 mutable RefPtrWillBeMember<BarProp> m_locationbar; 373 mutable RefPtrWillBeMember<BarProp> m_locationbar;
374 mutable RefPtrWillBeMember<BarProp> m_menubar; 374 mutable RefPtrWillBeMember<BarProp> m_menubar;
375 mutable RefPtrWillBeMember<BarProp> m_personalbar; 375 mutable RefPtrWillBeMember<BarProp> m_personalbar;
376 mutable RefPtrWillBeMember<BarProp> m_scrollbars; 376 mutable RefPtrWillBeMember<BarProp> m_scrollbars;
377 mutable RefPtrWillBeMember<BarProp> m_statusbar; 377 mutable RefPtrWillBeMember<BarProp> m_statusbar;
378 mutable RefPtrWillBeMember<BarProp> m_toolbar; 378 mutable RefPtrWillBeMember<BarProp> m_toolbar;
379 mutable RefPtrWillBeMember<Console> m_console; 379 mutable RefPtrWillBeMember<Console> m_console;
(...skipping 24 matching lines...) Expand all
404 } 404 }
405 405
406 inline String LocalDOMWindow::defaultStatus() const 406 inline String LocalDOMWindow::defaultStatus() const
407 { 407 {
408 return m_defaultStatus; 408 return m_defaultStatus;
409 } 409 }
410 410
411 } // namespace blink 411 } // namespace blink
412 412
413 #endif // LocalDOMWindow_h 413 #endif // LocalDOMWindow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698