[ElementTiming] Fix DCHECK about natural width and height
It is possible to do paint for images which have naturalWidth and
naturalHeight equal to 0. Therefore, the DCHECK is relaxed to allow
for this.
Bug: 953994, 879270
Change-Id: I65b1d9463d61e31775c937fad1e104a19d87f58b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1582842
Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Reviewed-by: Yoav Weiss <yoavweiss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#654062}
diff --git a/third_party/blink/renderer/core/timing/performance_element_timing.cc b/third_party/blink/renderer/core/timing/performance_element_timing.cc
index 68e55a36..9e976848 100644
--- a/third_party/blink/renderer/core/timing/performance_element_timing.cc
+++ b/third_party/blink/renderer/core/timing/performance_element_timing.cc
@@ -19,8 +19,10 @@
int naturalWidth,
int naturalHeight,
const AtomicString& id) {
- DCHECK_GT(naturalWidth, 0);
- DCHECK_GT(naturalHeight, 0);
+ // It is possible to 'paint' images which have naturalWidth or naturalHeight
+ // equal to 0.
+ DCHECK_GE(naturalWidth, 0);
+ DCHECK_GE(naturalHeight, 0);
return MakeGarbageCollected<PerformanceElementTiming>(
name, intersection_rect, start_time, response_end, identifier,
naturalWidth, naturalHeight, id);
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index 8cc44b23e..36d9223 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -6152,8 +6152,6 @@
# Sheriff 2019-04-18
crbug.com/954297 [ Linux Win ] http/tests/devtools/oopif/oopif-presentation-console-messages.js [ Pass Crash Timeout ]
-crbug.com/953994 [ Linux Win ] http/tests/security/svg-image-with-cached-remote-image.html [ Pass Crash ]
-crbug.com/953994 [ Linux Win ] virtual/outofblink-cors/http/tests/security/svg-image-with-cached-remote-image.html [ Pass Crash ]
# Sheriff 2019-04-19
crbug.com/954628 [ Win ] external/wpt/payment-request/payment-request-canmakepayment-method.https.html [ Pass Timeout ]
