Title: [269007] branches/safari-611.1.4-branch/Source/WebCore
- Revision
- 269007
- Author
- [email protected]
- Date
- 2020-10-26 18:12:58 -0700 (Mon, 26 Oct 2020)
Log Message
Cherry-pick r268730. rdar://problem/70702315
Web Inspector: REGRESSION(r260076): crash under InspectorInstrumentation::willApplyKeyframeEffect
https://bugs.webkit.org/show_bug.cgi?id=217936
Reviewed by Brian Burg.
Speculative fix by null-checking `targetElementOrPseudoElement()` before using it. Before
r260076 this was not necessary as `m_target` is null-checked earlier in the function, but
after it can now return `nullptr` depending on the value of `m_pseudoId`.
* animation/KeyframeEffect.cpp:
(WebCore::KeyframeEffect::apply):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611.1.4-branch/Source/WebCore/ChangeLog (269006 => 269007)
--- branches/safari-611.1.4-branch/Source/WebCore/ChangeLog 2020-10-27 01:12:56 UTC (rev 269006)
+++ branches/safari-611.1.4-branch/Source/WebCore/ChangeLog 2020-10-27 01:12:58 UTC (rev 269007)
@@ -1,5 +1,38 @@
2020-10-26 Alan Coon <[email protected]>
+ Cherry-pick r268730. rdar://problem/70702315
+
+ Web Inspector: REGRESSION(r260076): crash under InspectorInstrumentation::willApplyKeyframeEffect
+ https://bugs.webkit.org/show_bug.cgi?id=217936
+
+ Reviewed by Brian Burg.
+
+ Speculative fix by null-checking `targetElementOrPseudoElement()` before using it. Before
+ r260076 this was not necessary as `m_target` is null-checked earlier in the function, but
+ after it can now return `nullptr` depending on the value of `m_pseudoId`.
+
+ * animation/KeyframeEffect.cpp:
+ (WebCore::KeyframeEffect::apply):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-20 Devin Rousso <[email protected]>
+
+ Web Inspector: REGRESSION(r260076): crash under InspectorInstrumentation::willApplyKeyframeEffect
+ https://bugs.webkit.org/show_bug.cgi?id=217936
+
+ Reviewed by Brian Burg.
+
+ Speculative fix by null-checking `targetElementOrPseudoElement()` before using it. Before
+ r260076 this was not necessary as `m_target` is null-checked earlier in the function, but
+ after it can now return `nullptr` depending on the value of `m_pseudoId`.
+
+ * animation/KeyframeEffect.cpp:
+ (WebCore::KeyframeEffect::apply):
+
+2020-10-26 Alan Coon <[email protected]>
+
Cherry-pick r268701. rdar://problem/70702378
Fix possible crash in GraphicsLayerCA::computeVisibleAndCoverageRect()
Modified: branches/safari-611.1.4-branch/Source/WebCore/animation/KeyframeEffect.cpp (269006 => 269007)
--- branches/safari-611.1.4-branch/Source/WebCore/animation/KeyframeEffect.cpp 2020-10-27 01:12:56 UTC (rev 269006)
+++ branches/safari-611.1.4-branch/Source/WebCore/animation/KeyframeEffect.cpp 2020-10-27 01:12:58 UTC (rev 269007)
@@ -1249,7 +1249,8 @@
auto computedTiming = getComputedTiming(startTime);
if (!startTime) {
m_phaseAtLastApplication = computedTiming.phase;
- InspectorInstrumentation::willApplyKeyframeEffect(*targetElementOrPseudoElement(), *this, computedTiming);
+ if (auto* target = targetElementOrPseudoElement())
+ InspectorInstrumentation::willApplyKeyframeEffect(*target, *this, computedTiming);
}
if (!computedTiming.progress)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
