Merge clearImage() and clearImageAndNotifyObservers() into updateImage()

Merge clearImage() and clearImageAndNotifyObservers() into updateImage()

In order to make ImageResourceContent::updateImage() the single control point
of image updates from ImageResource, this CL merges clearImage() and
clearImageAndNotifyObservers() calls from ImageResource into updateImage().

BUG=667641
Review-Url: https://codereview.chromium.org/2587503002
Cr-Commit-Position: refs/heads/master@{#442351}
Committed: https://chromium.googlesource.com/chromium/src/+/5a597473adc7e1e3d0dd703d6d64dbe9364144ba

[hiroshige, 2016-12-16 18:59:44]

The CQ bit was checked by hiroshige@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-16 19:00:43]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[hiroshige, 2016-12-16 20:31:39]

The CQ bit was checked by hiroshige@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-16 20:33:38]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[hiroshige, 2016-12-16 22:46:24]

Description was changed from

==========
Merge clearImage() and clearImageAndNotifyObservers() into updateImage()

In order to make ImageResourceContent::updateImage() the single control point
of image updates from ImageResource, this CL merges clearImage() and
clearImageAndNotifyObservers() calls from ImageResource into updateImage().

BUG=
==========

to

==========
Merge clearImage() and clearImageAndNotifyObservers() into updateImage()

In order to make ImageResourceContent::updateImage() the single control point
of image updates from ImageResource, this CL merges clearImage() and
clearImageAndNotifyObservers() calls from ImageResource into updateImage().

BUG=667641
==========

[hiroshige, 2016-12-16 22:46:24]

hiroshige@chromium.org changed reviewers:
+ japhet@chromium.org, yhirano@chromium.org

[hiroshige, 2016-12-16 22:50:13]

PTAL.

Initially I thought calling clearImage() etc. is simpler rather than adding more
options to updateImage(), but during coding of
https://codereview.chromium.org/2527353002 I found having a single path for
updating image makes LoFi reloading simpler, so this CL merges clearImage(),
clearImageAndNotifyObservers() and updateImage() into one.

[commit-bot: I haz the power, 2016-12-17 00:42:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-17 00:42:32]

Dry run: This issue passed the CQ dry run.

[yhirano, 2016-12-19 11:50:26]

https://codereview.chromium.org/2587503002/diff/40001/third_party/WebKit/Sour...
File third_party/WebKit/Source/core/loader/resource/ImageResource.cpp (right):

https://codereview.chromium.org/2587503002/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/core/loader/resource/ImageResource.cpp:242:
getContent()->updateImage(nullptr, ImageResourceContent::ClearAndUpdateImage,
Isn't this ClearImageOnly?

[hiroshige, 2016-12-19 22:51:51]

https://codereview.chromium.org/2587503002/diff/40001/third_party/WebKit/Sour...
File third_party/WebKit/Source/core/loader/resource/ImageResource.cpp (right):

https://codereview.chromium.org/2587503002/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/core/loader/resource/ImageResource.cpp:242:
getContent()->updateImage(nullptr, ImageResourceContent::ClearAndUpdateImage,
On 2016/12/19 11:50:26, yhirano wrote:
> Isn't this ClearImageOnly?

No.
Here, we want to clear the image without notifying observers, to keep the
current behavior.
- If we use ClearImageOnly, the image is cleared but the observers are notified.
- If we use ClearAndUpdateImage, the image is cleared and the observers are not
notified because of the following if statement in updateImage():
    if (m_sizeAvailable == Image::SizeUnavailable && !allDataReceived)
      return;

In another perspective, using ClearAndUpdateImage here lets ImageResourceContent
to decide whether to notify observers (and in this case it doesn't), which might
look reasonable.

[yhirano, 2016-12-20 12:09:16]

https://codereview.chromium.org/2587503002/diff/40001/third_party/WebKit/Sour...
File third_party/WebKit/Source/core/loader/resource/ImageResource.cpp (right):

https://codereview.chromium.org/2587503002/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/core/loader/resource/ImageResource.cpp:242:
getContent()->updateImage(nullptr, ImageResourceContent::ClearAndUpdateImage,
On 2016/12/19 22:51:50, hiroshige wrote:
> On 2016/12/19 11:50:26, yhirano wrote:
> > Isn't this ClearImageOnly?
> 
> No.
> Here, we want to clear the image without notifying observers, to keep the
> current behavior.
> - If we use ClearImageOnly, the image is cleared but the observers are
notified.
> - If we use ClearAndUpdateImage, the image is cleared and the observers are
not
> notified because of the following if statement in updateImage():
>     if (m_sizeAvailable == Image::SizeUnavailable && !allDataReceived)
>       return;
> 
> In another perspective, using ClearAndUpdateImage here lets
ImageResourceContent
> to decide whether to notify observers (and in this case it doesn't), which
might
> look reasonable.

Then I think the enum naming is confusing - ClearImageOnly sounds more
restrictive than ClearAndUpdateImage.

[hiroshige, 2016-12-27 22:35:26]

The CQ bit was checked by hiroshige@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-27 22:35:40]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[hiroshige, 2016-12-27 22:36:09]

On 2016/12/20 12:09:16, yhirano OOO till 01-04 wrote:
>
https://codereview.chromium.org/2587503002/diff/40001/third_party/WebKit/Sour...
> File third_party/WebKit/Source/core/loader/resource/ImageResource.cpp (right):
> 
>
https://codereview.chromium.org/2587503002/diff/40001/third_party/WebKit/Sour...
> third_party/WebKit/Source/core/loader/resource/ImageResource.cpp:242:
> getContent()->updateImage(nullptr, ImageResourceContent::ClearAndUpdateImage,
> On 2016/12/19 22:51:50, hiroshige wrote:
> > On 2016/12/19 11:50:26, yhirano wrote:
> > > Isn't this ClearImageOnly?
> > 
> > No.
> > Here, we want to clear the image without notifying observers, to keep the
> > current behavior.
> > - If we use ClearImageOnly, the image is cleared but the observers are
> notified.
> > - If we use ClearAndUpdateImage, the image is cleared and the observers are
> not
> > notified because of the following if statement in updateImage():
> >     if (m_sizeAvailable == Image::SizeUnavailable && !allDataReceived)
> >       return;
> > 
> > In another perspective, using ClearAndUpdateImage here lets
> ImageResourceContent
> > to decide whether to notify observers (and in this case it doesn't), which
> might
> > look reasonable.
> 
> Then I think the enum naming is confusing - ClearImageOnly sounds more
> restrictive than ClearAndUpdateImage.

Looks reasonable. I renamed ClearImageOnly to ClearImageAndNotifyObservers and
also updated the comments.

[commit-bot: I haz the power, 2016-12-27 22:57:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-27 22:57:25]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[hiroshige, 2016-12-27 23:02:51]

The CQ bit was checked by hiroshige@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-27 23:03:04]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[hiroshige, 2016-12-27 23:23:56]

The CQ bit was checked by hiroshige@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-27 23:24:12]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Nate Chapin, 2016-12-27 23:46:52]

This l-g-t-m, but I've been out of the loop. If yhirano's happy, I'm happy :)

[commit-bot: I haz the power, 2016-12-28 01:10:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-28 01:10:12]

Dry run: This issue passed the CQ dry run.

[yhirano, 2017-01-05 08:26:14]

lgtm

[hiroshige, 2017-01-05 21:12:56]

The CQ bit was checked by hiroshige@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-05 21:13:13]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-05 22:52:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-05 22:52:23]

Dry run: This issue passed the CQ dry run.

[hiroshige, 2017-01-05 22:55:39]

The CQ bit was checked by hiroshige@chromium.org

[commit-bot: I haz the power, 2017-01-05 22:56:00]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-06 01:04:11]

