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

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

Issue 558213002: Simplify DOMWindowProperty and its unregistration. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Iterate instead 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
« no previous file with comments | « Source/core/frame/DOMWindowProperty.cpp ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 virtual ~LocalDOMWindow(); 105 virtual ~LocalDOMWindow();
106 106
107 PassRefPtrWillBeRawPtr<Document> installNewDocument(const String& mimeType, const DocumentInit&, bool forceXHTML = false); 107 PassRefPtrWillBeRawPtr<Document> installNewDocument(const String& mimeType, const DocumentInit&, bool forceXHTML = false);
108 108
109 virtual const AtomicString& interfaceName() const OVERRIDE; 109 virtual const AtomicString& interfaceName() const OVERRIDE;
110 virtual ExecutionContext* executionContext() const OVERRIDE; 110 virtual ExecutionContext* executionContext() const OVERRIDE;
111 111
112 virtual LocalDOMWindow* toDOMWindow() OVERRIDE; 112 virtual LocalDOMWindow* toDOMWindow() OVERRIDE;
113 113
114 void registerProperty(DOMWindowProperty*); 114 void registerProperty(DOMWindowProperty*);
115 void unregisterProperty(DOMWindowProperty*);
116 115
117 void reset(); 116 void reset();
118 117
119 PassRefPtrWillBeRawPtr<MediaQueryList> matchMedia(const String&); 118 PassRefPtrWillBeRawPtr<MediaQueryList> matchMedia(const String&);
120 119
121 unsigned pendingUnloadEventListeners() const; 120 unsigned pendingUnloadEventListeners() const;
122 121
123 static FloatRect adjustWindowRect(LocalFrame&, const FloatRect& pendingChang es); 122 static FloatRect adjustWindowRect(LocalFrame&, const FloatRect& pendingChang es);
124 123
125 bool allowPopUp(); // Call on first window, not target window. 124 bool allowPopUp(); // Call on first window, not target window.
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 358
360 void removeAllEventListenersInternal(BroadcastListenerRemoval); 359 void removeAllEventListenersInternal(BroadcastListenerRemoval);
361 360
362 RefPtrWillBeMember<Document> m_document; 361 RefPtrWillBeMember<Document> m_document;
363 362
364 bool m_shouldPrintWhenFinishedLoading; 363 bool m_shouldPrintWhenFinishedLoading;
365 #if ENABLE(ASSERT) 364 #if ENABLE(ASSERT)
366 bool m_hasBeenReset; 365 bool m_hasBeenReset;
367 #endif 366 #endif
368 367
369 WillBeHeapHashSet<RawPtrWillBeMember<DOMWindowProperty> > m_properties; 368 WillBeHeapHashSet<RawPtrWillBeMember<DOMWindowProperty> > m_properties;
Mads Ager (chromium) 2014/09/10 15:52:56 What makes sure that a DOMWindowProperty cannot di
Mads Ager (chromium) 2014/09/10 15:55:19 Heh, ignore me. All of those properties are held a
sof 2014/09/10 18:18:39 Yes, it looks doable to elaborate m_properties to
370 369
371 mutable RefPtrWillBeMember<Screen> m_screen; 370 mutable RefPtrWillBeMember<Screen> m_screen;
372 mutable RefPtrWillBeMember<History> m_history; 371 mutable RefPtrWillBeMember<History> m_history;
373 mutable RefPtrWillBeMember<BarProp> m_locationbar; 372 mutable RefPtrWillBeMember<BarProp> m_locationbar;
374 mutable RefPtrWillBeMember<BarProp> m_menubar; 373 mutable RefPtrWillBeMember<BarProp> m_menubar;
375 mutable RefPtrWillBeMember<BarProp> m_personalbar; 374 mutable RefPtrWillBeMember<BarProp> m_personalbar;
376 mutable RefPtrWillBeMember<BarProp> m_scrollbars; 375 mutable RefPtrWillBeMember<BarProp> m_scrollbars;
377 mutable RefPtrWillBeMember<BarProp> m_statusbar; 376 mutable RefPtrWillBeMember<BarProp> m_statusbar;
378 mutable RefPtrWillBeMember<BarProp> m_toolbar; 377 mutable RefPtrWillBeMember<BarProp> m_toolbar;
379 mutable RefPtrWillBeMember<Console> m_console; 378 mutable RefPtrWillBeMember<Console> m_console;
(...skipping 24 matching lines...) Expand all
404 } 403 }
405 404
406 inline String LocalDOMWindow::defaultStatus() const 405 inline String LocalDOMWindow::defaultStatus() const
407 { 406 {
408 return m_defaultStatus; 407 return m_defaultStatus;
409 } 408 }
410 409
411 } // namespace blink 410 } // namespace blink
412 411
413 #endif // LocalDOMWindow_h 412 #endif // LocalDOMWindow_h
OLDNEW
« no previous file with comments | « Source/core/frame/DOMWindowProperty.cpp ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698