Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 ASSERT(popupClient); | 42 ASSERT(popupClient); |
| 43 } | 43 } |
| 44 | 44 |
| 45 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowPagePopup); | 45 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DOMWindowPagePopup); |
| 46 | 46 |
| 47 const char* DOMWindowPagePopup::supplementName() | 47 const char* DOMWindowPagePopup::supplementName() |
| 48 { | 48 { |
| 49 return "DOMWindowPagePopup"; | 49 return "DOMWindowPagePopup"; |
| 50 } | 50 } |
| 51 | 51 |
| 52 PagePopupController* DOMWindowPagePopup::pagePopupController(LocalDOMWindow& win dow) | 52 PagePopupController* DOMWindowPagePopup::pagePopupController(DOMWindow& window) |
|
haraken
2014/11/08 09:17:25
What's the point of changing LocalDOMWindow to DOM
dcheng
2014/11/08 23:59:56
This is required by the way the bindings code curr
haraken
2014/11/10 08:58:20
Ah, understood. I'm fine with your approach :)
| |
| 53 { | 53 { |
| 54 DOMWindowPagePopup* supplement = static_cast<DOMWindowPagePopup*>(from(&wind ow, supplementName())); | 54 DOMWindowPagePopup* supplement = static_cast<DOMWindowPagePopup*>(from(&toLo calDOMWindow(window), supplementName())); |
| 55 ASSERT(supplement); | 55 ASSERT(supplement); |
| 56 return supplement->m_controller.get(); | 56 return supplement->m_controller.get(); |
| 57 } | 57 } |
| 58 | 58 |
| 59 void DOMWindowPagePopup::install(LocalDOMWindow& window, PagePopupClient* popupC lient) | 59 void DOMWindowPagePopup::install(LocalDOMWindow& window, PagePopupClient* popupC lient) |
| 60 { | 60 { |
| 61 ASSERT(popupClient); | 61 ASSERT(popupClient); |
| 62 provideTo(window, supplementName(), adoptPtrWillBeNoop(new DOMWindowPagePopu p(popupClient))); | 62 provideTo(window, supplementName(), adoptPtrWillBeNoop(new DOMWindowPagePopu p(popupClient))); |
| 63 } | 63 } |
| 64 | 64 |
| 65 void DOMWindowPagePopup::uninstall(LocalDOMWindow& window) | 65 void DOMWindowPagePopup::uninstall(LocalDOMWindow& window) |
| 66 { | 66 { |
| 67 pagePopupController(window)->clearPagePopupClient(); | 67 pagePopupController(window)->clearPagePopupClient(); |
| 68 window.removeSupplement(supplementName()); | 68 window.removeSupplement(supplementName()); |
| 69 } | 69 } |
| 70 | 70 |
| 71 void DOMWindowPagePopup::trace(Visitor* visitor) | 71 void DOMWindowPagePopup::trace(Visitor* visitor) |
| 72 { | 72 { |
| 73 visitor->trace(m_controller); | 73 visitor->trace(m_controller); |
| 74 WillBeHeapSupplement<LocalDOMWindow>::trace(visitor); | 74 WillBeHeapSupplement<LocalDOMWindow>::trace(visitor); |
| 75 } | 75 } |
| 76 | 76 |
| 77 } | 77 } |
| OLD | NEW |