Move notification resource loading from content/child to blink

third_party/WebKit/Source/modules/notifications/Notification.h

 /*
  * 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 36 matching lines @@
 #include "public/platform/modules/notifications/WebNotificationData.h"
 #include "public/platform/modules/notifications/WebNotificationDelegate.h"
 #include "public/platform/modules/notifications/WebNotificationPermission.h"
 
 namespace blink {
 
 class ExecutionContext;
 class NotificationAction;
 class NotificationOptions;
 class NotificationPermissionCallback;
+class NotificationResourcesLoader;
 class ScriptState;
 
 class MODULES_EXPORT Notification final : public EventTargetWithInlineData, public ActiveScriptWrappable, public ActiveDOMObject, public WebNotificationDelegate {
     USING_GARBAGE_COLLECTED_MIXIN(Notification);
     DEFINE_WRAPPERTYPEINFO();
 public:
     // Used for JavaScript instantiations of the Notification object. Will automatically schedule for
     // the notification to be displayed to the user when the developer-provided data is valid.
     static Notification* create(ExecutionContext*, const String& title, const NotificationOptions&, ExceptionState&);
 
@@ skipping 50 matching lines @@
 
     DECLARE_VIRTUAL_TRACE();
 
 protected:
     // EventTarget interface.
     DispatchEventResult dispatchEventInternal(Event*) final;
 
 private:
     Notification(ExecutionContext*, const WebNotificationData&);
 
-    void scheduleShow();
+    void schedulePrepareShow();
 
-    // Calling show() may start asynchronous operation. If this object has
+    // Calling prepareShow() may start asynchronous operation. If this object has
     // a V8 wrapper, hasPendingActivity() prevents the wrapper from being
     // collected while m_state is Showing, and so this instance stays alive
     // until the operation completes. Otherwise, you need to hold a ref on this
     // instance until the operation completes.

[Peter Beverloo, 2016/04/13 18:32:27]

Out of interest, do you think this comment is still relevant?

[Michael van Ouwerkerk, 2016/04/14 13:42:11]

It appears to be an antique. I've moved it to a special place I have for such
things.

[Peter Beverloo, 2016/04/15 11:07:29]

I am fond of left-hand-side redness as well.

-    void show();
+    void prepareShow();
+
+    void didLoadResources(NotificationResourcesLoader*);
 
     void setPersistentId(int64_t persistentId) { m_persistentId = persistentId; }
 
     WebNotificationData m_data;
 
     // ScriptValue representations of the developer-associated data. Initialized lazily on first access.
     ScriptValue m_developerData;
 
     // Notifications can either be bound to the page, which means they're identified by
     // their delegate, or persistent, which means they're identified by a persistent Id
     // given to us by the embedder. This influences how we close the notification.
     int64_t m_persistentId;
 
     enum NotificationState {
         NotificationStateIdle,
         NotificationStateShowing,
         NotificationStateClosing,
         NotificationStateClosed
     };
 
     // Only to be used by the Notification::create() method when notifications were created
     // by the embedder rather than by Blink.
     void setState(NotificationState state) { m_state = state; }
 
     NotificationState m_state;
 
-    Member<AsyncMethodRunner<Notification>> m_asyncRunner;
+    Member<AsyncMethodRunner<Notification>> m_prepareShowMethodRunner;
+
+    Member<NotificationResourcesLoader> m_loader;
 };
 
 } // namespace blink
 
 #endif // Notification_h