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

Side by Side Diff: third_party/WebKit/Source/core/page/PagePopupSupplement.h

Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 10 matching lines...) Expand all
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef DOMWindowPagePopup_h 31 #ifndef PagePopupSupplement_h
32 #define DOMWindowPagePopup_h 32 #define PagePopupSupplement_h
33 33
34 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
35 #include "core/frame/LocalDOMWindow.h" 35 #include "core/frame/LocalFrame.h"
36 #include "platform/Supplementable.h" 36 #include "platform/Supplementable.h"
37 #include "platform/heap/Handle.h" 37 #include "platform/heap/Handle.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 class PagePopup; 41 class PagePopup;
42 class PagePopupClient; 42 class PagePopupClient;
43 class PagePopupController; 43 class PagePopupController;
44 44
45 class CORE_EXPORT DOMWindowPagePopup final : public NoBaseWillBeGarbageCollected <DOMWindowPagePopup>, public WillBeHeapSupplement<LocalDOMWindow> { 45 class CORE_EXPORT PagePopupSupplement final : public NoBaseWillBeGarbageCollecte d<PagePopupSupplement>, public WillBeHeapSupplement<LocalFrame> {
46 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DOMWindowPagePopup); 46 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PagePopupSupplement);
47 USING_FAST_MALLOC_WILL_BE_REMOVED(DOMWindowPagePopup); 47 USING_FAST_MALLOC_WILL_BE_REMOVED(PagePopupSupplement);
48
48 public: 49 public:
49 static PagePopupController* pagePopupController(DOMWindow&); 50 static PagePopupController* pagePopupController(LocalFrame&);
50 static void install(LocalDOMWindow&, PagePopup&, PagePopupClient*); 51 static void install(LocalFrame&, PagePopup&, PagePopupClient*);
51 static void uninstall(LocalDOMWindow&); 52 static void uninstall(LocalFrame&);
52 DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowPagePopup); 53 DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(PagePopupSupplement);
53 54
54 DECLARE_TRACE(); 55 DECLARE_TRACE();
55 56
56 private: 57 private:
57 DOMWindowPagePopup(PagePopup&, PagePopupClient*); 58 PagePopupSupplement(PagePopup&, PagePopupClient*);
58 static const char* supplementName(); 59 static const char* supplementName();
59 60
60 RefPtrWillBeMember<PagePopupController> m_controller; 61 RefPtrWillBeMember<PagePopupController> m_controller;
61 }; 62 };
62 63
63 } // namespace blink 64 } // namespace blink
64 #endif 65 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698