CQ is committing da patch.

Bot data: {"patchset_id": 100001, "attempt_start_ts": 1483656939671730,
"parent_rev": "0f9a13711bef4107aeeb4e15ee296b917228c141", "commit_rev":
"783791d3f346098318401b61b46971e6bb1c1a3a"}

[commit-bot: I haz the power, 2017-01-06 01:08:29]

CQ is committing da patch.

Bot data: {"patchset_id": 100001, "attempt_start_ts": 1483656939671730,
"parent_rev": "0f9a13711bef4107aeeb4e15ee296b917228c141", "commit_rev":
"783791d3f346098318401b61b46971e6bb1c1a3a"}

[commit-bot: I haz the power, 2017-01-06 01:10:57]

CQ is committing da patch.

Bot data: {"patchset_id": 100001, "attempt_start_ts": 1483656939671730,
"parent_rev": "0f9a13711bef4107aeeb4e15ee296b917228c141", "commit_rev":
"783791d3f346098318401b61b46971e6bb1c1a3a"}

[commit-bot: I haz the power, 2017-01-06 01:13:39]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-06 01:13:40]

Failed to commit the patch.

[hiroshige, 2017-01-09 19:29:56]

The CQ bit was checked by hiroshige@chromium.org

[commit-bot: I haz the power, 2017-01-09 19:30:30]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-09 21:25:37]

CQ is committing da patch.

Bot data: {"patchset_id": 100001, "attempt_start_ts": 1483990196832670,
"parent_rev": "a110d353ecca5d521ce7ec513e0493c98f0b37ed", "commit_rev":
"5a597473adc7e1e3d0dd703d6d64dbe9364144ba"}

[commit-bot: I haz the power, 2017-01-09 21:26:06]

Description was changed from

==========
Merge clearImage() and clearImageAndNotifyObservers() into updateImage()

In order to make ImageResourceContent::updateImage() the single control point
of image updates from ImageResource, this CL merges clearImage() and
clearImageAndNotifyObservers() calls from ImageResource into updateImage().

BUG=667641
==========

to

==========
Merge clearImage() and clearImageAndNotifyObservers() into updateImage()

In order to make ImageResourceContent::updateImage() the single control point
of image updates from ImageResource, this CL merges clearImage() and
clearImageAndNotifyObservers() calls from ImageResource into updateImage().

BUG=667641

Review-Url: https://codereview.chromium.org/2587503002
Cr-Commit-Position: refs/heads/master@{#442351}
Committed:
https://chromium.googlesource.com/chromium/src/+/5a597473adc7e1e3d0dd703d6d64...
==========

[commit-bot: I haz the power, 2017-01-09 21:26:08]

Committed patchset #6 (id:100001) as
https://chromium.googlesource.com/chromium/src/+/5a597473adc7e1e3d0dd703d6d64...