From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- .../notifications/NotificationController.cpp | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'Source/WebCore/Modules/notifications/NotificationController.cpp') diff --git a/Source/WebCore/Modules/notifications/NotificationController.cpp b/Source/WebCore/Modules/notifications/NotificationController.cpp index 0a90889d4..fc08b276f 100644 --- a/Source/WebCore/Modules/notifications/NotificationController.cpp +++ b/Source/WebCore/Modules/notifications/NotificationController.cpp @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -29,31 +29,26 @@ #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) #include "NotificationClient.h" -#include namespace WebCore { NotificationController::NotificationController(NotificationClient* client) - : m_client(client) + : m_client(*client) { + ASSERT(client); } NotificationController::~NotificationController() { - if (m_client) - m_client->notificationControllerDestroyed(); + m_client.notificationControllerDestroyed(); } -PassOwnPtr NotificationController::create(NotificationClient* client) +NotificationClient* NotificationController::clientFrom(Page& page) { - return adoptPtr(new NotificationController(client)); -} - -NotificationClient* NotificationController::clientFrom(Page* page) -{ - if (NotificationController* controller = NotificationController::from(page)) - return controller->client(); - return 0; + auto* controller = NotificationController::from(&page); + if (!controller) + return nullptr; + return &controller->client(); } const char* NotificationController::supplementName() @@ -63,7 +58,7 @@ const char* NotificationController::supplementName() void provideNotification(Page* page, NotificationClient* client) { - NotificationController::provideTo(page, NotificationController::supplementName(), NotificationController::create(client)); + NotificationController::provideTo(page, NotificationController::supplementName(), std::make_unique(client)); } } // namespace WebCore -- cgit v1.2.1