NotificationController::clientFrom() should return a reference

Source/modules/notifications/Notification.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 25 matching lines @@
 #include "core/dom/Document.h"
 #include "core/frame/UseCounter.h"
 #include "core/page/WindowFocusAllowedIndicator.h"
 #include "modules/notifications/NotificationClient.h"
 #include "modules/notifications/NotificationController.h"
 
 namespace WebCore {
 
 Notification* Notification::create(ExecutionContext* context, const String& title, const Dictionary& options)
 {
-    NotificationClient* client = NotificationController::clientFrom(toDocument(context)->frame());
-    Notification* notification = adoptRefCountedGarbageCollected(new Notification(title, context, client));
+    NotificationClient& client = NotificationController::clientFrom(toDocument(context)->frame());
+    Notification* notification = adoptRefCountedGarbageCollected(new Notification(title, context, &client));
 
     String argument;
     if (options.get("body", argument))
         notification->setBody(argument);
     if (options.get("tag", argument))
         notification->setTag(argument);
     if (options.get("lang", argument))
         notification->setLang(argument);
     if (options.get("dir", argument))
         notification->setDir(argument);
@@ skipping 24 matching lines @@
 Notification::~Notification()
 {
 }
 
 void Notification::show()
 {
     ASSERT(m_state == Idle);
     if (!toDocument(executionContext())->page())
         return;
 
-    if (NotificationController::from(toDocument(executionContext())->frame())->client()->checkPermission(executionContext()) != NotificationClient::PermissionAllowed) {
+    if (m_client->checkPermission(executionContext()) != NotificationClient::PermissionAllowed) {
         dispatchErrorEvent();
         return;
     }
 
     if (m_client->show(this))
         m_state = Showing;
 }
 
 void Notification::close()
 {
@@ skipping 54 matching lines @@
 
     ASSERT_NOT_REACHED();
     return deniedPermission;
 }
 
 const String& Notification::permission(ExecutionContext* context)
 {
     ASSERT(toDocument(context)->page());
 
     UseCounter::count(context, UseCounter::NotificationPermission);
-    return permissionString(NotificationController::from(toDocument(context)->frame())->client()->checkPermission(context));
+    return permissionString(NotificationController::clientFrom(toDocument(context)->frame()).checkPermission(context));
 }
 
 void Notification::requestPermission(ExecutionContext* context, PassOwnPtr<NotificationPermissionCallback> callback)
 {
     ASSERT(toDocument(context)->page());
-    NotificationController::from(toDocument(context)->frame())->client()->requestPermission(context, callback);
+    NotificationController::clientFrom(toDocument(context)->frame()).requestPermission(context, callback);
 }
 
 bool Notification::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
 {
     ASSERT(m_state != Closed);
 
     return EventTarget::dispatchEvent(event);
 }
 
 const AtomicString& Notification::interfaceName() const
 {
     return EventTargetNames::Notification;
 }
 
 void Notification::stop()
 {
     if (m_client)
         m_client->notificationObjectDestroyed(this);
 
     if (m_asyncRunner)
         m_asyncRunner->stop();
 
-    m_client = 0;
+    m_client = nullptr;

[haraken, 2014/06/09 05:21:12]

We use 0 for raw pointers. (We use nullptr for RefPtrs and OwnPtrs.) Otherwise
we'll hit compile errors in some compilers.

[gyuyoung-inactive, 2014/06/09 05:38:31]

Ok, Fixed.

     m_state = Closed;
 }
 
 bool Notification::hasPendingActivity() const
 {
     return m_state == Showing || (m_asyncRunner && m_asyncRunner->isActive());
 }
 
 } // namespace WebCore