| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 } | 145 } |
| 146 | 146 |
| 147 void Notification::prepareShow() | 147 void Notification::prepareShow() |
| 148 { | 148 { |
| 149 DCHECK_EQ(m_state, NotificationStateIdle); | 149 DCHECK_EQ(m_state, NotificationStateIdle); |
| 150 if (NotificationManager::from(getExecutionContext())->permissionStatus() !=
mojom::blink::PermissionStatus::GRANTED) { | 150 if (NotificationManager::from(getExecutionContext())->permissionStatus() !=
mojom::blink::PermissionStatus::GRANTED) { |
| 151 dispatchErrorEvent(); | 151 dispatchErrorEvent(); |
| 152 return; | 152 return; |
| 153 } | 153 } |
| 154 | 154 |
| 155 m_loader = new NotificationResourcesLoader(bind(&Notification::didLoadResour
ces, wrapWeakPersistent(this))); | 155 m_loader = new NotificationResourcesLoader(WTF::bind(&Notification::didLoadR
esources, wrapWeakPersistent(this))); |
| 156 m_loader->start(getExecutionContext(), m_data); | 156 m_loader->start(getExecutionContext(), m_data); |
| 157 } | 157 } |
| 158 | 158 |
| 159 void Notification::didLoadResources(NotificationResourcesLoader* loader) | 159 void Notification::didLoadResources(NotificationResourcesLoader* loader) |
| 160 { | 160 { |
| 161 DCHECK_EQ(loader, m_loader.get()); | 161 DCHECK_EQ(loader, m_loader.get()); |
| 162 | 162 |
| 163 SecurityOrigin* origin = getExecutionContext()->getSecurityOrigin(); | 163 SecurityOrigin* origin = getExecutionContext()->getSecurityOrigin(); |
| 164 DCHECK(origin); | 164 DCHECK(origin); |
| 165 | 165 |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 | 397 |
| 398 DEFINE_TRACE(Notification) | 398 DEFINE_TRACE(Notification) |
| 399 { | 399 { |
| 400 visitor->trace(m_prepareShowMethodRunner); | 400 visitor->trace(m_prepareShowMethodRunner); |
| 401 visitor->trace(m_loader); | 401 visitor->trace(m_loader); |
| 402 EventTargetWithInlineData::trace(visitor); | 402 EventTargetWithInlineData::trace(visitor); |
| 403 ActiveDOMObject::trace(visitor); | 403 ActiveDOMObject::trace(visitor); |
| 404 } | 404 } |
| 405 | 405 |
| 406 } // namespace blink | 406 } // namespace blink |
| OLD | NEW |