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

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

Issue 258843002: Remove unsound asserts in the DOMWindow destructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Invert and use ASSERT_ENABLED Created 6 years, 8 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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 virtual void frameDestroyed() OVERRIDE; 339 virtual void frameDestroyed() OVERRIDE;
340 virtual void willDetachFrameHost() OVERRIDE; 340 virtual void willDetachFrameHost() OVERRIDE;
341 341
342 void clearDocument(); 342 void clearDocument();
343 void resetDOMWindowProperties(); 343 void resetDOMWindowProperties();
344 void willDestroyDocumentInFrame(); 344 void willDestroyDocumentInFrame();
345 345
346 RefPtr<Document> m_document; 346 RefPtr<Document> m_document;
347 347
348 bool m_shouldPrintWhenFinishedLoading; 348 bool m_shouldPrintWhenFinishedLoading;
349 #if ASSERT_ENABLED
350 bool m_hasBeenReset;
351 #endif
349 352
350 HashSet<DOMWindowProperty*> m_properties; 353 HashSet<DOMWindowProperty*> m_properties;
351 354
352 mutable RefPtrWillBeMember<Screen> m_screen; 355 mutable RefPtrWillBeMember<Screen> m_screen;
353 mutable RefPtrWillBeMember<History> m_history; 356 mutable RefPtrWillBeMember<History> m_history;
354 mutable RefPtrWillBeMember<BarProp> m_locationbar; 357 mutable RefPtrWillBeMember<BarProp> m_locationbar;
355 mutable RefPtrWillBeMember<BarProp> m_menubar; 358 mutable RefPtrWillBeMember<BarProp> m_menubar;
356 mutable RefPtrWillBeMember<BarProp> m_personalbar; 359 mutable RefPtrWillBeMember<BarProp> m_personalbar;
357 mutable RefPtrWillBeMember<BarProp> m_scrollbars; 360 mutable RefPtrWillBeMember<BarProp> m_scrollbars;
358 mutable RefPtrWillBeMember<BarProp> m_statusbar; 361 mutable RefPtrWillBeMember<BarProp> m_statusbar;
(...skipping 24 matching lines...) Expand all
383 } 386 }
384 387
385 inline String DOMWindow::defaultStatus() const 388 inline String DOMWindow::defaultStatus() const
386 { 389 {
387 return m_defaultStatus; 390 return m_defaultStatus;
388 } 391 }
389 392
390 } // namespace WebCore 393 } // namespace WebCore
391 394
392 #endif // DOMWindow_h 395 #endif // DOMWindow_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/Window/Location/set-location-after-close-expected.txt ('k') | Source/core/frame/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698