| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 DOMWindowPagePopup::~DOMWindowPagePopup() | 45 DOMWindowPagePopup::~DOMWindowPagePopup() |
| 46 { | 46 { |
| 47 m_controller->clearPagePopupClient(); | 47 m_controller->clearPagePopupClient(); |
| 48 } | 48 } |
| 49 | 49 |
| 50 const char* DOMWindowPagePopup::supplementName() | 50 const char* DOMWindowPagePopup::supplementName() |
| 51 { | 51 { |
| 52 return "DOMWindowPagePopup"; | 52 return "DOMWindowPagePopup"; |
| 53 } | 53 } |
| 54 | 54 |
| 55 PagePopupController* DOMWindowPagePopup::pagePopupController(DOMWindow* window) | 55 PagePopupController* DOMWindowPagePopup::pagePopupController(DOMWindow& window) |
| 56 { | 56 { |
| 57 DOMWindowPagePopup* supplement = static_cast<DOMWindowPagePopup*>(from(windo
w, supplementName())); | 57 DOMWindowPagePopup* supplement = static_cast<DOMWindowPagePopup*>(from(&wind
ow, supplementName())); |
| 58 ASSERT(supplement); | 58 ASSERT(supplement); |
| 59 return supplement->m_controller.get(); | 59 return supplement->m_controller.get(); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void DOMWindowPagePopup::install(DOMWindow* window, PagePopupClient* popupClient
) | 62 void DOMWindowPagePopup::install(DOMWindow& window, PagePopupClient* popupClient
) |
| 63 { | 63 { |
| 64 ASSERT(window); | |
| 65 ASSERT(popupClient); | 64 ASSERT(popupClient); |
| 66 provideTo(window, supplementName(), adoptPtr(new DOMWindowPagePopup(popupCli
ent))); | 65 provideTo(window, supplementName(), adoptPtr(new DOMWindowPagePopup(popupCli
ent))); |
| 67 } | 66 } |
| 68 | 67 |
| 69 void DOMWindowPagePopup::uninstall(DOMWindow* window) | 68 void DOMWindowPagePopup::uninstall(DOMWindow& window) |
| 70 { | 69 { |
| 71 ASSERT(window); | 70 window.removeSupplement(supplementName()); |
| 72 window->removeSupplement(supplementName()); | |
| 73 } | 71 } |
| 74 | 72 |
| 75 } | 73 } |
| OLD | NEW |