chromium/src
0
Fork 0
Code Activity

Make |vector_small_image| a pointer in RichNotificationData.

Browse Source 
This CL changes |vector_small_image| in RichNotificationData to a
pointer. The setter and getter remain unchanged.

The reason of the change is to give separate lifetime to the returned
gfx::Image of Notification::GenerateMaskedSmallIcon from the original
Notification instance.

WebNotificationTray assumes they have separate lifetime.

VectorIcon constants e.g. kNotificationCapsLockIcon are globally
defined constants so we can assume they are alive from the beggining to
the end of the program.
(Example: gen/ash/resources/vector_icons/vector_icons.cc)

This CL is needed to land https://crrev.com/c/chromium/src/+/605342
without asan failure.

TEST=out/asan/ash_unittests
BUG=760866

Change-Id: Ia7c3cbed65772b205277f8c2aa6561eda3a250ee
Reviewed-on: https://chromium-review.googlesource.com/641696
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#498787}
This commit is contained in:
Tetsui Ohkubo
2017-08-31 08:25:43 +00:00
committed by Commit Bot
parent 4af3954405
commit 6008e9d038
1 changed files with 17 additions and 4 deletions

21
ui/message_center/notification.h

@ -108,9 +108,19 @@ class MESSAGE_CENTER_EXPORT RichNotificationData {
// notification. Optional.
gfx::Image small_image;
// Vector version of |small_image|. Used by Notification::GetMaskedSmallIcon.
// Vector version of |small_image|.
// Used by Notification::GenerateMaskedSmallIcon.
// If not available, |small_image| will be used by the method. Optional.
gfx::VectorIcon vector_small_image = gfx::kNoneIcon;
//
// Due to the restriction of CreateVectorIcon, this should be a pointer to
// globally defined VectorIcon instance e.g. kNotificationCapsLockIcon.
// gfx::Image created by gfx::CreateVectorIcon internally stores reference to
// VectorIcon, so the VectorIcon should live longer than gfx::Image instance.
// As a temporary solution to this problem, we make this variable a pointer
// and only pass globally defined constants.
// TODO(tetsui): Remove the pointer, after fixing VectorIconSource not to
// retain VectorIcon reference. https://crbug.com/760866
const gfx::VectorIcon* vector_small_image = &gfx::kNoneIcon;
// Items to display on the notification. Only applicable for notifications
// that have type NOTIFICATION_TYPE_MULTIPLE.
@ -323,10 +333,13 @@ class MESSAGE_CENTER_EXPORT Notification {
}
const gfx::VectorIcon& vector_small_image() const {
return optional_fields_.vector_small_image;
return *optional_fields_.vector_small_image;
}
// Due to the restriction of CreateVectorIcon, this should be a pointer to
// globally defined VectorIcon instance e.g. kNotificationCapsLockIcon.
// See detailed comment in RichNotificationData::vector_small_image.
void set_vector_small_image(const gfx::VectorIcon& image) {
optional_fields_.vector_small_image = image;
optional_fields_.vector_small_image = &image;
}
// Mask the color of |small_image| to the given |color|.