[webkit-changes] [276545] trunk/Source/WebKit
Title: [276545] trunk/Source/WebKit
Revision 276545
Author katherine_che...@apple.com
Date 2021-04-23 17:47:50 -0700 (Fri, 23 Apr 2021)
Log Message
PCM: debug mode should send the second report on a 10 second delay after the first
https://bugs.webkit.org/show_bug.cgi?id=225010
Reviewed by John Wilander.
Fix a bug in PCM debug mode where we don't set the timer for 10_s
after sending the first report for an attribution.
No new tests, this is debug mode only. Non-debug mode behavior is
covered by existing tests, and I tested debug mode manually.
* NetworkProcess/PrivateClickMeasurementManager.cpp:
(WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests):
If the attribution has been sent to only one endpoint, indicated by
a non-null laterTimeToSend value, we should set the timer to be 10
seconds if debug mode is enabled.
Also, change the interval time from 1 minute to 10 seconds, because
there was no good reason that it was 1 minute and we should be
consistent. Also 1 minute is a long time to wait during a test.
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp
Diff
Modified: trunk/Source/WebKit/ChangeLog (276544 => 276545)
--- trunk/Source/WebKit/ChangeLog 2021-04-24 00:40:37 UTC (rev 276544)
+++ trunk/Source/WebKit/ChangeLog 2021-04-24 00:47:50 UTC (rev 276545)
@@ -1,3 +1,27 @@
+2021-04-23 Kate Cheney
+
+PCM: debug mode should send the second report on a 10 second delay after the first
+https://bugs.webkit.org/show_bug.cgi?id=225010
+
+
+Reviewed by John Wilander.
+
+Fix a bug in PCM debug mode where we don't set the timer for 10_s
+after sending the first report for an attribution.
+
+No new tests, this is debug mode only. Non-debug mode behavior is
+covered by existing tests, and I tested debug mode manually.
+
+* NetworkProcess/PrivateClickMeasurementManager.cpp:
+(WebKit::PrivateClickMeasurementManager::firePendingAttributionRequests):
+If the attribution has been sent to only one endpoint, indicated by
+a non-null laterTimeToSend value, we should set the timer to be 10
+seconds if debug mode is enabled.
+
+Also, change the interval time from 1 minute to 10 seconds, because
+there was no good reason that it was 1 minute and we should be
+consistent. Also 1 minute is a long time to wait during a test.
+
2021-04-23 Commit Queue
Unreviewed, reverting r275562.
Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp (276544 => 276545)
--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp 2021-04-24 00:40:37 UTC (rev 276544)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurementManager.cpp 2021-04-24 00:47:50 UTC (rev 276545)
@@ -395,8 +395,8 @@
if (hasSentAttribution) {
// We've already sent an attribution this round. We should send additional overdue attributions at
// a random time between 15 and 30 minutes to avoid a burst of simultaneous attributions. If debug
-// mode is enabled, this should be every minute for easy testing.
-auto interval = debugModeEnabled() ? 1_min : 15_min + Seconds(cryptographicallyRandomNumber() % 900);
+// mode is enabled, this should be much shorter for easy testing.
+auto interval = debugModeEnabled() ? debugModeSecondsUntilSend : 15_min + Seconds(cryptographicallyRandomNumber() % 900);
startTimer(interval);
return;
}
@@ -407,8 +407,9 @@
hasSentAttribution = true;
// Update nextTimeToFire in case the later report time for this attribution is sooner than the scheduled next time to fire.
+// Or, if debug mode is enabled, we should send the second report on a much shorter delay for easy testing.
if (laterTimeToSend)
-nextTimeToFire = std::min(nextTimeToFire, laterTimeToSend.value().secondsSinceEpoch());
+nextTimeToFire = debugModeEnabled() ? debugModeSecondsUntilSend : std::min(nextTimeToFire, laterTimeToSend.value().secondsSinceEpoch());
continue;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276544] tags/Safari-611.2.4/
Title: [276544] tags/Safari-611.2.4/ Revision 276544 Author repst...@apple.com Date 2021-04-23 17:40:37 -0700 (Fri, 23 Apr 2021) Log Message Tag Safari-611.2.4. Added Paths tags/Safari-611.2.4/ Diff ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276543] tags/Safari-611.1.21.2.6/
Title: [276543] tags/Safari-611.1.21.2.6/ Revision 276543 Author repst...@apple.com Date 2021-04-23 17:36:47 -0700 (Fri, 23 Apr 2021) Log Message Tag Safari-611.1.21.2.6. Added Paths tags/Safari-611.1.21.2.6/ Diff ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276542] branches/safari-611.1.21.2-branch/Source/JavaScriptCore
Title: [276542] branches/safari-611.1.21.2-branch/Source/_javascript_Core
Revision 276542
Author repst...@apple.com
Date 2021-04-23 17:26:51 -0700 (Fri, 23 Apr 2021)
Log Message
Cherry-pick r276527. rdar://problem/77092686
[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
https://bugs.webkit.org/show_bug.cgi?id=224983
Reviewed by Mark Lam.
When we backtrack a parentheses with a greedy non zero based quantifier,
we don't properly restore for the case where we hadn't reached the minimum count.
We now save the input position on entry and restore it when we backtrack for
this case. We also properly release the allocated ParenthesesDisjunctionContext's.
* yarr/YarrInterpreter.cpp:
(JSC::Yarr::Interpreter::matchParentheses):
(JSC::Yarr::Interpreter::backtrackParentheses):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
branches/safari-611.1.21.2-branch/Source/_javascript_Core/ChangeLog
branches/safari-611.1.21.2-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp
Diff
Modified: branches/safari-611.1.21.2-branch/Source/_javascript_Core/ChangeLog (276541 => 276542)
--- branches/safari-611.1.21.2-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:26:48 UTC (rev 276541)
+++ branches/safari-611.1.21.2-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:26:51 UTC (rev 276542)
@@ -1,3 +1,40 @@
+2021-04-23 Alan Coon
+
+Cherry-pick r276527. rdar://problem/77092686
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2021-04-23 Michael Saboff
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
2021-02-17 Ruben Turcios
Cherry-pick r271767. rdar://problem/74409412
Modified: branches/safari-611.1.21.2-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp (276541 => 276542)
--- branches/safari-611.1.21.2-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-24 00:26:48 UTC (rev 276541)
+++ branches/safari-611.1.21.2-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-24 00:26:51 UTC (rev 276542)
@@ -45,6 +45,7 @@
struct ParenthesesDisjunctionContext;
struct BackTrackInfoParentheses {
+uintptr_t begin;
uintptr_t matchAmount;
ParenthesesDisjunctionContext* lastContext;
};
@@ -1015,6 +1016,7 @@
BackTrackInfoParentheses* backTrack = reinterpret_cast(context->frame + term.frameLocation);
ByteDisjunction* disjunctionBody = term.atom.parenthesesDisjunction;
+backTrack->begin = input.getPos();
backTrack->matchAmount = 0;
backTrack->lastContext = nullptr;
@@ -1168,8 +1170,20 @@
popParenthesesDisjunctionContext(backTrack);
freeParenthesesDisjunctionContext(context);
-if (result != JSRegExpNoMatch || backTrack->matchAmount < term.atom.quantityMinCount)
+if (backTrack->matchAmount < term.atom.quantityMinCount) {
+while (backTrack->matchAmount) {
+context = backTrack->lastContext;
+resetMatches(term, context);
+popParenthesesDisjunctionContext(backTrack);
+freeParenthesesDisjunctionContext(context);
+}
+
+input.setPos(backTrack->begin);
return result;
+}
+
+if (result != JSRegExpNoMatch)
+return result;
[webkit-changes] [276541] branches/safari-611.1.21.2-branch/Source
Title: [276541] branches/safari-611.1.21.2-branch/Source Revision 276541 Author repst...@apple.com Date 2021-04-23 17:26:48 -0700 (Fri, 23 Apr 2021) Log Message Versioning. WebKit-7611.1.21.2.6 Modified Paths branches/safari-611.1.21.2-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-611.1.21.2-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig branches/safari-611.1.21.2-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig branches/safari-611.1.21.2-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-611.1.21.2-branch/Source/WebCore/PAL/Configurations/Version.xcconfig branches/safari-611.1.21.2-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-611.1.21.2-branch/Source/WebKit/Configurations/Version.xcconfig branches/safari-611.1.21.2-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig Diff Modified: branches/safari-611.1.21.2-branch/Source/_javascript_Core/Configurations/Version.xcconfig (276540 => 276541) --- branches/safari-611.1.21.2-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2021-04-24 00:25:50 UTC (rev 276540) +++ branches/safari-611.1.21.2-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2021-04-24 00:26:48 UTC (rev 276541) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 2; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.2-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (276540 => 276541) --- branches/safari-611.1.21.2-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2021-04-24 00:25:50 UTC (rev 276540) +++ branches/safari-611.1.21.2-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2021-04-24 00:26:48 UTC (rev 276541) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 2; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.2-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (276540 => 276541) --- branches/safari-611.1.21.2-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2021-04-24 00:25:50 UTC (rev 276540) +++ branches/safari-611.1.21.2-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2021-04-24 00:26:48 UTC (rev 276541) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 2; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.2-branch/Source/WebCore/Configurations/Version.xcconfig (276540 => 276541) --- branches/safari-611.1.21.2-branch/Source/WebCore/Configurations/Version.xcconfig 2021-04-24 00:25:50 UTC (rev 276540) +++ branches/safari-611.1.21.2-branch/Source/WebCore/Configurations/Version.xcconfig 2021-04-24 00:26:48 UTC (rev 276541) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 2; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.2-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (276540 => 276541) --- branches/safari-611.1.21.2-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2021-04-24 00:25:50 UTC (rev 276540) +++ branches/safari-611.1.21.2-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2021-04-24 00:26:48 UTC (rev 276541) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 2; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.2-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (276540 => 276541) --- branches/safari-611.1.21.2-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2021-04-24 00:25:50 UTC (rev 276540) +++ branches/safari-611.1.21.2-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2021-04-24 00:26:48 UTC (rev 276541) @@ -2,7 +2,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 2; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION =
[webkit-changes] [276540] trunk/Tools
Title: [276540] trunk/Tools
Revision 276540
Author aakash_j...@apple.com
Date 2021-04-23 17:25:50 -0700 (Fri, 23 Apr 2021)
Log Message
Delete unused buildbot.css and default.css
https://bugs.webkit.org/show_bug.cgi?id=224997
Reviewed by Alexey Proskuryakov.
* CISupport/build-webkit-org/public_html/buildbot.css: Removed.
* CISupport/build-webkit-org/public_html/default.css: Removed.
Modified Paths
trunk/Tools/ChangeLog
Removed Paths
trunk/Tools/CISupport/build-webkit-org/public_html/buildbot.css
trunk/Tools/CISupport/build-webkit-org/public_html/default.css
Diff
Deleted: trunk/Tools/CISupport/build-webkit-org/public_html/buildbot.css (276539 => 276540)
--- trunk/Tools/CISupport/build-webkit-org/public_html/buildbot.css 2021-04-24 00:22:47 UTC (rev 276539)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/buildbot.css 2021-04-24 00:25:50 UTC (rev 276540)
@@ -1,382 +0,0 @@
-body {
- margin-bottom:50px;
-}
-
-body, td {
- font-family: Verdana, Cursor;
- font-size: 10px;
- font-weight: bold;
-}
-
-a:link,a:visited,a:active {
- color: #444;
-}
-
-a:hover {
- color: #00;
-}
-
-table {
- border-spacing: 1px 1px;
-}
-
-table td {
- padding: 3px 0px 3px 0px;
- text-align: center;
-}
-
-.Project {
- width: 100px;
-}
-
-.LastBuild, .Activity {
- padding: 0 0 0 4px;
-}
-
-.LastBuild, .Activity, .Builder, .BuildStep {
-width: 155px;
-max-width: 155px;
-}
-
-td.Time {
- color: #000;
- border-bottom: 1px solid #aaa;
- background-color: #eee;
-}
-
-td.Activity, td.Change, td.Builder {
- color: #33;
- background-color: #CC;
-}
-
-td.Change {
- border-radius: 5px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
-}
-td.Event {
- color: #777;
- background-color: #ddd;
- border-radius: 5px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
-}
-
-td.Activity {
- border-top-left-radius: 10px;
- -webkit-border-top-left-radius: 10px;
- -moz-border-radius-topleft: 10px;
- min-height: 20px;
- padding: 2px 0 2px 0;
-}
-
-td.idle, td.waiting, td.offline, td.building {
- border-top-left-radius: 0px;
- -webkit-border-top-left-radius: 0px;
- -moz-border-radius-topleft: 0px;
-}
-
-.LastBuild {
- border-top-left-radius: 5px;
- -webkit-border-top-left-radius: 5px;
- -moz-border-radius-topleft: 5px;
- border-top-right-radius: 5px;
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topright: 5px;
-}
-
-/* Console view styles */
-
-td.DevRev {
-padding: 4px 8px 4px 8px;
-color: #33;
-border-top-left-radius: 5px;
--webkit-border-top-left-radius: 5px;
--moz-border-radius-topleft: 5px;
-background-color: #eee;
-width: 1%;
-}
-
-td.DevRevCollapse {
-border-bottom-left-radius: 5px;
--webkit-border-bottom-left-radius: 5px;
--moz-border-radius-bottomleft: 5px;
-}
-
-td.DevName {
-padding: 4px 8px 4px 8px;
-color: #33;
-background-color: #eee;
-width: 1%;
-text-align: left;
-}
-
-td.DevStatus {
-padding: 4px 4px 4px 4px;
-color: #33;
-background-color: #eee;
-}
-
-td.DevSlave {
-padding: 4px 4px 4px 4px;
-color: #33;
-background-color: #eee;
-}
-
-td.first {
-border-top-left-radius: 5px;
--webkit-border-top-left-radius: 5px;
--moz-border-radius-topleft: 5px;
-}
-
-td.last {
-border-top-right-radius: 5px;
--webkit-border-top-right-radius: 5px;
--moz-border-radius-topright: 5px;
-}
-
-td.DevStatusCategory {
-border-radius: 5px;
--webkit-border-radius: 5px;
--moz-border-radius: 5px;
-border-width:1px;
-border-style:solid;
-}
-
-td.DevStatusCollapse {
-border-bottom-right-radius: 5px;
--webkit-border-bottom-right-radius: 5px;
--moz-border-radius-bottomright: 5px;
-}
-
-td.DevDetails {
-font-weight: normal;
-padding: 8px 8px 8px 8px;
-color: #33;
-background-color: #eee;
-text-align: left;
-}
-
-td.DevComment {
-font-weight: normal;
-padding: 8px 8px 8px 8px;
-color: #33;
-border-bottom-right-radius: 5px;
--webkit-border-bottom-right-radius: 5px;
--moz-border-radius-bottomright: 5px;
-border-bottom-left-radius: 5px;
--webkit-border-bottom-left-radius: 5px;
--moz-border-radius-bottomleft: 5px;
-background-color: #eee;
-text-align: left;
-}
-
-td.Alt {
-background-color: #CC;
-}
-
-.legend {
-border-radius: 5px;
--webkit-border-radius: 5px;
--moz-border-radius: 5px;
-width: 100px;
-max-width: 100px;
-text-align:center;
-padding: 2px 2px 2px 2px;
-height:14px;
-white-space:nowrap;
-}
-
-.DevStatusBox {
-text-align:center;
-height:20px;
-padding:0 2px;
-line-height:0;
-white-space:nowrap;
-}
-
-.DevStatusBox a {
-opacity:
[webkit-changes] [276539] tags/Safari-611.1.21.161.6/
Title: [276539] tags/Safari-611.1.21.161.6/ Revision 276539 Author repst...@apple.com Date 2021-04-23 17:22:47 -0700 (Fri, 23 Apr 2021) Log Message Tag Safari-611.1.21.161.6. Added Paths tags/Safari-611.1.21.161.6/ Diff ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276538] branches/safari-611.1.21.161-branch/Source/JavaScriptCore
Title: [276538] branches/safari-611.1.21.161-branch/Source/_javascript_Core
Revision 276538
Author repst...@apple.com
Date 2021-04-23 17:21:14 -0700 (Fri, 23 Apr 2021)
Log Message
Cherry-pick r276527. rdar://problem/77092673
[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
https://bugs.webkit.org/show_bug.cgi?id=224983
Reviewed by Mark Lam.
When we backtrack a parentheses with a greedy non zero based quantifier,
we don't properly restore for the case where we hadn't reached the minimum count.
We now save the input position on entry and restore it when we backtrack for
this case. We also properly release the allocated ParenthesesDisjunctionContext's.
* yarr/YarrInterpreter.cpp:
(JSC::Yarr::Interpreter::matchParentheses):
(JSC::Yarr::Interpreter::backtrackParentheses):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
branches/safari-611.1.21.161-branch/Source/_javascript_Core/ChangeLog
branches/safari-611.1.21.161-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp
Diff
Modified: branches/safari-611.1.21.161-branch/Source/_javascript_Core/ChangeLog (276537 => 276538)
--- branches/safari-611.1.21.161-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:21:10 UTC (rev 276537)
+++ branches/safari-611.1.21.161-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:21:14 UTC (rev 276538)
@@ -1,5 +1,42 @@
2021-04-23 Alan Coon
+Cherry-pick r276527. rdar://problem/77092673
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2021-04-23 Michael Saboff
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
+2021-04-23 Alan Coon
+
Cherry-pick r276524. rdar://problem/77092702
Fix B3 strength reduction for shl.
Modified: branches/safari-611.1.21.161-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp (276537 => 276538)
--- branches/safari-611.1.21.161-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-24 00:21:10 UTC (rev 276537)
+++ branches/safari-611.1.21.161-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-24 00:21:14 UTC (rev 276538)
@@ -45,6 +45,7 @@
struct ParenthesesDisjunctionContext;
struct BackTrackInfoParentheses {
+uintptr_t begin;
uintptr_t matchAmount;
ParenthesesDisjunctionContext* lastContext;
};
@@ -1015,6 +1016,7 @@
BackTrackInfoParentheses* backTrack = reinterpret_cast(context->frame + term.frameLocation);
ByteDisjunction* disjunctionBody = term.atom.parenthesesDisjunction;
+backTrack->begin = input.getPos();
backTrack->matchAmount = 0;
backTrack->lastContext = nullptr;
@@ -1168,8 +1170,20 @@
popParenthesesDisjunctionContext(backTrack);
freeParenthesesDisjunctionContext(context);
-if (result != JSRegExpNoMatch || backTrack->matchAmount < term.atom.quantityMinCount)
+if (backTrack->matchAmount < term.atom.quantityMinCount) {
+while (backTrack->matchAmount) {
+context = backTrack->lastContext;
+resetMatches(term, context);
+popParenthesesDisjunctionContext(backTrack);
+freeParenthesesDisjunctionContext(context);
+}
+
+input.setPos(backTrack->begin);
return result;
+}
+
+if (result !=
[webkit-changes] [276537] branches/safari-611.1.21.161-branch/Source/JavaScriptCore
Title: [276537] branches/safari-611.1.21.161-branch/Source/_javascript_Core
Revision 276537
Author repst...@apple.com
Date 2021-04-23 17:21:10 -0700 (Fri, 23 Apr 2021)
Log Message
Cherry-pick r276524. rdar://problem/77092702
Fix B3 strength reduction for shl.
https://bugs.webkit.org/show_bug.cgi?id=224913
rdar://76978874
Reviewed by Michael Saboff.
If the operation can potentially either underflow or overflow, then the result
can be any value.
* b3/B3ReduceStrength.cpp:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276524 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
branches/safari-611.1.21.161-branch/Source/_javascript_Core/ChangeLog
branches/safari-611.1.21.161-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp
Diff
Modified: branches/safari-611.1.21.161-branch/Source/_javascript_Core/ChangeLog (276536 => 276537)
--- branches/safari-611.1.21.161-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:18:32 UTC (rev 276536)
+++ branches/safari-611.1.21.161-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:21:10 UTC (rev 276537)
@@ -1,3 +1,35 @@
+2021-04-23 Alan Coon
+
+Cherry-pick r276524. rdar://problem/77092702
+
+Fix B3 strength reduction for shl.
+https://bugs.webkit.org/show_bug.cgi?id=224913
+rdar://76978874
+
+Reviewed by Michael Saboff.
+
+If the operation can potentially either underflow or overflow, then the result
+can be any value.
+
+* b3/B3ReduceStrength.cpp:
+
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276524 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2021-04-23 Mark Lam
+
+Fix B3 strength reduction for shl.
+https://bugs.webkit.org/show_bug.cgi?id=224913
+rdar://76978874
+
+Reviewed by Michael Saboff.
+
+If the operation can potentially either underflow or overflow, then the result
+can be any value.
+
+* b3/B3ReduceStrength.cpp:
+
2021-02-17 Ruben Turcios
Cherry-pick r271767. rdar://problem/74409412
Modified: branches/safari-611.1.21.161-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp (276536 => 276537)
--- branches/safari-611.1.21.161-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp 2021-04-24 00:18:32 UTC (rev 276536)
+++ branches/safari-611.1.21.161-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp 2021-04-24 00:21:10 UTC (rev 276537)
@@ -240,10 +240,11 @@
T newMin = static_cast(m_min) << static_cast(shiftAmount);
T newMax = static_cast(m_max) << static_cast(shiftAmount);
-if ((newMin >> shiftAmount) != static_cast(m_min))
+if (((newMin >> shiftAmount) != static_cast(m_min))
+|| ((newMax >> shiftAmount) != static_cast(m_max))) {
newMin = std::numeric_limits::min();
-if ((newMax >> shiftAmount) != static_cast(m_max))
newMax = std::numeric_limits::max();
+}
return IntRange(newMin, newMax);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276536] trunk/Websites/bugs.webkit.org
Title: [276536] trunk/Websites/bugs.webkit.org Revision 276536 Author jbed...@apple.com Date 2021-04-23 17:18:32 -0700 (Fri, 23 Apr 2021) Log Message Bugzilla needs to linkify identifiers (Part 1) https://bugs.webkit.org/show_bug.cgi?id=224312 Reviewed by Dewei Zhu. * extensions/Commits: Moved from Trac. * extensions/Commits/Config.pm: Changed Plugin name. * extensions/Commits/Extension.pm: Ditto. (_replace_revision): Use commit.webkit.org instead of trac. * extensions/Trac: Moved to Commits. Modified Paths trunk/Websites/bugs.webkit.org/ChangeLog Added Paths trunk/Websites/bugs.webkit.org/extensions/Commits/ trunk/Websites/bugs.webkit.org/extensions/Commits/Config.pm trunk/Websites/bugs.webkit.org/extensions/Commits/Extension.pm Removed Paths trunk/Websites/bugs.webkit.org/extensions/Trac/ Diff Modified: trunk/Websites/bugs.webkit.org/ChangeLog (276535 => 276536) --- trunk/Websites/bugs.webkit.org/ChangeLog 2021-04-24 00:18:29 UTC (rev 276535) +++ trunk/Websites/bugs.webkit.org/ChangeLog 2021-04-24 00:18:32 UTC (rev 276536) @@ -1,3 +1,17 @@ +2021-04-23 Jonathan Bedard + +Bugzilla needs to linkify identifiers (Part 1) +https://bugs.webkit.org/show_bug.cgi?id=224312 + + +Reviewed by Dewei Zhu. + +* extensions/Commits: Moved from Trac. +* extensions/Commits/Config.pm: Changed Plugin name. +* extensions/Commits/Extension.pm: Ditto. +(_replace_revision): Use commit.webkit.org instead of trac. +* extensions/Trac: Moved to Commits. + 2021-01-15 Ling Ho Bugzilla patch upload no longer displays the agreement for some users Copied: trunk/Websites/bugs.webkit.org/extensions/Commits/Config.pm (from rev 276530, trunk/Websites/bugs.webkit.org/extensions/Trac/Config.pm) (0 => 276536) --- trunk/Websites/bugs.webkit.org/extensions/Commits/Config.pm (rev 0) +++ trunk/Websites/bugs.webkit.org/extensions/Commits/Config.pm 2021-04-24 00:18:32 UTC (rev 276536) @@ -0,0 +1,32 @@ +# Copyright (C) 2019-2021 Apple 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: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package Bugzilla::Extension::Commits; + +use strict; +use warnings; + +use constant NAME => "Commits"; +use constant REQUIRED_MODULES => []; +use constant OPTIONAL_MODULES => []; + +__PACKAGE__->NAME; Copied: trunk/Websites/bugs.webkit.org/extensions/Commits/Extension.pm (from rev 276530, trunk/Websites/bugs.webkit.org/extensions/Trac/Extension.pm) (0 => 276536) --- trunk/Websites/bugs.webkit.org/extensions/Commits/Extension.pm (rev 0) +++ trunk/Websites/bugs.webkit.org/extensions/Commits/Extension.pm 2021-04-24 00:18:32 UTC (rev 276536) @@ -0,0 +1,49 @@ +# Copyright (C) 2019-2021 Apple 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: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
[webkit-changes] [276535] branches/safari-611.1.21.161-branch/Source
Title: [276535] branches/safari-611.1.21.161-branch/Source Revision 276535 Author repst...@apple.com Date 2021-04-23 17:18:29 -0700 (Fri, 23 Apr 2021) Log Message Versioning. WebKit-7611.1.21.161.6 Modified Paths branches/safari-611.1.21.161-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-611.1.21.161-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig branches/safari-611.1.21.161-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig branches/safari-611.1.21.161-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-611.1.21.161-branch/Source/WebCore/PAL/Configurations/Version.xcconfig branches/safari-611.1.21.161-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-611.1.21.161-branch/Source/WebKit/Configurations/Version.xcconfig branches/safari-611.1.21.161-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig Diff Modified: branches/safari-611.1.21.161-branch/Source/_javascript_Core/Configurations/Version.xcconfig (276534 => 276535) --- branches/safari-611.1.21.161-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2021-04-24 00:16:28 UTC (rev 276534) +++ branches/safari-611.1.21.161-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2021-04-24 00:18:29 UTC (rev 276535) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 161; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.161-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (276534 => 276535) --- branches/safari-611.1.21.161-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2021-04-24 00:16:28 UTC (rev 276534) +++ branches/safari-611.1.21.161-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2021-04-24 00:18:29 UTC (rev 276535) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 161; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.161-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (276534 => 276535) --- branches/safari-611.1.21.161-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2021-04-24 00:16:28 UTC (rev 276534) +++ branches/safari-611.1.21.161-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2021-04-24 00:18:29 UTC (rev 276535) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 161; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.161-branch/Source/WebCore/Configurations/Version.xcconfig (276534 => 276535) --- branches/safari-611.1.21.161-branch/Source/WebCore/Configurations/Version.xcconfig 2021-04-24 00:16:28 UTC (rev 276534) +++ branches/safari-611.1.21.161-branch/Source/WebCore/Configurations/Version.xcconfig 2021-04-24 00:18:29 UTC (rev 276535) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 161; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.161-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (276534 => 276535) --- branches/safari-611.1.21.161-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2021-04-24 00:16:28 UTC (rev 276534) +++ branches/safari-611.1.21.161-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2021-04-24 00:18:29 UTC (rev 276535) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 161; -NANO_VERSION = 5; +NANO_VERSION = 6; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.161-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (276534 => 276535) --- branches/safari-611.1.21.161-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2021-04-24 00:16:28 UTC (rev 276534) +++ branches/safari-611.1.21.161-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2021-04-24 00:18:29 UTC (rev 276535) @@ -2,7 +2,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 161; -NANO_VERSION = 5;
[webkit-changes] [276534] tags/Safari-611.1.21.0.14/
Title: [276534] tags/Safari-611.1.21.0.14/ Revision 276534 Author repst...@apple.com Date 2021-04-23 17:16:28 -0700 (Fri, 23 Apr 2021) Log Message Tag Safari-611.1.21.0.14. Added Paths tags/Safari-611.1.21.0.14/ Diff ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276533] branches/safari-611.1.21.0-branch/Source/JavaScriptCore
Title: [276533] branches/safari-611.1.21.0-branch/Source/_javascript_Core
Revision 276533
Author repst...@apple.com
Date 2021-04-23 17:13:54 -0700 (Fri, 23 Apr 2021)
Log Message
Cherry-pick r276527. rdar://problem/77092655
[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
https://bugs.webkit.org/show_bug.cgi?id=224983
Reviewed by Mark Lam.
When we backtrack a parentheses with a greedy non zero based quantifier,
we don't properly restore for the case where we hadn't reached the minimum count.
We now save the input position on entry and restore it when we backtrack for
this case. We also properly release the allocated ParenthesesDisjunctionContext's.
* yarr/YarrInterpreter.cpp:
(JSC::Yarr::Interpreter::matchParentheses):
(JSC::Yarr::Interpreter::backtrackParentheses):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
branches/safari-611.1.21.0-branch/Source/_javascript_Core/ChangeLog
branches/safari-611.1.21.0-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp
Diff
Modified: branches/safari-611.1.21.0-branch/Source/_javascript_Core/ChangeLog (276532 => 276533)
--- branches/safari-611.1.21.0-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:13:50 UTC (rev 276532)
+++ branches/safari-611.1.21.0-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:13:54 UTC (rev 276533)
@@ -1,5 +1,42 @@
2021-04-23 Alan Coon
+Cherry-pick r276527. rdar://problem/77092655
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2021-04-23 Michael Saboff
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
+2021-04-23 Alan Coon
+
Cherry-pick r276524. rdar://problem/77092695
Fix B3 strength reduction for shl.
Modified: branches/safari-611.1.21.0-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp (276532 => 276533)
--- branches/safari-611.1.21.0-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-24 00:13:50 UTC (rev 276532)
+++ branches/safari-611.1.21.0-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-24 00:13:54 UTC (rev 276533)
@@ -45,6 +45,7 @@
struct ParenthesesDisjunctionContext;
struct BackTrackInfoParentheses {
+uintptr_t begin;
uintptr_t matchAmount;
ParenthesesDisjunctionContext* lastContext;
};
@@ -1015,6 +1016,7 @@
BackTrackInfoParentheses* backTrack = reinterpret_cast(context->frame + term.frameLocation);
ByteDisjunction* disjunctionBody = term.atom.parenthesesDisjunction;
+backTrack->begin = input.getPos();
backTrack->matchAmount = 0;
backTrack->lastContext = nullptr;
@@ -1168,8 +1170,20 @@
popParenthesesDisjunctionContext(backTrack);
freeParenthesesDisjunctionContext(context);
-if (result != JSRegExpNoMatch || backTrack->matchAmount < term.atom.quantityMinCount)
+if (backTrack->matchAmount < term.atom.quantityMinCount) {
+while (backTrack->matchAmount) {
+context = backTrack->lastContext;
+resetMatches(term, context);
+popParenthesesDisjunctionContext(backTrack);
+freeParenthesesDisjunctionContext(context);
+}
+
+input.setPos(backTrack->begin);
return result;
+}
+
+if (result != JSRegExpNoMatch)
+
[webkit-changes] [276532] branches/safari-611.1.21.0-branch/Source/JavaScriptCore
Title: [276532] branches/safari-611.1.21.0-branch/Source/_javascript_Core
Revision 276532
Author repst...@apple.com
Date 2021-04-23 17:13:50 -0700 (Fri, 23 Apr 2021)
Log Message
Cherry-pick r276524. rdar://problem/77092695
Fix B3 strength reduction for shl.
https://bugs.webkit.org/show_bug.cgi?id=224913
rdar://76978874
Reviewed by Michael Saboff.
If the operation can potentially either underflow or overflow, then the result
can be any value.
* b3/B3ReduceStrength.cpp:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276524 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
branches/safari-611.1.21.0-branch/Source/_javascript_Core/ChangeLog
branches/safari-611.1.21.0-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp
Diff
Modified: branches/safari-611.1.21.0-branch/Source/_javascript_Core/ChangeLog (276531 => 276532)
--- branches/safari-611.1.21.0-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:08:22 UTC (rev 276531)
+++ branches/safari-611.1.21.0-branch/Source/_javascript_Core/ChangeLog 2021-04-24 00:13:50 UTC (rev 276532)
@@ -1,3 +1,35 @@
+2021-04-23 Alan Coon
+
+Cherry-pick r276524. rdar://problem/77092695
+
+Fix B3 strength reduction for shl.
+https://bugs.webkit.org/show_bug.cgi?id=224913
+rdar://76978874
+
+Reviewed by Michael Saboff.
+
+If the operation can potentially either underflow or overflow, then the result
+can be any value.
+
+* b3/B3ReduceStrength.cpp:
+
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276524 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2021-04-23 Mark Lam
+
+Fix B3 strength reduction for shl.
+https://bugs.webkit.org/show_bug.cgi?id=224913
+rdar://76978874
+
+Reviewed by Michael Saboff.
+
+If the operation can potentially either underflow or overflow, then the result
+can be any value.
+
+* b3/B3ReduceStrength.cpp:
+
2021-02-17 Ruben Turcios
Cherry-pick r271767. rdar://problem/74409412
Modified: branches/safari-611.1.21.0-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp (276531 => 276532)
--- branches/safari-611.1.21.0-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp 2021-04-24 00:08:22 UTC (rev 276531)
+++ branches/safari-611.1.21.0-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp 2021-04-24 00:13:50 UTC (rev 276532)
@@ -240,10 +240,11 @@
T newMin = static_cast(m_min) << static_cast(shiftAmount);
T newMax = static_cast(m_max) << static_cast(shiftAmount);
-if ((newMin >> shiftAmount) != static_cast(m_min))
+if (((newMin >> shiftAmount) != static_cast(m_min))
+|| ((newMax >> shiftAmount) != static_cast(m_max))) {
newMin = std::numeric_limits::min();
-if ((newMax >> shiftAmount) != static_cast(m_max))
newMax = std::numeric_limits::max();
+}
return IntRange(newMin, newMax);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276531] branches/safari-611.1.21.0-branch/Source
Title: [276531] branches/safari-611.1.21.0-branch/Source Revision 276531 Author repst...@apple.com Date 2021-04-23 17:08:22 -0700 (Fri, 23 Apr 2021) Log Message Versioning. WebKit-7611.1.21.0.14 Modified Paths branches/safari-611.1.21.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-611.1.21.0-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig branches/safari-611.1.21.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig branches/safari-611.1.21.0-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-611.1.21.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig branches/safari-611.1.21.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-611.1.21.0-branch/Source/WebKit/Configurations/Version.xcconfig branches/safari-611.1.21.0-branch/Source/WebKitLegacy/mac/Configurations/Version.xcconfig Diff Modified: branches/safari-611.1.21.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig (276530 => 276531) --- branches/safari-611.1.21.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2021-04-23 23:45:57 UTC (rev 276530) +++ branches/safari-611.1.21.0-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2021-04-24 00:08:22 UTC (rev 276531) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 0; -NANO_VERSION = 13; +NANO_VERSION = 14; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.0-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (276530 => 276531) --- branches/safari-611.1.21.0-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2021-04-23 23:45:57 UTC (rev 276530) +++ branches/safari-611.1.21.0-branch/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2021-04-24 00:08:22 UTC (rev 276531) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 0; -NANO_VERSION = 13; +NANO_VERSION = 14; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (276530 => 276531) --- branches/safari-611.1.21.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2021-04-23 23:45:57 UTC (rev 276530) +++ branches/safari-611.1.21.0-branch/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2021-04-24 00:08:22 UTC (rev 276531) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 0; -NANO_VERSION = 13; +NANO_VERSION = 14; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.0-branch/Source/WebCore/Configurations/Version.xcconfig (276530 => 276531) --- branches/safari-611.1.21.0-branch/Source/WebCore/Configurations/Version.xcconfig 2021-04-23 23:45:57 UTC (rev 276530) +++ branches/safari-611.1.21.0-branch/Source/WebCore/Configurations/Version.xcconfig 2021-04-24 00:08:22 UTC (rev 276531) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 0; -NANO_VERSION = 13; +NANO_VERSION = 14; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (276530 => 276531) --- branches/safari-611.1.21.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2021-04-23 23:45:57 UTC (rev 276530) +++ branches/safari-611.1.21.0-branch/Source/WebCore/PAL/Configurations/Version.xcconfig 2021-04-24 00:08:22 UTC (rev 276531) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 0; -NANO_VERSION = 13; +NANO_VERSION = 14; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: branches/safari-611.1.21.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (276530 => 276531) --- branches/safari-611.1.21.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2021-04-23 23:45:57 UTC (rev 276530) +++ branches/safari-611.1.21.0-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2021-04-24 00:08:22 UTC (rev 276531) @@ -2,7 +2,7 @@ MINOR_VERSION = 1; TINY_VERSION = 21; MICRO_VERSION = 0; -NANO_VERSION = 13; +NANO_VERSION = 14; FULL_VERSION =
[webkit-changes] [276530] trunk/Source/WebCore
Title: [276530] trunk/Source/WebCore
Revision 276530
Author rn...@webkit.org
Date 2021-04-23 16:45:57 -0700 (Fri, 23 Apr 2021)
Log Message
Crash in constructCustomElementSynchronously
https://bugs.webkit.org/show_bug.cgi?id=224992
Reviewed by Tadeu Zagallo.
Exit early when the global object is nullptr although this shouldn't happen.
No new tests since we have no reproductions.
* bindings/js/JSCustomElementInterface.cpp:
(WebCore::JSCustomElementInterface::tryToConstructCustomElement): Added a null check.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (276529 => 276530)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 23:38:34 UTC (rev 276529)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 23:45:57 UTC (rev 276530)
@@ -1,3 +1,18 @@
+2021-04-23 Ryosuke Niwa
+
+Crash in constructCustomElementSynchronously
+https://bugs.webkit.org/show_bug.cgi?id=224992
+
+
+Reviewed by Tadeu Zagallo.
+
+Exit early when the global object is nullptr although this shouldn't happen.
+
+No new tests since we have no reproductions.
+
+* bindings/js/JSCustomElementInterface.cpp:
+(WebCore::JSCustomElementInterface::tryToConstructCustomElement): Added a null check.
+
2021-04-23 Don Olmstead
Add additional guards around USE_ANGLE
Modified: trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp (276529 => 276530)
--- trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2021-04-23 23:38:34 UTC (rev 276529)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2021-04-23 23:45:57 UTC (rev 276530)
@@ -99,13 +99,16 @@
return nullptr;
ASSERT( == scriptExecutionContext());
-auto& lexicalGlobalObject = *document.globalObject();
-auto element = constructCustomElementSynchronously(document, vm, lexicalGlobalObject, m_constructor.get(), localName);
+auto* lexicalGlobalObject = document.globalObject();
+ASSERT(lexicalGlobalObject);
+if (!lexicalGlobalObject)
+return nullptr;
+auto element = constructCustomElementSynchronously(document, vm, *lexicalGlobalObject, m_constructor.get(), localName);
EXCEPTION_ASSERT(!!scope.exception() == !element);
if (!element) {
auto* exception = scope.exception();
scope.clearException();
-reportException(, exception);
+reportException(lexicalGlobalObject, exception);
return nullptr;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276529] branches/safari-611-branch/Source/JavaScriptCore
Title: [276529] branches/safari-611-branch/Source/_javascript_Core
Revision 276529
Author repst...@apple.com
Date 2021-04-23 16:38:34 -0700 (Fri, 23 Apr 2021)
Log Message
Cherry-pick r276527. rdar://problem/77091667
[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
https://bugs.webkit.org/show_bug.cgi?id=224983
Reviewed by Mark Lam.
When we backtrack a parentheses with a greedy non zero based quantifier,
we don't properly restore for the case where we hadn't reached the minimum count.
We now save the input position on entry and restore it when we backtrack for
this case. We also properly release the allocated ParenthesesDisjunctionContext's.
* yarr/YarrInterpreter.cpp:
(JSC::Yarr::Interpreter::matchParentheses):
(JSC::Yarr::Interpreter::backtrackParentheses):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
branches/safari-611-branch/Source/_javascript_Core/ChangeLog
branches/safari-611-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp
Diff
Modified: branches/safari-611-branch/Source/_javascript_Core/ChangeLog (276528 => 276529)
--- branches/safari-611-branch/Source/_javascript_Core/ChangeLog 2021-04-23 23:21:20 UTC (rev 276528)
+++ branches/safari-611-branch/Source/_javascript_Core/ChangeLog 2021-04-23 23:38:34 UTC (rev 276529)
@@ -1,5 +1,42 @@
2021-04-23 Ruben Turcios
+Cherry-pick r276527. rdar://problem/77091667
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276527 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2021-04-23 Michael Saboff
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
+2021-04-23 Ruben Turcios
+
Cherry-pick r276524. rdar://problem/77089783
Fix B3 strength reduction for shl.
Modified: branches/safari-611-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp (276528 => 276529)
--- branches/safari-611-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-23 23:21:20 UTC (rev 276528)
+++ branches/safari-611-branch/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-23 23:38:34 UTC (rev 276529)
@@ -45,6 +45,7 @@
struct ParenthesesDisjunctionContext;
struct BackTrackInfoParentheses {
+uintptr_t begin;
uintptr_t matchAmount;
ParenthesesDisjunctionContext* lastContext;
};
@@ -1015,6 +1016,7 @@
BackTrackInfoParentheses* backTrack = reinterpret_cast(context->frame + term.frameLocation);
ByteDisjunction* disjunctionBody = term.atom.parenthesesDisjunction;
+backTrack->begin = input.getPos();
backTrack->matchAmount = 0;
backTrack->lastContext = nullptr;
@@ -1168,8 +1170,20 @@
popParenthesesDisjunctionContext(backTrack);
freeParenthesesDisjunctionContext(context);
-if (result != JSRegExpNoMatch || backTrack->matchAmount < term.atom.quantityMinCount)
+if (backTrack->matchAmount < term.atom.quantityMinCount) {
+while (backTrack->matchAmount) {
+context = backTrack->lastContext;
+resetMatches(term, context);
+popParenthesesDisjunctionContext(backTrack);
+freeParenthesesDisjunctionContext(context);
+}
+
+input.setPos(backTrack->begin);
return result;
+}
+
+if (result != JSRegExpNoMatch)
+return result;
}
[webkit-changes] [276528] trunk/Source/WebCore
Title: [276528] trunk/Source/WebCore
Revision 276528
Author don.olmst...@sony.com
Date 2021-04-23 16:21:20 -0700 (Fri, 23 Apr 2021)
Log Message
Add additional guards around USE_ANGLE
https://bugs.webkit.org/show_bug.cgi?id=225001
Reviewed by Fujii Hironori.
When USE(ANGLE) initializeOpenGLShims isn't used or available.
When USE(ANGLE) the ANGLE shader compiler isn't needed.
* platform/graphics/GLContext.cpp:
(WebCore::initializeOpenGLShimsIfNeeded):
* platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/GLContext.cpp
trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (276527 => 276528)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 23:06:12 UTC (rev 276527)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 23:21:20 UTC (rev 276528)
@@ -1,3 +1,18 @@
+2021-04-23 Don Olmstead
+
+Add additional guards around USE_ANGLE
+https://bugs.webkit.org/show_bug.cgi?id=225001
+
+Reviewed by Fujii Hironori.
+
+When USE(ANGLE) initializeOpenGLShims isn't used or available.
+
+When USE(ANGLE) the ANGLE shader compiler isn't needed.
+
+* platform/graphics/GLContext.cpp:
+(WebCore::initializeOpenGLShimsIfNeeded):
+* platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
+
2021-04-23 Cathie Chen
Not computing image aspect ratios from width and height attributes for lazy loaded images
Modified: trunk/Source/WebCore/platform/graphics/GLContext.cpp (276527 => 276528)
--- trunk/Source/WebCore/platform/graphics/GLContext.cpp 2021-04-23 23:06:12 UTC (rev 276527)
+++ trunk/Source/WebCore/platform/graphics/GLContext.cpp 2021-04-23 23:21:20 UTC (rev 276528)
@@ -57,7 +57,7 @@
static bool initializeOpenGLShimsIfNeeded()
{
-#if USE(OPENGL_ES) || USE(LIBEPOXY)
+#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
return true;
#else
static bool initialized = false;
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp (276527 => 276528)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2021-04-23 23:06:12 UTC (rev 276527)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2021-04-23 23:21:20 UTC (rev 276528)
@@ -34,7 +34,6 @@
#include "GLContext.h"
#include "GraphicsContextGLOpenGLManager.h"
#include "TextureMapperGCGLPlatformLayer.h"
-#include
#include
#include
@@ -48,11 +47,14 @@
#if USE(ANGLE)
#include "ExtensionsGLANGLE.h"
-#elif USE(OPENGL_ES)
+#else
+#include
+#if USE(OPENGL_ES)
#include "ExtensionsGLOpenGLES.h"
#else
#include "ExtensionsGLOpenGL.h"
#endif
+#endif
#if USE(NICOSIA)
#if USE(ANGLE)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276527] trunk/Source/JavaScriptCore
Title: [276527] trunk/Source/_javascript_Core
Revision 276527
Author msab...@apple.com
Date 2021-04-23 16:06:12 -0700 (Fri, 23 Apr 2021)
Log Message
[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
https://bugs.webkit.org/show_bug.cgi?id=224983
Reviewed by Mark Lam.
When we backtrack a parentheses with a greedy non zero based quantifier,
we don't properly restore for the case where we hadn't reached the minimum count.
We now save the input position on entry and restore it when we backtrack for
this case. We also properly release the allocated ParenthesesDisjunctionContext's.
* yarr/YarrInterpreter.cpp:
(JSC::Yarr::Interpreter::matchParentheses):
(JSC::Yarr::Interpreter::backtrackParentheses):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (276526 => 276527)
--- trunk/Source/_javascript_Core/ChangeLog 2021-04-23 23:01:48 UTC (rev 276526)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-04-23 23:06:12 UTC (rev 276527)
@@ -1,3 +1,19 @@
+2021-04-23 Michael Saboff
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
2021-04-23 Mark Lam
Fix B3 strength reduction for shl.
Modified: trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp (276526 => 276527)
--- trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-23 23:01:48 UTC (rev 276526)
+++ trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-23 23:06:12 UTC (rev 276527)
@@ -45,6 +45,7 @@
struct ParenthesesDisjunctionContext;
struct BackTrackInfoParentheses {
+uintptr_t begin;
uintptr_t matchAmount;
ParenthesesDisjunctionContext* lastContext;
};
@@ -1022,6 +1023,7 @@
BackTrackInfoParentheses* backTrack = reinterpret_cast(context->frame + term.frameLocation);
ByteDisjunction* disjunctionBody = term.atom.parenthesesDisjunction;
+backTrack->begin = input.getPos();
backTrack->matchAmount = 0;
backTrack->lastContext = nullptr;
@@ -1175,8 +1177,20 @@
popParenthesesDisjunctionContext(backTrack);
freeParenthesesDisjunctionContext(context);
-if (result != JSRegExpNoMatch || backTrack->matchAmount < term.atom.quantityMinCount)
+if (backTrack->matchAmount < term.atom.quantityMinCount) {
+while (backTrack->matchAmount) {
+context = backTrack->lastContext;
+resetMatches(term, context);
+popParenthesesDisjunctionContext(backTrack);
+freeParenthesesDisjunctionContext(context);
+}
+
+input.setPos(backTrack->begin);
return result;
+}
+
+if (result != JSRegExpNoMatch)
+return result;
}
if (backTrack->matchAmount) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276526] trunk/LayoutTests
Title: [276526] trunk/LayoutTests Revision 276526 Author cdu...@apple.com Date 2021-04-23 16:01:48 -0700 (Fri, 23 Apr 2021) Log Message http/tests/security/referrer-policy-header.html is slow https://bugs.webkit.org/show_bug.cgi?id=224998 Reviewed by Geoffrey Garen. The test is a flaky timeout on the bots because it is slow. On my machine, it takes 17 seconds to run it with a debug build. To speed things up, I am now running the subtests in parallel instead of sequentially. I also split the test in 2 (regular response vs multipart response). Each tests now takes about ~5 seconds to run on my machine. * http/tests/security/referrer-policy-header-expected.txt: * http/tests/security/referrer-policy-header-multipart-expected.txt: Added. * http/tests/security/referrer-policy-header-multipart.html: Added. * http/tests/security/referrer-policy-header-test.js: Copied from LayoutTests/http/tests/security/referrer-policy-header.html. (printResults): (onmessage): (runTests): * http/tests/security/referrer-policy-header.html: * http/tests/security/resources/postReferrer.py: * http/tests/security/resources/serve-referrer-policy-and-test.py: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/http/tests/security/referrer-policy-header-expected.txt trunk/LayoutTests/http/tests/security/referrer-policy-header.html trunk/LayoutTests/http/tests/security/resources/postReferrer.py trunk/LayoutTests/http/tests/security/resources/serve-referrer-policy-and-test.py Added Paths trunk/LayoutTests/http/tests/security/referrer-policy-header-multipart-expected.txt trunk/LayoutTests/http/tests/security/referrer-policy-header-multipart.html trunk/LayoutTests/http/tests/security/referrer-policy-header-test.js Diff Modified: trunk/LayoutTests/ChangeLog (276525 => 276526) --- trunk/LayoutTests/ChangeLog 2021-04-23 22:46:21 UTC (rev 276525) +++ trunk/LayoutTests/ChangeLog 2021-04-23 23:01:48 UTC (rev 276526) @@ -1,3 +1,26 @@ +2021-04-23 Chris Dumez + +http/tests/security/referrer-policy-header.html is slow +https://bugs.webkit.org/show_bug.cgi?id=224998 + +Reviewed by Geoffrey Garen. + +The test is a flaky timeout on the bots because it is slow. On my machine, it takes 17 seconds to run +it with a debug build. To speed things up, I am now running the subtests in parallel instead of +sequentially. I also split the test in 2 (regular response vs multipart response). Each tests now takes +about ~5 seconds to run on my machine. + +* http/tests/security/referrer-policy-header-expected.txt: +* http/tests/security/referrer-policy-header-multipart-expected.txt: Added. +* http/tests/security/referrer-policy-header-multipart.html: Added. +* http/tests/security/referrer-policy-header-test.js: Copied from LayoutTests/http/tests/security/referrer-policy-header.html. +(printResults): +(onmessage): +(runTests): +* http/tests/security/referrer-policy-header.html: +* http/tests/security/resources/postReferrer.py: +* http/tests/security/resources/serve-referrer-policy-and-test.py: + 2021-04-23 Ryan Haddad imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html is a flakey crash and failure Modified: trunk/LayoutTests/http/tests/security/referrer-policy-header-expected.txt (276525 => 276526) --- trunk/LayoutTests/http/tests/security/referrer-policy-header-expected.txt 2021-04-23 22:46:21 UTC (rev 276525) +++ trunk/LayoutTests/http/tests/security/referrer-policy-header-expected.txt 2021-04-23 23:01:48 UTC (rev 276526) @@ -1,15 +1,3 @@ -CONSOLE MESSAGE: Failed to set referrer policy: The value 'invalid' is not one of 'no-referrer', 'no-referrer-when-downgrade', 'same-origin', 'origin', 'strict-origin', 'origin-when-cross-origin', 'strict-origin-when-cross-origin' or 'unsafe-url'. -CONSOLE MESSAGE: Failed to set referrer policy: The value 'invalid' is not one of 'no-referrer', 'no-referrer-when-downgrade', 'same-origin', 'origin', 'strict-origin', 'origin-when-cross-origin', 'strict-origin-when-cross-origin' or 'unsafe-url'. -CONSOLE MESSAGE: Failed to set referrer policy: The value 'invalid' is not one of 'no-referrer', 'no-referrer-when-downgrade', 'same-origin', 'origin', 'strict-origin', 'origin-when-cross-origin', 'strict-origin-when-cross-origin' or 'unsafe-url'. -CONSOLE MESSAGE: Failed to set referrer policy: The value '' is not one of 'no-referrer', 'no-referrer-when-downgrade', 'same-origin', 'origin', 'strict-origin', 'origin-when-cross-origin', 'strict-origin-when-cross-origin' or 'unsafe-url'. -CONSOLE MESSAGE: Failed to set referrer policy: The value '' is not one of 'no-referrer', 'no-referrer-when-downgrade', 'same-origin', 'origin', 'strict-origin', 'origin-when-cross-origin', 'strict-origin-when-cross-origin' or 'unsafe-url'. -CONSOLE MESSAGE: Failed to set referrer policy: The value '' is not one
[webkit-changes] [276525] branches/safari-611-branch/Source/JavaScriptCore
Title: [276525] branches/safari-611-branch/Source/_javascript_Core
Revision 276525
Author repst...@apple.com
Date 2021-04-23 15:46:21 -0700 (Fri, 23 Apr 2021)
Log Message
Cherry-pick r276524. rdar://problem/77089783
Fix B3 strength reduction for shl.
https://bugs.webkit.org/show_bug.cgi?id=224913
rdar://76978874
Reviewed by Michael Saboff.
If the operation can potentially either underflow or overflow, then the result
can be any value.
* b3/B3ReduceStrength.cpp:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276524 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
branches/safari-611-branch/Source/_javascript_Core/ChangeLog
branches/safari-611-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp
Diff
Modified: branches/safari-611-branch/Source/_javascript_Core/ChangeLog (276524 => 276525)
--- branches/safari-611-branch/Source/_javascript_Core/ChangeLog 2021-04-23 22:14:11 UTC (rev 276524)
+++ branches/safari-611-branch/Source/_javascript_Core/ChangeLog 2021-04-23 22:46:21 UTC (rev 276525)
@@ -1,3 +1,35 @@
+2021-04-23 Ruben Turcios
+
+Cherry-pick r276524. rdar://problem/77089783
+
+Fix B3 strength reduction for shl.
+https://bugs.webkit.org/show_bug.cgi?id=224913
+rdar://76978874
+
+Reviewed by Michael Saboff.
+
+If the operation can potentially either underflow or overflow, then the result
+can be any value.
+
+* b3/B3ReduceStrength.cpp:
+
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276524 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2021-04-23 Mark Lam
+
+Fix B3 strength reduction for shl.
+https://bugs.webkit.org/show_bug.cgi?id=224913
+rdar://76978874
+
+Reviewed by Michael Saboff.
+
+If the operation can potentially either underflow or overflow, then the result
+can be any value.
+
+* b3/B3ReduceStrength.cpp:
+
2021-04-23 Russell Epstein
Cherry-pick r276324. rdar://problem/77086404
Modified: branches/safari-611-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp (276524 => 276525)
--- branches/safari-611-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp 2021-04-23 22:14:11 UTC (rev 276524)
+++ branches/safari-611-branch/Source/_javascript_Core/b3/B3ReduceStrength.cpp 2021-04-23 22:46:21 UTC (rev 276525)
@@ -240,10 +240,11 @@
T newMin = static_cast(m_min) << static_cast(shiftAmount);
T newMax = static_cast(m_max) << static_cast(shiftAmount);
-if ((newMin >> shiftAmount) != static_cast(m_min))
+if (((newMin >> shiftAmount) != static_cast(m_min))
+|| ((newMax >> shiftAmount) != static_cast(m_max))) {
newMin = std::numeric_limits::min();
-if ((newMax >> shiftAmount) != static_cast(m_max))
newMax = std::numeric_limits::max();
+}
return IntRange(newMin, newMax);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276524] trunk/Source/JavaScriptCore
Title: [276524] trunk/Source/_javascript_Core
Revision 276524
Author mark@apple.com
Date 2021-04-23 15:14:11 -0700 (Fri, 23 Apr 2021)
Log Message
Fix B3 strength reduction for shl.
https://bugs.webkit.org/show_bug.cgi?id=224913
rdar://76978874
Reviewed by Michael Saboff.
If the operation can potentially either underflow or overflow, then the result
can be any value.
* b3/B3ReduceStrength.cpp:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/b3/B3ReduceStrength.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (276523 => 276524)
--- trunk/Source/_javascript_Core/ChangeLog 2021-04-23 22:06:26 UTC (rev 276523)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-04-23 22:14:11 UTC (rev 276524)
@@ -1,3 +1,16 @@
+2021-04-23 Mark Lam
+
+Fix B3 strength reduction for shl.
+https://bugs.webkit.org/show_bug.cgi?id=224913
+rdar://76978874
+
+Reviewed by Michael Saboff.
+
+If the operation can potentially either underflow or overflow, then the result
+can be any value.
+
+* b3/B3ReduceStrength.cpp:
+
2021-04-23 Fujii Hironori
[JSC][Win] callOperationNoExceptionCheck() also needs to support operations that return SlowPathReturnType
Modified: trunk/Source/_javascript_Core/b3/B3ReduceStrength.cpp (276523 => 276524)
--- trunk/Source/_javascript_Core/b3/B3ReduceStrength.cpp 2021-04-23 22:06:26 UTC (rev 276523)
+++ trunk/Source/_javascript_Core/b3/B3ReduceStrength.cpp 2021-04-23 22:14:11 UTC (rev 276524)
@@ -240,10 +240,11 @@
T newMin = static_cast(m_min) << static_cast(shiftAmount);
T newMax = static_cast(m_max) << static_cast(shiftAmount);
-if ((newMin >> shiftAmount) != static_cast(m_min))
+if (((newMin >> shiftAmount) != static_cast(m_min))
+|| ((newMax >> shiftAmount) != static_cast(m_max))) {
newMin = std::numeric_limits::min();
-if ((newMax >> shiftAmount) != static_cast(m_max))
newMax = std::numeric_limits::max();
+}
return IntRange(newMin, newMax);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276523] trunk/Source/WebKit
Title: [276523] trunk/Source/WebKit
Revision 276523
Author commit-qu...@webkit.org
Date 2021-04-23 15:06:26 -0700 (Fri, 23 Apr 2021)
Log Message
Unreviewed, reverting r275562.
https://bugs.webkit.org/show_bug.cgi?id=225002
Causes issues in iOS contextmenu animations and interactions
with other popovers
Reverted changeset:
"[iOS] contextmenu hints can be clipped by the WKWebView"
https://bugs.webkit.org/show_bug.cgi?id=224204
https://trac.webkit.org/changeset/275562
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h
trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h
trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.mm
trunk/Source/WebKit/UIProcess/ios/WKContentView.mm
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
Diff
Modified: trunk/Source/WebKit/ChangeLog (276522 => 276523)
--- trunk/Source/WebKit/ChangeLog 2021-04-23 22:04:56 UTC (rev 276522)
+++ trunk/Source/WebKit/ChangeLog 2021-04-23 22:06:26 UTC (rev 276523)
@@ -1,3 +1,17 @@
+2021-04-23 Commit Queue
+
+Unreviewed, reverting r275562.
+https://bugs.webkit.org/show_bug.cgi?id=225002
+
+Causes issues in iOS contextmenu animations and interactions
+with other popovers
+
+Reverted changeset:
+
+"[iOS] contextmenu hints can be clipped by the WKWebView"
+https://bugs.webkit.org/show_bug.cgi?id=224204
+https://trac.webkit.org/changeset/275562
+
2021-04-23 Aditya Keerthi
REGRESSION (r273154): fast/forms/ios/repeatedly-focus-offscreen-select.html is consistently failing
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (276522 => 276523)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-04-23 22:04:56 UTC (rev 276522)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-04-23 22:06:26 UTC (rev 276523)
@@ -1218,6 +1218,10 @@
@end
#if USE(UICONTEXTMENU)
+@interface UITargetedPreview ()
+@property (nonatomic, strong, setter=_setOverridePositionTrackingView:) UIView *overridePositionTrackingView;
+@end
+
@interface UIContextMenuInteraction ()
@property (nonatomic, readonly) UIGestureRecognizer *gestureRecognizerForFailureRelationships;
- (void)_presentMenuAtLocation:(CGPoint)location;
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm (276522 => 276523)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm 2021-04-23 22:04:56 UTC (rev 276522)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm 2021-04-23 22:06:26 UTC (rev 276523)
@@ -31,7 +31,6 @@
#import "RemoteLayerTreeHost.h"
#import "RemoteLayerTreeNode.h"
-#import "ScrollingTreeFrameScrollingNodeRemoteIOS.h"
#import "ScrollingTreeOverflowScrollingNodeIOS.h"
#import "WebPageProxy.h"
#import
@@ -57,22 +56,12 @@
UIScrollView *RemoteScrollingCoordinatorProxy::scrollViewForScrollingNodeID(ScrollingNodeID nodeID) const
{
auto* treeNode = m_scrollingTree->nodeForID(nodeID);
+if (!is(treeNode))
+return nil;
-if (is(treeNode)) {
-auto* overflowScrollingNode = downcast(treeNode);
-
-// All ScrollingTreeOverflowScrollingNodes are ScrollingTreeOverflowScrollingNodeIOS on iOS.
-return static_cast(overflowScrollingNode)->scrollView();
-}
-
-if (is(treeNode)) {
-auto* frameScrollingNode = downcast(treeNode);
-
-// All ScrollingTreeFrameScrollingNodes are ScrollingTreeFrameScrollingNodeRemoteIOS on iOS.
-return static_cast(frameScrollingNode)->scrollView();
-}
-
-return nil;
+auto* scrollingNode = downcast(treeNode);
+// All ScrollingTreeOverflowScrollingNodes are ScrollingTreeOverflowScrollingNodeIOS on iOS.
+return static_cast(scrollingNode)->scrollView();
}
void RemoteScrollingCoordinatorProxy::connectStateNodeLayers(ScrollingStateTree& stateTree, const RemoteLayerTreeHost& layerTreeHost)
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h (276522 => 276523)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h 2021-04-23 22:04:56 UTC (rev 276522)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h 2021-04-23 22:06:26 UTC (rev 276523)
@@ -38,8 +38,6 @@
static Ref create(WebCore::ScrollingTree&, WebCore::ScrollingNodeType, WebCore::ScrollingNodeID);
virtual ~ScrollingTreeFrameScrollingNodeRemoteIOS();
-UIScrollView *scrollView() const;
-
private:
ScrollingTreeFrameScrollingNodeRemoteIOS(WebCore::ScrollingTree&, WebCore::ScrollingNodeType, WebCore::ScrollingNodeID);
Modified:
[webkit-changes] [276522] trunk/Source/WebKit
Title: [276522] trunk/Source/WebKit
Revision 276522
Author akeer...@apple.com
Date 2021-04-23 15:04:56 -0700 (Fri, 23 Apr 2021)
Log Message
REGRESSION (r273154): fast/forms/ios/repeatedly-focus-offscreen-select.html is consistently failing
https://bugs.webkit.org/show_bug.cgi?id=224985
Reviewed by Wenson Hsieh.
The test is failing after r273154, which made elements present
a UIMenu rather than a popover. The old logic ensured popovers were not
presented when the element was offscreen (see r265117 for more
information on why that behavior was necessary), but the new
presentation omitted that logic.
To achieve the correct behavior, and fix the failing test,
menus should not be presented when the element is offscreen.
* UIProcess/ios/forms/WKFormSelectPicker.mm:
(-[WKSelectPicker controlBeginEditing]):
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm
Diff
Modified: trunk/Source/WebKit/ChangeLog (276521 => 276522)
--- trunk/Source/WebKit/ChangeLog 2021-04-23 22:00:12 UTC (rev 276521)
+++ trunk/Source/WebKit/ChangeLog 2021-04-23 22:04:56 UTC (rev 276522)
@@ -1,3 +1,23 @@
+2021-04-23 Aditya Keerthi
+
+REGRESSION (r273154): fast/forms/ios/repeatedly-focus-offscreen-select.html is consistently failing
+https://bugs.webkit.org/show_bug.cgi?id=224985
+
+
+Reviewed by Wenson Hsieh.
+
+The test is failing after r273154, which made elements present
+a UIMenu rather than a popover. The old logic ensured popovers were not
+presented when the element was offscreen (see r265117 for more
+information on why that behavior was necessary), but the new
+presentation omitted that logic.
+
+To achieve the correct behavior, and fix the failing test,
+menus should not be presented when the element is offscreen.
+
+* UIProcess/ios/forms/WKFormSelectPicker.mm:
+(-[WKSelectPicker controlBeginEditing]):
+
2021-04-23 Commit Queue
Unreviewed, reverting r276451.
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm (276521 => 276522)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm 2021-04-23 22:00:12 UTC (rev 276521)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPicker.mm 2021-04-23 22:04:56 UTC (rev 276522)
@@ -501,6 +501,10 @@
- (void)controlBeginEditing
{
+// Don't show the menu if the element is entirely offscreen.
+if (!CGRectIntersectsRect(_view.focusedElementInformation.interactionRect, _view.bounds))
+return;
+
[_view startRelinquishingFirstResponderToFocusedElement];
#if USE(UICONTEXTMENU)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276521] trunk
Title: [276521] trunk
Revision 276521
Author cathiec...@igalia.com
Date 2021-04-23 15:00:12 -0700 (Fri, 23 Apr 2021)
Log Message
Not computing image aspect ratios from width and height attributes for lazy loaded images
https://bugs.webkit.org/show_bug.cgi?id=224197
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
The test cases for error images and images without src in img-aspect-ratio.html are passed. This patch
doesn't change the behavior of the original aspect ratio case, so it's failed like before.
* web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt:
Source/WebCore:
This patch supports error images and lazy loaded images (without src attribute) to compute
implicit aspect ratios from width and height attributes. Refactor the code a bit. Added
intrinsicAspectRatioFromWidthHeight() to compute aspect ratio from width and height attributes when
the object is allowed to which is decided by canMapWidthHeightToAspectRatio().
Remove `!downcast(*this).cachedImage()` constraint, so that images without src attributes
is allowed. As to error images, compute the aspect ratio when the image shouldDisplayBrokenImageIcon().
* rendering/RenderImage.cpp:
(WebCore::RenderImage::canMapWidthHeightToAspectRatio const): To indicate that the object is allowed
to compute aspect ratio from width and height attributes.
(WebCore::RenderImage::computeIntrinsicRatioInformation const): When shouldDisplayBrokenImageIcon(),
try to compute the aspect ratio from attributes width and height.
* rendering/RenderImage.h:
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::intrinsicAspectRatioFromWidthHeight const): Compute the aspect ratio from attributes width and height.
(WebCore::RenderReplaced::computeIntrinsicRatioInformation const):
* rendering/RenderReplaced.h:
(WebCore::RenderReplaced::canMapWidthHeightToAspectRatio const): Ditto.
Modified Paths
trunk/LayoutTests/imported/w3c/ChangeLog
trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderImage.cpp
trunk/Source/WebCore/rendering/RenderImage.h
trunk/Source/WebCore/rendering/RenderReplaced.cpp
trunk/Source/WebCore/rendering/RenderReplaced.h
Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (276520 => 276521)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-04-23 21:53:48 UTC (rev 276520)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-04-23 22:00:12 UTC (rev 276521)
@@ -1,5 +1,17 @@
2021-04-23 Cathie Chen
+Not computing image aspect ratios from width and height attributes for lazy loaded images
+https://bugs.webkit.org/show_bug.cgi?id=224197
+
+Reviewed by Darin Adler.
+
+The test cases for error images and images without src in img-aspect-ratio.html are passed. This patch
+doesn't change the behavior of the original aspect ratio case, so it's failed like before.
+
+* web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt:
+
+2021-04-23 Cathie Chen
+
Import the update to "mapping attribute width and height to aspect ratio" tests from WPT
https://bugs.webkit.org/show_bug.cgi?id=224911
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt (276520 => 276521)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt 2021-04-23 21:53:48 UTC (rev 276520)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt 2021-04-23 22:00:12 UTC (rev 276521)
@@ -36,8 +36,8 @@
PASS Computed style test: input with {"type":"submit","width":"10%","height":"20"}
PASS Loaded images test: without width height attributes
PASS Loaded images test: with width and height attributes, but conflicting to the original aspect ratio
-FAIL Loaded images test: with width, height and empty src attributes assert_approx_equals: aspect-ratio should override intrinsic size of images that don't have any src. expected 0.8 +/- 0.001 but got Infinity
-FAIL Loaded images test: Error image with width and height attributes assert_approx_equals: aspect-ratio should affect the size of error images. expected 0.8 +/- 0.001 but got 1
+PASS Loaded images test: with width, height and empty src attributes
+PASS Loaded images test: Error image with width and height attributes
PASS Loaded images test: Error image with width, height and alt attributes
FAIL Loaded images test: with width and height attributes, but not equal to the original aspect ratio assert_approx_equals: The original aspect
[webkit-changes] [276520] trunk/LayoutTests
Title: [276520] trunk/LayoutTests Revision 276520 Author ryanhad...@apple.com Date 2021-04-23 14:53:48 -0700 (Fri, 23 Apr 2021) Log Message imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html is a flakey crash and failure https://bugs.webkit.org/show_bug.cgi?id=222750 Unreviewed test gardening. Move expectation to a more general location, this isn't limited to macOS. * TestExpectations: * platform/mac/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/TestExpectations trunk/LayoutTests/platform/mac/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (276519 => 276520) --- trunk/LayoutTests/ChangeLog 2021-04-23 21:38:37 UTC (rev 276519) +++ trunk/LayoutTests/ChangeLog 2021-04-23 21:53:48 UTC (rev 276520) @@ -1,5 +1,17 @@ 2021-04-23 Ryan Haddad +imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html is a flakey crash and failure +https://bugs.webkit.org/show_bug.cgi?id=222750 + +Unreviewed test gardening. + +Move expectation to a more general location, this isn't limited to macOS. + +* TestExpectations: +* platform/mac/TestExpectations: + +2021-04-23 Ryan Haddad + [macOS] imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html is a flakey crash and failure https://bugs.webkit.org/show_bug.cgi?id=222750 Modified: trunk/LayoutTests/TestExpectations (276519 => 276520) --- trunk/LayoutTests/TestExpectations 2021-04-23 21:38:37 UTC (rev 276519) +++ trunk/LayoutTests/TestExpectations 2021-04-23 21:53:48 UTC (rev 276520) @@ -625,9 +625,10 @@ imported/w3c/web-platform-tests/html/browsers/offline/application-cache-api/api_update_error.https.html [ DumpJSConsoleLogInStdErr ] imported/w3c/web-platform-tests/css/css-properties-values-api/url-resolution.html [ DumpJSConsoleLogInStdErr ] imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/invalid-content-type.tentative.html [ DumpJSConsoleLogInStdErr ] -imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html [ DumpJSConsoleLogInStdErr ] imported/w3c/web-platform-tests/subresource-integrity [ DumpJSConsoleLogInStdErr ] +webkit.org/b/222750 imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html [ Pass Failure Crash DumpJSConsoleLogInStdErr ] + [ Debug ] imported/w3c/web-platform-tests/service-workers/service-worker/clients-matchall-order.https.html [ Slow Pass Failure ] webkit.org/b/217617 [ Release ] imported/w3c/web-platform-tests/service-workers/service-worker/clients-matchall-order.https.html [ Pass Failure ] webkit.org/b/217617 imported/w3c/web-platform-tests/service-workers/service-worker/navigate-window.https.html [ Pass Failure ] Modified: trunk/LayoutTests/platform/mac/TestExpectations (276519 => 276520) --- trunk/LayoutTests/platform/mac/TestExpectations 2021-04-23 21:38:37 UTC (rev 276519) +++ trunk/LayoutTests/platform/mac/TestExpectations 2021-04-23 21:53:48 UTC (rev 276520) @@ -2273,8 +2273,6 @@ webkit.org/b/224033 imported/w3c/web-platform-tests/custom-elements/reactions/HTMLMediaElement.html [ Pass Crash ] -webkit.org/b/222750 imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html [ Pass Failure Crash DumpJSConsoleLogInStdErr ] - webkit.org/b/224123 media/modern-media-controls/macos-inline-media-controls/macos-inline-media-dropping-controls.html [ Pass Failure ] webkit.org/b/224212 [ arm64 ] compositing/background-color/no-composited-background-color-when-perspective.html [ Pass ImageOnlyFailure ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276519] trunk/Source/WebKit
Title: [276519] trunk/Source/WebKit Revision 276519 Author commit-qu...@webkit.org Date 2021-04-23 14:38:37 -0700 (Fri, 23 Apr 2021) Log Message Unreviewed, reverting r276451. https://bugs.webkit.org/show_bug.cgi?id=224999 Broke perf testing Reverted changeset: "[iOS] Update sandbox message filter syntax" https://bugs.webkit.org/show_bug.cgi?id=223384 https://trac.webkit.org/changeset/276451 Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb Diff Modified: trunk/Source/WebKit/ChangeLog (276518 => 276519) --- trunk/Source/WebKit/ChangeLog 2021-04-23 21:32:46 UTC (rev 276518) +++ trunk/Source/WebKit/ChangeLog 2021-04-23 21:38:37 UTC (rev 276519) @@ -1,3 +1,16 @@ +2021-04-23 Commit Queue + +Unreviewed, reverting r276451. +https://bugs.webkit.org/show_bug.cgi?id=224999 + +Broke perf testing + +Reverted changeset: + +"[iOS] Update sandbox message filter syntax" +https://bugs.webkit.org/show_bug.cgi?id=223384 +https://trac.webkit.org/changeset/276451 + 2021-04-23 Brent Fulgham [iOS] GPU Process sandbox lacks IOMobileFramebufferUserClient method filter Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (276518 => 276519) --- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2021-04-23 21:32:46 UTC (rev 276518) +++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2021-04-23 21:38:37 UTC (rev 276519) @@ -1461,8 +1461,8 @@ (when (defined? 'mach-bootstrap) (allow mach-bootstrap (apply-message-filter -(deny mach-message-send (with telemetry)) -(allow mach-message-send (message-number +(deny xpc-message-send (with telemetry)) +(allow xpc-message-send (message-number 206 207 711 ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276518] branches/safari-611-branch/Source/WebKit/UIProcess/ AuxiliaryProcessProxy.cpp
Title: [276518] branches/safari-611-branch/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
Revision 276518
Author repst...@apple.com
Date 2021-04-23 14:32:46 -0700 (Fri, 23 Apr 2021)
Log Message
Unreviewed build fix. rdar://problem/76963040
WebKit2/UIProcess/AuxiliaryProcessProxy.cpp:163:10: error: use of undeclared identifier 'isMainRunLoop'
Modified Paths
branches/safari-611-branch/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
Diff
Modified: branches/safari-611-branch/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp (276517 => 276518)
--- branches/safari-611-branch/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp 2021-04-23 21:29:59 UTC (rev 276517)
+++ branches/safari-611-branch/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp 2021-04-23 21:32:46 UTC (rev 276518)
@@ -159,8 +159,8 @@
bool AuxiliaryProcessProxy::sendMessage(std::unique_ptr encoder, OptionSet sendOptions, Optional, uint64_t>>&& asyncReplyInfo, ShouldStartProcessThrottlerActivity shouldStartProcessThrottlerActivity)
{
// FIXME: We should turn this into a RELEASE_ASSERT().
-ASSERT(isMainRunLoop());
-if (!isMainRunLoop()) {
+ASSERT(WTF::isMainRunLoop());
+if (!WTF::isMainRunLoop()) {
callOnMainRunLoop([protectedThis = makeRef(*this), encoder = WTFMove(encoder), sendOptions, asyncReplyInfo = WTFMove(asyncReplyInfo), shouldStartProcessThrottlerActivity]() mutable {
protectedThis->sendMessage(WTFMove(encoder), sendOptions, WTFMove(asyncReplyInfo), shouldStartProcessThrottlerActivity);
});
@@ -233,7 +233,7 @@
void AuxiliaryProcessProxy::didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier connectionIdentifier)
{
ASSERT(!m_connection);
-ASSERT(isMainRunLoop());
+ASSERT(WTF::isMainRunLoop());
if (!IPC::Connection::identifierIsValid(connectionIdentifier))
return;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276517] branches/safari-611-branch/Source
Title: [276517] branches/safari-611-branch/Source Revision 276517 Author rubent...@apple.com Date 2021-04-23 14:29:59 -0700 (Fri, 23 Apr 2021) Log Message Cherry-pick r276324. rdar://problem/77086404 FullGCActivityCallback should use the percentage of pages uncompressed in RAM to determine deferral. https://bugs.webkit.org/show_bug.cgi?id=224817 Reviewed by Filip Pizlo. Source/_javascript_Core: Right now we try to determine if too many pages are paged out by dereferencing them and bailing out of the GC if we go over a deadline. While this works if the only goal is to avoid causing extensive thrashing on spinny disks (HDD), it doesn't prevent thrashing when access to disk is fast (e.g. SSD). This is because on fast disks the proportional time to load the memory from disk is much lower. Additionally, on SSDs in particular we don't want to load the pages into RAM then bail as that will force a different page onto disk, increasing wear. This patch switches to asking the OS if each MarkedBlock is paged out. Then if we are over a threshold we wait until we would have GC'd anyway. This patch uses the (maxVMGrowthFactor - 1) as the percentage of "slow" pages (paged out or compressed) needed to defer the GC. The idea behind that threshold is that if we add that many pages then the same number of pages would be forced out of RAM for us to do a GC anyway (in the limit). * heap/BlockDirectory.cpp: (JSC::BlockDirectory::updatePercentageOfPagedOutPages): (JSC::BlockDirectory::isPagedOut): Deleted. * heap/BlockDirectory.h: * heap/FullGCActivityCallback.cpp: (JSC::FullGCActivityCallback::doCollection): * heap/Heap.cpp: (JSC::Heap::isPagedOut): * heap/Heap.h: * heap/MarkedSpace.cpp: (JSC::MarkedSpace::isPagedOut): * heap/MarkedSpace.h: * runtime/OptionsList.h: Source/WebKit: Add mincore to the acceptable syscall list. * WebProcess/com.apple.WebProcess.sb.in: Source/WTF: Add a noexcept flavor of FunctionTraits. On Linux mincore (and probably other syscalls) are marked noexcept so the existing overloads don't work. * wtf/FunctionTraits.h: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276324 268f45cc-cd09-0410-ab3c-d52691b4dbfc Modified Paths branches/safari-611-branch/Source/_javascript_Core/ChangeLog branches/safari-611-branch/Source/_javascript_Core/heap/BlockDirectory.cpp branches/safari-611-branch/Source/_javascript_Core/heap/BlockDirectory.h branches/safari-611-branch/Source/_javascript_Core/heap/FullGCActivityCallback.cpp branches/safari-611-branch/Source/_javascript_Core/heap/Heap.cpp branches/safari-611-branch/Source/_javascript_Core/heap/Heap.h branches/safari-611-branch/Source/_javascript_Core/heap/MarkedSpace.cpp branches/safari-611-branch/Source/_javascript_Core/heap/MarkedSpace.h branches/safari-611-branch/Source/_javascript_Core/runtime/OptionsList.h branches/safari-611-branch/Source/WTF/ChangeLog branches/safari-611-branch/Source/WTF/wtf/FunctionTraits.h branches/safari-611-branch/Source/WebKit/ChangeLog branches/safari-611-branch/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in Diff Modified: branches/safari-611-branch/Source/_javascript_Core/ChangeLog (276516 => 276517) --- branches/safari-611-branch/Source/_javascript_Core/ChangeLog 2021-04-23 21:01:01 UTC (rev 276516) +++ branches/safari-611-branch/Source/_javascript_Core/ChangeLog 2021-04-23 21:29:59 UTC (rev 276517) @@ -1,3 +1,100 @@ +2021-04-23 Russell Epstein + +Cherry-pick r276324. rdar://problem/77086404 + +FullGCActivityCallback should use the percentage of pages uncompressed in RAM to determine deferral. +https://bugs.webkit.org/show_bug.cgi?id=224817 + +Reviewed by Filip Pizlo. + +Source/_javascript_Core: + +Right now we try to determine if too many pages are paged out by +dereferencing them and bailing out of the GC if we go over a +deadline. While this works if the only goal is to avoid causing +extensive thrashing on spinny disks (HDD), it doesn't prevent +thrashing when access to disk is fast (e.g. SSD). This is because +on fast disks the proportional time to load the memory from disk +is much lower. Additionally, on SSDs in particular we don't want +to load the pages into RAM then bail as that will force a +different page onto disk, increasing wear. + +This patch switches to asking the OS if each MarkedBlock is paged +out. Then if we are over a threshold we wait until we would have +GC'd anyway. This patch uses the (maxVMGrowthFactor - 1) as the +percentage of "slow" pages (paged out or compressed) needed to +defer the GC. The idea behind that threshold is that if we add +that many pages then the same number of pages would be forced +out of RAM for us to do a GC anyway (in the limit). + +* heap/BlockDirectory.cpp: +
[webkit-changes] [276516] trunk/Source/JavaScriptCore
Title: [276516] trunk/Source/_javascript_Core
Revision 276516
Author hironori.fu...@sony.com
Date 2021-04-23 14:01:01 -0700 (Fri, 23 Apr 2021)
Log Message
[JSC][Win] callOperationNoExceptionCheck() also needs to support operations that return SlowPathReturnType
https://bugs.webkit.org/show_bug.cgi?id=224964
Reviewed by Yusuke Suzuki.
r229989 (Bug 183655) added the x64 Windows support only for
callOperation(), but for callOperationNoExceptionCheck().
callOperationNoExceptionCheck() also needs the x64 Windows
support.
This change is a preparation for Bug 224920 that is going to use
callOperationNoExceptionCheck instead of callOperation.
* jit/JIT.h:
(callOperation): Rewrote by using 'if constexpr' instead of SFINAE.
(callOperationNoExceptionCheck): Added a new implementation for
x64 Windows based on callOperation.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/JIT.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (276515 => 276516)
--- trunk/Source/_javascript_Core/ChangeLog 2021-04-23 20:11:39 UTC (rev 276515)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-04-23 21:01:01 UTC (rev 276516)
@@ -1,3 +1,23 @@
+2021-04-23 Fujii Hironori
+
+[JSC][Win] callOperationNoExceptionCheck() also needs to support operations that return SlowPathReturnType
+https://bugs.webkit.org/show_bug.cgi?id=224964
+
+Reviewed by Yusuke Suzuki.
+
+r229989 (Bug 183655) added the x64 Windows support only for
+callOperation(), but for callOperationNoExceptionCheck().
+callOperationNoExceptionCheck() also needs the x64 Windows
+support.
+
+This change is a preparation for Bug 224920 that is going to use
+callOperationNoExceptionCheck instead of callOperation.
+
+* jit/JIT.h:
+(callOperation): Rewrote by using 'if constexpr' instead of SFINAE.
+(callOperationNoExceptionCheck): Added a new implementation for
+x64 Windows based on callOperation.
+
2021-04-23 Commit Queue
Unreviewed, reverting r276486.
Modified: trunk/Source/_javascript_Core/jit/JIT.h (276515 => 276516)
--- trunk/Source/_javascript_Core/jit/JIT.h 2021-04-23 20:11:39 UTC (rev 276515)
+++ trunk/Source/_javascript_Core/jit/JIT.h 2021-04-23 21:01:01 UTC (rev 276516)
@@ -824,14 +824,6 @@
}
#if OS(WINDOWS) && CPU(X86_64)
-template
-std::enable_if_t::ResultType, SlowPathReturnType>::value, MacroAssembler::Call>
-callOperation(OperationType operation, Args... args)
-{
-setupArguments(args...);
-return appendCallWithExceptionCheckAndSlowPathReturnType(operation);
-}
-
template
struct is64BitType {
static constexpr bool value = sizeof(Type) <= 8;
@@ -843,12 +835,13 @@
};
template
-std::enable_if_t::ResultType, SlowPathReturnType>::value, MacroAssembler::Call>
-callOperation(OperationType operation, Args... args)
+MacroAssembler::Call callOperation(OperationType operation, Args... args)
{
-static_assert(is64BitType::ResultType>::value, "Win64 cannot use standard call when return type is larger than 64 bits.");
setupArguments(args...);
-return appendCallWithExceptionCheck(operation);
+// x64 Windows cannot use standard call when the return type is larger than 64 bits.
+if constexpr (is64BitType::ResultType>::value)
+return appendCallWithExceptionCheck(operation);
+return appendCallWithExceptionCheckAndSlowPathReturnType(operation);
}
#else // OS(WINDOWS) && CPU(X86_64)
template
@@ -876,13 +869,26 @@
return result;
}
+#if OS(WINDOWS) && CPU(X86_64)
template
MacroAssembler::Call callOperationNoExceptionCheck(OperationType operation, Args... args)
{
setupArguments(args...);
updateTopCallFrame();
+// x64 Windows cannot use standard call when the return type is larger than 64 bits.
+if constexpr (is64BitType::ResultType>::value)
+return appendCall(operation);
+return appendCallWithSlowPathReturnType(operation);
+}
+#else // OS(WINDOWS) && CPU(X86_64)
+template
+MacroAssembler::Call callOperationNoExceptionCheck(OperationType operation, Args... args)
+{
+setupArguments(args...);
+updateTopCallFrame();
return appendCall(operation);
}
+#endif // OS(WINDOWS) && CPU(X86_64)
template
MacroAssembler::Call callOperationWithCallFrameRollbackOnException(OperationType operation, Args... args)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276515] trunk/Source/WebKit
Title: [276515] trunk/Source/WebKit Revision 276515 Author bfulg...@apple.com Date 2021-04-23 13:11:39 -0700 (Fri, 23 Apr 2021) Log Message [iOS] GPU Process sandbox lacks IOMobileFramebufferUserClient method filter https://bugs.webkit.org/show_bug.cgi?id=224956 Reviewed by Per Arne Vollan. This patch updates the GPU process sandbox to match the method filter used in the WebContent process so that we will retain consistent protections when activating the GPU Process. These are the same rules governing access to this resource when the GPU process is disabled, so should not create a change in behavior. We also remove unneeded telemetry to reduce messaging burden and avoid performance issues. * Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb: * Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb Diff Modified: trunk/Source/WebKit/ChangeLog (276514 => 276515) --- trunk/Source/WebKit/ChangeLog 2021-04-23 19:53:26 UTC (rev 276514) +++ trunk/Source/WebKit/ChangeLog 2021-04-23 20:11:39 UTC (rev 276515) @@ -1,3 +1,20 @@ +2021-04-23 Brent Fulgham + +[iOS] GPU Process sandbox lacks IOMobileFramebufferUserClient method filter +https://bugs.webkit.org/show_bug.cgi?id=224956 + + +Reviewed by Per Arne Vollan. + +This patch updates the GPU process sandbox to match the method filter used in the WebContent process +so that we will retain consistent protections when activating the GPU Process. These are the same rules +governing access to this resource when the GPU process is disabled, so should not create a change in behavior. + +We also remove unneeded telemetry to reduce messaging burden and avoid performance issues. + +* Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb: +* Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb: + 2021-04-23 BJ Burg Web Inspector: [Cocoa] WKInspectorResourceURLSchemeHandler needs to serialize cleanup actions Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb (276514 => 276515) --- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb 2021-04-23 19:53:26 UTC (rev 276514) +++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb 2021-04-23 20:11:39 UTC (rev 276515) @@ -87,7 +87,17 @@ (define-once (framebuffer-access) (allow iokit-open - (iokit-user-client-class "IOMobileFramebufferUserClient")) + (iokit-user-client-class "IOMobileFramebufferUserClient") + (when (defined? 'iokit-external-method) + (apply-message-filter + (deny (with telemetry) + iokit-async-external-method + iokit-external-trap) + (allow + iokit-external-method) + ) + ) +) (mobile-preferences-read "com.apple.iokit.IOMobileGraphicsFamily")) (define-once (asset-access . options) Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (276514 => 276515) --- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2021-04-23 19:53:26 UTC (rev 276514) +++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb 2021-04-23 20:11:39 UTC (rev 276515) @@ -96,7 +96,7 @@ (deny (with telemetry) iokit-async-external-method iokit-external-trap) -(allow (with telemetry) (with message "IOMobileFramebufferUserClient") +(allow iokit-external-method) ) ) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276514] trunk/Source/WebKit
Title: [276514] trunk/Source/WebKit
Revision 276514
Author bb...@apple.com
Date 2021-04-23 12:53:26 -0700 (Fri, 23 Apr 2021)
Log Message
Web Inspector: [Cocoa] WKInspectorResourceURLSchemeHandler needs to serialize cleanup actions
https://bugs.webkit.org/show_bug.cgi?id=224986
Reviewed by Devin Rousso.
* UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm:
(-[WKInspectorResourceURLSchemeHandler webView:startURLSchemeTask:]):
Do cleanup on the main queue so that it can be serialized with reads.
(-[WKInspectorResourceURLSchemeHandler webView:stopURLSchemeTask:]):
Ensure that all removals from the map are processed before doing a lookup.
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm
Diff
Modified: trunk/Source/WebKit/ChangeLog (276513 => 276514)
--- trunk/Source/WebKit/ChangeLog 2021-04-23 19:51:44 UTC (rev 276513)
+++ trunk/Source/WebKit/ChangeLog 2021-04-23 19:53:26 UTC (rev 276514)
@@ -1,3 +1,18 @@
+2021-04-23 BJ Burg
+
+Web Inspector: [Cocoa] WKInspectorResourceURLSchemeHandler needs to serialize cleanup actions
+https://bugs.webkit.org/show_bug.cgi?id=224986
+
+
+Reviewed by Devin Rousso.
+
+* UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm:
+(-[WKInspectorResourceURLSchemeHandler webView:startURLSchemeTask:]):
+Do cleanup on the main queue so that it can be serialized with reads.
+
+(-[WKInspectorResourceURLSchemeHandler webView:stopURLSchemeTask:]):
+Ensure that all removals from the map are processed before doing a lookup.
+
2021-04-23 Darin Adler
Remove decoder memory allocations based on untrusted data (sizes) in the stream; related changes
Modified: trunk/Source/WebKit/UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm (276513 => 276514)
--- trunk/Source/WebKit/UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm 2021-04-23 19:51:44 UTC (rev 276513)
+++ trunk/Source/WebKit/UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm 2021-04-23 19:53:26 UTC (rev 276514)
@@ -88,7 +88,9 @@
}
NSBlockOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
-[_fileLoadOperations removeObjectForKey:urlSchemeTask];
+dispatch_async(dispatch_get_main_queue(), ^{
+[_fileLoadOperations removeObjectForKey:urlSchemeTask];
+});
NSURL *requestURL = urlSchemeTask.request.URL;
NSURL *fileURLForRequest = [_cachedBundle URLForResource:requestURL.relativePath withExtension:@""];
@@ -136,10 +138,13 @@
- (void)webView:(WKWebView *)webView stopURLSchemeTask:(id )urlSchemeTask
{
-if (NSOperation *operation = [_fileLoadOperations objectForKey:urlSchemeTask]) {
-[operation cancel];
-[_fileLoadOperations removeObjectForKey:urlSchemeTask];
-}
+// Ensure that all blocks with pending removals are dispatched before doing a map lookup.
+dispatch_async(dispatch_get_main_queue(), ^{
+if (NSOperation *operation = [_fileLoadOperations objectForKey:urlSchemeTask]) {
+[operation cancel];
+[_fileLoadOperations removeObjectForKey:urlSchemeTask];
+}
+});
}
@end
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276513] trunk/Source/WebCore
Title: [276513] trunk/Source/WebCore
Revision 276513
Author mcatanz...@igalia.com
Date 2021-04-23 12:51:44 -0700 (Fri, 23 Apr 2021)
Log Message
Remove virtual function calls in GraphicsLayer destructors
https://bugs.webkit.org/show_bug.cgi?id=180232
Reviewed by Adrian Perez de Castro.
I notice that ~CoordinatedGraphicsLayer makes a virtual function call to
GraphicsLayer::willBeDestroyed, which makes a virtual function call to
CoordinatedGraphicsLayer::removeFromParent. I think that the functions are being called as
intended, because ~CoordinatedGraphicsLayer has not yet been fully destroyed. However, I'm
reminded of Effective C++ item #9: Never call virtual functions during construction or
destruction ("because such calls will never go to a more derived class than that of the
currently executing constructor or destructor"). This code is almost certain to break if
anyone tries in the future to subclass any of the existing subclasses of GraphicsLayer, so
let's refactor it a bit. This doesn't fix anything, but my hope is that it will make the
code a bit harder to break, and not the opposite.
The main risk here is that some reordering of operations is necessary. The derived class
portion of removeFromParent must now be executed before willBeDestroyed. It can't happen
after, because parent would already be unset by that point. It's hard to be certain that
this won't break anything, but I think it should be fine.
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::willBeDestroyed):
(WebCore::GraphicsLayer::removeFromParentInternal):
(WebCore::GraphicsLayer::removeFromParent):
* platform/graphics/GraphicsLayer.h:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::~GraphicsLayerCA):
(WebCore::GraphicsLayerCA::willBeDestroyed): Deleted.
* platform/graphics/ca/GraphicsLayerCA.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::~CoordinatedGraphicsLayer):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp
trunk/Source/WebCore/platform/graphics/GraphicsLayer.h
trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (276512 => 276513)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 19:34:35 UTC (rev 276512)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 19:51:44 UTC (rev 276513)
@@ -1,3 +1,38 @@
+2021-04-23 Michael Catanzaro
+
+Remove virtual function calls in GraphicsLayer destructors
+https://bugs.webkit.org/show_bug.cgi?id=180232
+
+Reviewed by Adrian Perez de Castro.
+
+I notice that ~CoordinatedGraphicsLayer makes a virtual function call to
+GraphicsLayer::willBeDestroyed, which makes a virtual function call to
+CoordinatedGraphicsLayer::removeFromParent. I think that the functions are being called as
+intended, because ~CoordinatedGraphicsLayer has not yet been fully destroyed. However, I'm
+reminded of Effective C++ item #9: Never call virtual functions during construction or
+destruction ("because such calls will never go to a more derived class than that of the
+currently executing constructor or destructor"). This code is almost certain to break if
+anyone tries in the future to subclass any of the existing subclasses of GraphicsLayer, so
+let's refactor it a bit. This doesn't fix anything, but my hope is that it will make the
+code a bit harder to break, and not the opposite.
+
+The main risk here is that some reordering of operations is necessary. The derived class
+portion of removeFromParent must now be executed before willBeDestroyed. It can't happen
+after, because parent would already be unset by that point. It's hard to be certain that
+this won't break anything, but I think it should be fine.
+
+* platform/graphics/GraphicsLayer.cpp:
+(WebCore::GraphicsLayer::willBeDestroyed):
+(WebCore::GraphicsLayer::removeFromParentInternal):
+(WebCore::GraphicsLayer::removeFromParent):
+* platform/graphics/GraphicsLayer.h:
+* platform/graphics/ca/GraphicsLayerCA.cpp:
+(WebCore::GraphicsLayerCA::~GraphicsLayerCA):
+(WebCore::GraphicsLayerCA::willBeDestroyed): Deleted.
+* platform/graphics/ca/GraphicsLayerCA.h:
+* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+(WebCore::CoordinatedGraphicsLayer::~CoordinatedGraphicsLayer):
+
2021-04-23 Darin Adler
Remove decoder memory allocations based on untrusted data (sizes) in the stream; related changes
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (276512 => 276513)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2021-04-23
[webkit-changes] [276512] trunk/Tools
Title: [276512] trunk/Tools
Revision 276512
Author gsnedd...@apple.com
Date 2021-04-23 12:34:35 -0700 (Fri, 23 Apr 2021)
Log Message
Add a conftest.py to run existing webkitpy tests in pytest
https://bugs.webkit.org/show_bug.cgi?id=224687
Reviewed by Jonathan Bedard.
* Scripts/webkitpy/common/system/executive_unittest.py:
(ExecutiveTest.serial_test_run_in_parallel): Deal with the fact that pytest
running the tests might be not be the same version as the autoinstalled version,
and not API compatible.
* Scripts/webkitpy/conftest.py: Added.
(pytest_configure): Define the markers the plugins in conftest use
(pytest_addoption): Add --run-integration to allow them to be disabled by default.
(pytest_pycollect_makeitem): Rename serial/integration tests so pytest finds them.
(pytest_collection_modifyitems): Mark tests as skipped when needed per the above.
* Scripts/webkitpy/pytest.ini: Added.
* Scripts/webkitpy/test/main_unittest.py:
(TestStubs): Stop these from being picked up by pytest as tests.
* Scripts/webkitpy/test/markers.py: Fix this so pytest is technically optional,
even though it is always present because of the autoinstalled copy.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py
trunk/Tools/Scripts/webkitpy/test/main_unittest.py
trunk/Tools/Scripts/webkitpy/test/markers.py
Added Paths
trunk/Tools/Scripts/webkitpy/conftest.py
trunk/Tools/Scripts/webkitpy/pytest.ini
Diff
Modified: trunk/Tools/ChangeLog (276511 => 276512)
--- trunk/Tools/ChangeLog 2021-04-23 19:21:24 UTC (rev 276511)
+++ trunk/Tools/ChangeLog 2021-04-23 19:34:35 UTC (rev 276512)
@@ -1,3 +1,25 @@
+2021-04-23 Sam Sneddon
+
+Add a conftest.py to run existing webkitpy tests in pytest
+https://bugs.webkit.org/show_bug.cgi?id=224687
+
+Reviewed by Jonathan Bedard.
+
+* Scripts/webkitpy/common/system/executive_unittest.py:
+(ExecutiveTest.serial_test_run_in_parallel): Deal with the fact that pytest
+running the tests might be not be the same version as the autoinstalled version,
+and not API compatible.
+* Scripts/webkitpy/conftest.py: Added.
+(pytest_configure): Define the markers the plugins in conftest use
+(pytest_addoption): Add --run-integration to allow them to be disabled by default.
+(pytest_pycollect_makeitem): Rename serial/integration tests so pytest finds them.
+(pytest_collection_modifyitems): Mark tests as skipped when needed per the above.
+* Scripts/webkitpy/pytest.ini: Added.
+* Scripts/webkitpy/test/main_unittest.py:
+(TestStubs): Stop these from being picked up by pytest as tests.
+* Scripts/webkitpy/test/markers.py: Fix this so pytest is technically optional,
+even though it is always present because of the autoinstalled copy.
+
2021-04-23 Aakash Jain
Make report-non-inclusive-language ignore .db files
Modified: trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py (276511 => 276512)
--- trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py 2021-04-23 19:21:24 UTC (rev 276511)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py 2021-04-23 19:34:35 UTC (rev 276512)
@@ -250,9 +250,19 @@
cmd_line = [sys.executable, '-c', 'import time; time.sleep(%f); print("hello")' % DELAY_SECS]
cwd = os.getcwd()
commands = [tuple([cmd_line, cwd])] * NUM_PROCESSES
-start = time.time()
-command_outputs = Executive().run_in_parallel(commands, processes=NUM_PROCESSES)
-done = time.time()
+
+try:
+# we overwrite __main__ to be this to avoid any issues with
+# multiprocessing's spawning caused by multiple versions of pytest on
+# sys.path
+old_main = sys.modules["__main__"]
+sys.modules["__main__"] = sys.modules[__name__]
+start = time.time()
+command_outputs = Executive().run_in_parallel(commands, processes=NUM_PROCESSES)
+done = time.time()
+finally:
+sys.modules["__main__"] = old_main
+
self.assertTrue(done - start < NUM_PROCESSES * DELAY_SECS)
self.assertEqual([output[1] for output in command_outputs], [b'hello\n'] * NUM_PROCESSES)
self.assertEqual([], multiprocessing.active_children())
Added: trunk/Tools/Scripts/webkitpy/conftest.py (0 => 276512)
--- trunk/Tools/Scripts/webkitpy/conftest.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/conftest.py 2021-04-23 19:34:35 UTC (rev 276512)
@@ -0,0 +1,110 @@
+# Copyright (C) 2021 Apple 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:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2.
[webkit-changes] [276511] branches/safari-611-branch/Source/WebKit/UIProcess/Network/ NetworkProcessProxy.cpp
Title: [276511] branches/safari-611-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
Revision 276511
Author repst...@apple.com
Date 2021-04-23 12:21:24 -0700 (Fri, 23 Apr 2021)
Log Message
Unreviewed build fix.
WebKit2/UIProcess/Network/NetworkProcessProxy.cpp:127:17: error: use of undeclared identifier 'defaultProcess'
Modified Paths
branches/safari-611-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
Diff
Modified: branches/safari-611-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (276510 => 276511)
--- branches/safari-611-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-04-23 19:06:25 UTC (rev 276510)
+++ branches/safari-611-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-04-23 19:21:24 UTC (rev 276511)
@@ -124,8 +124,8 @@
void NetworkProcessProxy::didTerminate()
{
-if (this == defaultProcess().get())
-defaultProcess() = nullptr;
+if (this == defaultNetworkProcess().get())
+defaultNetworkProcess() = nullptr;
}
void NetworkProcessProxy::sendCreationParametersToNewProcess()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276510] trunk/Source
Title: [276510] trunk/Source Revision 276510 Author da...@apple.com Date 2021-04-23 12:06:25 -0700 (Fri, 23 Apr 2021) Log Message Remove decoder memory allocations based on untrusted data (sizes) in the stream; related changes https://bugs.webkit.org/show_bug.cgi?id=224984 Reviewed by Sam Weinig. Source/WebCore: * platform/network/cf/CertificateInfoCFNet.cpp: (WTF::Persistence::decodeCFData): Removed unneeded check for zero size. Removed code that locally allocates a vector before bufferIsLargeEnoughToContain is called. Instead use bufferPointerForDirectRead, which makes does the buffer size check, and pass the pointer directly to CFDataCreate. Source/WebKit: * Platform/IPC/ArgumentCoders.h: Remove the calls to HashMap::reserveInitialCapacity and HashSet::reserveInitialCapacity, based on number read in from the decoder. This means there will be more wasted memory in these HashMap and HashSet objects, so we have to test to make sure this does not create a performance problem. But without this check, we are trying to allocate memory based on an unstrusted size. * Shared/Cocoa/WebCoreArgumentCodersCocoa.mm: (IPC::ArgumentCoder>::encode): Removed the coder for a Vector of these RefPtr, replaced it with a coder for an individual one, allowing the Vector ArgumentCoder template to handle vector size and construction. One benefit is that this adds in a shrinkToFit and prevents us from making any separate mistake about pre-sizing the Vector here since we use shared code. (IPC::ArgumentCoder>::decode): Ditto. * Shared/WebCoreArgumentCoders.cpp: (IPC::ArgumentCoder>::encode): Ditto. (IPC::ArgumentCoder>::decode): Ditto. (IPC::ArgumentCoder::encode): (IPC::ArgumentCoder::decode): Removed unnecessary specialization for the KeyStatusVector. There is already an ArgumentCoder for Vector, for std::pair, for Ref, and for enumerations like CDMKeyStatus, so there's no need to have a specialized coder for this. This function that we are removing had a call to reserveInitialCapacity, but the Vector ArgumentCoder template does not. * Shared/WebCoreArgumentCoders.h: Replaced the ArgumentCoder>> specialization with ArgumentCoder>. Removed the ArgumentCoder specialization. Source/WTF: * wtf/persistence/PersistentDecoder.cpp: (WTF::Persistence::Decoder::bufferPointerForDirectRead): Added. (WTF::Persistence::Decoder::decodeFixedLengthData): Refactor to use bufferPointerForDirectRead. * wtf/persistence/PersistentDecoder.h: Added bufferPointerForDirectRead function for use in the rare cases where we want to read directly out of the decoder buffer, rather than writing to a passed-in pointer. Also did a small refactoring of bufferIsLargeEnoughToContain to use && rather than an if statement. Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/persistence/PersistentDecoder.cpp trunk/Source/WTF/wtf/persistence/PersistentDecoder.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/network/cf/CertificateInfoCFNet.cpp trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Platform/IPC/ArgumentCoders.h trunk/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp trunk/Source/WebKit/Shared/WebCoreArgumentCoders.h Diff Modified: trunk/Source/WTF/ChangeLog (276509 => 276510) --- trunk/Source/WTF/ChangeLog 2021-04-23 18:57:30 UTC (rev 276509) +++ trunk/Source/WTF/ChangeLog 2021-04-23 19:06:25 UTC (rev 276510) @@ -1,3 +1,19 @@ +2021-04-23 Darin Adler + +Remove decoder memory allocations based on untrusted data (sizes) in the stream; related changes +https://bugs.webkit.org/show_bug.cgi?id=224984 + +Reviewed by Sam Weinig. + +* wtf/persistence/PersistentDecoder.cpp: +(WTF::Persistence::Decoder::bufferPointerForDirectRead): Added. +(WTF::Persistence::Decoder::decodeFixedLengthData): Refactor to use bufferPointerForDirectRead. + +* wtf/persistence/PersistentDecoder.h: Added bufferPointerForDirectRead function for use in the +rare cases where we want to read directly out of the decoder buffer, rather than writing to a +passed-in pointer. Also did a small refactoring of bufferIsLargeEnoughToContain to use && +rather than an if statement. + 2021-04-23 Chris Dumez Disable GPUProcess on shipping iOS Modified: trunk/Source/WTF/wtf/persistence/PersistentDecoder.cpp (276509 => 276510) --- trunk/Source/WTF/wtf/persistence/PersistentDecoder.cpp 2021-04-23 18:57:30 UTC (rev 276509) +++ trunk/Source/WTF/wtf/persistence/PersistentDecoder.cpp 2021-04-23 19:06:25 UTC (rev 276510) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010, 2011, 2014 Apple Inc. All rights reserved. + * Copyright (C) 2010-2021 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,15 +47,24 @@ return size <= static_cast(m_bufferEnd - m_bufferPosition); } -bool
[webkit-changes] [276509] trunk/Source/WebKit
Title: [276509] trunk/Source/WebKit
Revision 276509
Author katherine_che...@apple.com
Date 2021-04-23 11:57:30 -0700 (Fri, 23 Apr 2021)
Log Message
Set proper network logging level for full web browsers
https://bugs.webkit.org/show_bug.cgi?id=224982
Reviewed by Brent Fulgham.
Full web browsers have different low-level network logging requirements
for ephemeral sessions.
No new tests. There's no automated way to test if network level logs
show up. I tested that logging is correct for web browser and non web
browser apps manually.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::configurationForSessionID):
(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
Diff
Modified: trunk/Source/WebKit/ChangeLog (276508 => 276509)
--- trunk/Source/WebKit/ChangeLog 2021-04-23 18:54:20 UTC (rev 276508)
+++ trunk/Source/WebKit/ChangeLog 2021-04-23 18:57:30 UTC (rev 276509)
@@ -1,3 +1,22 @@
+2021-04-23 Kate Cheney
+
+Set proper network logging level for full web browsers
+https://bugs.webkit.org/show_bug.cgi?id=224982
+
+
+Reviewed by Brent Fulgham.
+
+Full web browsers have different low-level network logging requirements
+for ephemeral sessions.
+
+No new tests. There's no automated way to test if network level logs
+show up. I tested that logging is correct for web browser and non web
+browser apps manually.
+
+* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+(WebKit::configurationForSessionID):
+(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+
2021-04-23 Chris Dumez
Disable GPUProcess on shipping iOS
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (276508 => 276509)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-04-23 18:54:20 UTC (rev 276508)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-04-23 18:57:30 UTC (rev 276509)
@@ -1028,7 +1028,7 @@
static bool sessionsCreated = false;
#endif
-static NSURLSessionConfiguration *configurationForSessionID(const PAL::SessionID& session)
+static NSURLSessionConfiguration *configurationForSessionID(const PAL::SessionID& session, bool isFullWebBrowser)
{
#if HAVE(LOGGING_PRIVACY_LEVEL)
auto loggingPrivacyLevel = nw_context_privacy_level_sensitive;
@@ -1038,7 +1038,8 @@
if (session.isEphemeral()) {
configuration = [NSURLSessionConfiguration ephemeralSessionConfiguration];
#if HAVE(LOGGING_PRIVACY_LEVEL) && defined(NW_CONTEXT_HAS_PRIVACY_LEVEL_SILENT)
-loggingPrivacyLevel = nw_context_privacy_level_silent;
+if (isFullWebBrowser)
+loggingPrivacyLevel = nw_context_privacy_level_silent;
#endif
} else
configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
@@ -1183,7 +1184,7 @@
sessionsCreated = true;
#endif
-NSURLSessionConfiguration *configuration = configurationForSessionID(m_sessionID);
+NSURLSessionConfiguration *configuration = configurationForSessionID(m_sessionID, isParentProcessAFullWebBrowser(networkProcess));
#if HAVE(HSTS_STORAGE)
if (!!parameters.hstsStorageDirectory && !m_sessionID.isEphemeral()) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276508] trunk/LayoutTests
Title: [276508] trunk/LayoutTests Revision 276508 Author ryanhad...@apple.com Date 2021-04-23 11:54:20 -0700 (Fri, 23 Apr 2021) Log Message [macOS] imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html is a flakey crash and failure https://bugs.webkit.org/show_bug.cgi?id=222750 Unreviewed test gardening. * platform/mac/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (276507 => 276508) --- trunk/LayoutTests/ChangeLog 2021-04-23 18:15:55 UTC (rev 276507) +++ trunk/LayoutTests/ChangeLog 2021-04-23 18:54:20 UTC (rev 276508) @@ -1,3 +1,12 @@ +2021-04-23 Ryan Haddad + +[macOS] imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html is a flakey crash and failure +https://bugs.webkit.org/show_bug.cgi?id=222750 + +Unreviewed test gardening. + +* platform/mac/TestExpectations: + 2021-04-23 Philippe Normand Unreviewed, GTK gardening Modified: trunk/LayoutTests/platform/mac/TestExpectations (276507 => 276508) --- trunk/LayoutTests/platform/mac/TestExpectations 2021-04-23 18:15:55 UTC (rev 276507) +++ trunk/LayoutTests/platform/mac/TestExpectations 2021-04-23 18:54:20 UTC (rev 276508) @@ -2273,7 +2273,7 @@ webkit.org/b/224033 imported/w3c/web-platform-tests/custom-elements/reactions/HTMLMediaElement.html [ Pass Crash ] -webkit.org/b/222750 [ Debug ] imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html [ Pass Failure Crash ] +webkit.org/b/222750 imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test.html [ Pass Failure Crash DumpJSConsoleLogInStdErr ] webkit.org/b/224123 media/modern-media-controls/macos-inline-media-controls/macos-inline-media-dropping-controls.html [ Pass Failure ] @@ -2290,4 +2290,4 @@ # Buttons are not focusable on Mac so this test doesn't work as expected. webkit.org/b/22261 imported/w3c/web-platform-tests/css/selectors/focus-visible-005.html [ Skip ] -webkit.org/b/224842 [ BigSur Debug ] http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin.html [ Pass Timeout ] \ No newline at end of file +webkit.org/b/224842 [ BigSur Debug ] http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin.html [ Pass Timeout ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276507] trunk/Source/ThirdParty/ANGLE
Title: [276507] trunk/Source/ThirdParty/ANGLE
Revision 276507
Author tsav...@apple.com
Date 2021-04-23 11:15:55 -0700 (Fri, 23 Apr 2021)
Log Message
Unreviewed, reverting r276190.
broke a test internally.
Reverted changeset:
"Metal-ANGLE: Shared memory texture tests failing in iOS
Simulator"
https://bugs.webkit.org/show_bug.cgi?id=222685
https://commits.webkit.org/r276190
Modified Paths
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/TextureMtl.mm
trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_utils.mm
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (276506 => 276507)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-04-23 17:44:03 UTC (rev 276506)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-04-23 18:15:55 UTC (rev 276507)
@@ -1,3 +1,16 @@
+2021-04-23 Truitt Savell
+
+Unreviewed, reverting r276190.
+
+broke a test internally.
+
+Reverted changeset:
+
+"Metal-ANGLE: Shared memory texture tests failing in iOS
+Simulator"
+https://bugs.webkit.org/show_bug.cgi?id=222685
+https://commits.webkit.org/r276190
+
2021-04-22 Lauro Moura
[CMake][ANGLE] Silence -Wreturn-type for gcc and clang
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/TextureMtl.mm (276506 => 276507)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/TextureMtl.mm 2021-04-23 17:44:03 UTC (rev 276506)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/TextureMtl.mm 2021-04-23 18:15:55 UTC (rev 276507)
@@ -174,31 +174,6 @@
*dst = gl::floatToNormalized<24, uint32_t>(static_cast(src->depth));
}
-
-#if TARGET_OS_SIMULATOR
-void CopyTextureData(const MTLSize ,
- size_t srcRowPitch,
- size_t src2DImageSize,
- const uint8_t *psrc,
- size_t destRowPitch,
- size_t dest2DImageSize,
- uint8_t *pdst)
-{
-{
-size_t rowCopySize = std::min(srcRowPitch, destRowPitch);
-for (NSUInteger d = 0; d < regionSize.depth; ++d)
-{
-for (NSUInteger r = 0; r < regionSize.height; ++r)
-{
-const uint8_t *pCopySrc = psrc + d * src2DImageSize + r * srcRowPitch;
-uint8_t *pCopyDst = pdst + d * dest2DImageSize + r * destRowPitch;
-memcpy(pCopyDst, pCopySrc, rowCopySize);
-}
-}
-}
-}
-#endif
-
void ConvertDepthStencilData(const MTLSize ,
const angle::Format ,
size_t srcRowPitch,
@@ -291,39 +266,6 @@
return angle::Result::Continue;
}
-#if TARGET_OS_SIMULATOR
-angle::Result CopyTextureContentsToStagingBuffer(
-ContextMtl *contextMtl,
-const angle::Format ,
-const MTLSize ,
-const uint8_t *data,
-size_t bytesPerRow,
-size_t bytesPer2DImage,
-size_t *bufferRowPitchOut,
-size_t *buffer2DImageSizeOut,
-mtl::BufferRef *bufferOut)
-{
-size_t stagingBufferRowPitch= regionSize.width * textureAngleFormat.pixelBytes;
-size_t stagingBuffer2DImageSize = stagingBufferRowPitch * regionSize.height;
-size_t stagingBufferSize= stagingBuffer2DImageSize * regionSize.depth;
-mtl::BufferRef stagingBuffer;
-ANGLE_TRY(mtl::Buffer::MakeBuffer(contextMtl, stagingBufferSize, nullptr, ));
-
-uint8_t *pdst = stagingBuffer->map(contextMtl);
-
-CopyTextureData(regionSize, bytesPerRow, bytesPer2DImage,
-data, stagingBufferRowPitch, stagingBuffer2DImageSize, pdst);
-
-stagingBuffer->unmap(contextMtl);
-
-*bufferOut= stagingBuffer;
-*bufferRowPitchOut= stagingBufferRowPitch;
-*buffer2DImageSizeOut = stagingBuffer2DImageSize;
-
-return angle::Result::Continue;
-}
-#endif
-
angle::Result UploadDepthStencilTextureContentsWithStagingBuffer(
ContextMtl *contextMtl,
const angle::Format ,
@@ -436,41 +378,6 @@
return angle::Result::Continue;
}
-#if TARGET_OS_SIMULATOR
-angle::Result UploadTextureContentsWithStagingBuffer(
-ContextMtl *contextMtl,
-const angle::Format ,
-MTLRegion region,
-const mtl::MipmapNativeLevel ,
-uint32_t slice,
-const uint8_t *data,
-size_t bytesPerRow,
-size_t bytesPer2DImage,
-const mtl::TextureRef )
-{
-ASSERT(texture && texture->valid());
-
-angle::FormatID stagingBufferFormatID = textureAngleFormat.id;
-const angle::Format = angle::Format::Get(stagingBufferFormatID);
-
-
-size_t stagingBufferRowPitch;
-size_t stagingBuffer2DImageSize;
-mtl::BufferRef stagingBuffer;
-
-// Copy depth data to staging depth buffer
-ANGLE_TRY(CopyTextureContentsToStagingBuffer(contextMtl, angleStagingFormat, region.size, data, bytesPerRow, bytesPer2DImage, , , ));
-mtl::BlitCommandEncoder *encoder =
[webkit-changes] [276506] trunk/Source
Title: [276506] trunk/Source
Revision 276506
Author cdu...@apple.com
Date 2021-04-23 10:44:03 -0700 (Fri, 23 Apr 2021)
Log Message
Disable GPUProcess on shipping iOS
https://bugs.webkit.org/show_bug.cgi?id=224897
Reviewed by Eric Carlson.
Source/WebKit:
* Shared/WebPreferencesDefaultValues.cpp:
(WebKit::defaultUseGPUProcessForCanvasRenderingEnabled):
(WebKit::defaultUseGPUProcessForDOMRenderingEnabled):
(WebKit::defaultUseGPUProcessForMediaEnabled):
(WebKit::defaultUseGPUProcessForWebGLEnabled):
(WebKit::defaultCaptureAudioInGPUProcessEnabled):
(WebKit::defaultCaptureVideoInGPUProcessEnabled):
(WebKit::defaultWebRTCCodecsInGPUProcess):
Source/WTF:
* wtf/PlatformEnableCocoa.h:
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/PlatformEnableCocoa.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (276505 => 276506)
--- trunk/Source/WTF/ChangeLog 2021-04-23 17:31:54 UTC (rev 276505)
+++ trunk/Source/WTF/ChangeLog 2021-04-23 17:44:03 UTC (rev 276506)
@@ -1,3 +1,12 @@
+2021-04-23 Chris Dumez
+
+Disable GPUProcess on shipping iOS
+https://bugs.webkit.org/show_bug.cgi?id=224897
+
+Reviewed by Eric Carlson.
+
+* wtf/PlatformEnableCocoa.h:
+
2021-04-22 Lauro Moura
[WTF] Undefined behavior warning in StringBuilder::allocateBuffer
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (276505 => 276506)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-04-23 17:31:54 UTC (rev 276505)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-04-23 17:44:03 UTC (rev 276506)
@@ -224,6 +224,15 @@
#define ENABLE_GPU_PROCESS 1
#endif
+#if !defined(ENABLE_GPU_PROCESS_BY_DEFAULT)
+#if PLATFORM(MAC) \
+|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 15) \
+|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 8) \
+|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 15)
+#define ENABLE_GPU_PROCESS_BY_DEFAULT 1
+#endif
+#endif
+
#if !defined(ENABLE_GPU_DRIVER_PREWARMING) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600
#define ENABLE_GPU_DRIVER_PREWARMING 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (276505 => 276506)
--- trunk/Source/WebKit/ChangeLog 2021-04-23 17:31:54 UTC (rev 276505)
+++ trunk/Source/WebKit/ChangeLog 2021-04-23 17:44:03 UTC (rev 276506)
@@ -1,3 +1,19 @@
+2021-04-23 Chris Dumez
+
+Disable GPUProcess on shipping iOS
+https://bugs.webkit.org/show_bug.cgi?id=224897
+
+Reviewed by Eric Carlson.
+
+* Shared/WebPreferencesDefaultValues.cpp:
+(WebKit::defaultUseGPUProcessForCanvasRenderingEnabled):
+(WebKit::defaultUseGPUProcessForDOMRenderingEnabled):
+(WebKit::defaultUseGPUProcessForMediaEnabled):
+(WebKit::defaultUseGPUProcessForWebGLEnabled):
+(WebKit::defaultCaptureAudioInGPUProcessEnabled):
+(WebKit::defaultCaptureVideoInGPUProcessEnabled):
+(WebKit::defaultWebRTCCodecsInGPUProcess):
+
2021-04-23 Youenn Fablet
Fix KVO for camera/microphone capture state WKWebView API
Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (276505 => 276506)
--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2021-04-23 17:31:54 UTC (rev 276505)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2021-04-23 17:44:03 UTC (rev 276506)
@@ -145,7 +145,7 @@
bool defaultUseGPUProcessForCanvasRenderingEnabled()
{
-#if HAVE(SYSTEM_FEATURE_FLAGS)
+#if HAVE(SYSTEM_FEATURE_FLAGS) && ENABLE(GPU_PROCESS_BY_DEFAULT)
return isFeatureFlagEnabled("gpu_process_canvas_rendering");
#endif
@@ -154,7 +154,7 @@
bool defaultUseGPUProcessForDOMRenderingEnabled()
{
-#if HAVE(SYSTEM_FEATURE_FLAGS)
+#if HAVE(SYSTEM_FEATURE_FLAGS) && ENABLE(GPU_PROCESS_BY_DEFAULT)
return isFeatureFlagEnabled("gpu_process_dom_rendering");
#endif
@@ -163,7 +163,7 @@
bool defaultUseGPUProcessForMediaEnabled()
{
-#if HAVE(SYSTEM_FEATURE_FLAGS)
+#if HAVE(SYSTEM_FEATURE_FLAGS) && ENABLE(GPU_PROCESS_BY_DEFAULT)
return isFeatureFlagEnabled("gpu_process_media");
#endif
@@ -185,7 +185,7 @@
bool defaultCaptureAudioInGPUProcessEnabled()
{
-#if HAVE(SYSTEM_FEATURE_FLAGS)
+#if HAVE(SYSTEM_FEATURE_FLAGS) && ENABLE(GPU_PROCESS_BY_DEFAULT)
#if PLATFORM(MAC)
return isFeatureFlagEnabled("gpu_process_webrtc");
#elif PLATFORM(IOS_FAMILY)
@@ -206,7 +206,7 @@
bool defaultCaptureVideoInGPUProcessEnabled()
{
-#if HAVE(SYSTEM_FEATURE_FLAGS)
+#if HAVE(SYSTEM_FEATURE_FLAGS) && ENABLE(GPU_PROCESS_BY_DEFAULT)
return isFeatureFlagEnabled("gpu_process_webrtc");
#else
return false;
@@ -219,7 +219,7 @@
bool defaultWebRTCCodecsInGPUProcess()
{
-#if HAVE(SYSTEM_FEATURE_FLAGS)
+#if HAVE(SYSTEM_FEATURE_FLAGS) && ENABLE(GPU_PROCESS_BY_DEFAULT)
return isFeatureFlagEnabled("gpu_process_webrtc");
#else
return false;
[webkit-changes] [276505] trunk/Tools
Title: [276505] trunk/Tools
Revision 276505
Author aakash_j...@apple.com
Date 2021-04-23 10:31:54 -0700 (Fri, 23 Apr 2021)
Log Message
Make report-non-inclusive-language ignore .db files
https://bugs.webkit.org/show_bug.cgi?id=224979
Reviewed by Darin Adler.
* Scripts/report-non-inclusive-language:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/report-non-inclusive-language
Diff
Modified: trunk/Tools/ChangeLog (276504 => 276505)
--- trunk/Tools/ChangeLog 2021-04-23 17:21:25 UTC (rev 276504)
+++ trunk/Tools/ChangeLog 2021-04-23 17:31:54 UTC (rev 276505)
@@ -1,3 +1,12 @@
+2021-04-23 Aakash Jain
+
+Make report-non-inclusive-language ignore .db files
+https://bugs.webkit.org/show_bug.cgi?id=224979
+
+Reviewed by Darin Adler.
+
+* Scripts/report-non-inclusive-language:
+
2021-04-23 Youenn Fablet
Fix KVO for camera/microphone capture state WKWebView API
Modified: trunk/Tools/Scripts/report-non-inclusive-language (276504 => 276505)
--- trunk/Tools/Scripts/report-non-inclusive-language 2021-04-23 17:21:25 UTC (rev 276504)
+++ trunk/Tools/Scripts/report-non-inclusive-language 2021-04-23 17:31:54 UTC (rev 276505)
@@ -43,7 +43,7 @@
IGNORE_DIRECTORIES = ['.svn', '.git', 'autoinstalled']
IGNORE_FILES_STARTING_WITH = ('ChangeLog')
-IGNORE_FILES_ENDING_WITH = ('.log', '.order', '.pyc', '.swp', '.xcuserstate')
+IGNORE_FILES_ENDING_WITH = ('.log', '.order', '.pyc', '.swp', '.xcuserstate', '.db', '.db-shm', '.db-wal')
IGNORE_FILE_NAMES = ['report-non-inclusive-language']
parser = argparse.ArgumentParser(description='Report counts and locations of non-inclusive terms.')
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276504] trunk
Title: [276504] trunk
Revision 276504
Author you...@apple.com
Date 2021-04-23 10:21:25 -0700 (Fri, 23 Apr 2021)
Log Message
Fix KVO for camera/microphone capture state WKWebView API
https://bugs.webkit.org/show_bug.cgi?id=224922
Reviewed by Eric Carlson.
Source/WebKit:
Add missing willChange observer call and migrate keys to API keys.
Covered by API test.
* UIProcess/Cocoa/PageClientImplCocoa.h:
* UIProcess/Cocoa/PageClientImplCocoa.mm:
(WebKit::PageClientImplCocoa::microphoneCaptureWillChange):
(WebKit::PageClientImplCocoa::cameraCaptureWillChange):
(WebKit::PageClientImplCocoa::microphoneCaptureChanged):
(WebKit::PageClientImplCocoa::cameraCaptureChanged):
* UIProcess/PageClient.h:
(WebKit::PageClient::microphoneCaptureWillChange):
(WebKit::PageClient::cameraCaptureWillChange):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::updateReportedMediaCaptureState):
Tools:
Add tests for capture state API.
* TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:
(-[MediaCaptureObserver observeValueForKeyPath:ofObject:change:context:]):
(TestWebKitAPI::waitUntilCameraState):
(TestWebKitAPI::waitUntilMicrophoneState):
(TestWebKitAPI::TEST):
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h
trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm
trunk/Source/WebKit/UIProcess/PageClient.h
trunk/Source/WebKit/UIProcess/WebPageProxy.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm
Diff
Modified: trunk/Source/WebKit/ChangeLog (276503 => 276504)
--- trunk/Source/WebKit/ChangeLog 2021-04-23 17:04:53 UTC (rev 276503)
+++ trunk/Source/WebKit/ChangeLog 2021-04-23 17:21:25 UTC (rev 276504)
@@ -1,3 +1,26 @@
+2021-04-23 Youenn Fablet
+
+Fix KVO for camera/microphone capture state WKWebView API
+https://bugs.webkit.org/show_bug.cgi?id=224922
+
+
+Reviewed by Eric Carlson.
+
+Add missing willChange observer call and migrate keys to API keys.
+Covered by API test.
+
+* UIProcess/Cocoa/PageClientImplCocoa.h:
+* UIProcess/Cocoa/PageClientImplCocoa.mm:
+(WebKit::PageClientImplCocoa::microphoneCaptureWillChange):
+(WebKit::PageClientImplCocoa::cameraCaptureWillChange):
+(WebKit::PageClientImplCocoa::microphoneCaptureChanged):
+(WebKit::PageClientImplCocoa::cameraCaptureChanged):
+* UIProcess/PageClient.h:
+(WebKit::PageClient::microphoneCaptureWillChange):
+(WebKit::PageClient::cameraCaptureWillChange):
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::updateReportedMediaCaptureState):
+
2021-04-23 Chris Dumez
Improve our constructDeletedValue() template specializations
Modified: trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h (276503 => 276504)
--- trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h 2021-04-23 17:04:53 UTC (rev 276503)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h 2021-04-23 17:21:25 UTC (rev 276504)
@@ -77,6 +77,8 @@
void storeAppHighlight(const WebCore::AppHighlight&) final;
#endif
+void microphoneCaptureWillChange() final;
+void cameraCaptureWillChange() final;
void microphoneCaptureChanged() final;
void cameraCaptureChanged() final;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm (276503 => 276504)
--- trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm 2021-04-23 17:04:53 UTC (rev 276503)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm 2021-04-23 17:21:25 UTC (rev 276504)
@@ -147,14 +147,24 @@
return m_alternativeTextUIController->alternativesForContext(dictationContext);
}
+void PageClientImplCocoa::microphoneCaptureWillChange()
+{
+[m_webView willChangeValueForKey:@"microphoneCaptureState"];
+}
+
+void PageClientImplCocoa::cameraCaptureWillChange()
+{
+[m_webView willChangeValueForKey:@"cameraCaptureState"];
+}
+
void PageClientImplCocoa::microphoneCaptureChanged()
{
-[m_webView didChangeValueForKey:@"_microphoneCaptureState"];
+[m_webView didChangeValueForKey:@"microphoneCaptureState"];
}
void PageClientImplCocoa::cameraCaptureChanged()
{
-[m_webView didChangeValueForKey:@"_cameraCaptureState"];
+[m_webView didChangeValueForKey:@"cameraCaptureState"];
}
}
Modified: trunk/Source/WebKit/UIProcess/PageClient.h (276503 => 276504)
--- trunk/Source/WebKit/UIProcess/PageClient.h 2021-04-23 17:04:53 UTC (rev 276503)
+++ trunk/Source/WebKit/UIProcess/PageClient.h 2021-04-23 17:21:25 UTC (rev 276504)
@@ -542,6 +542,8 @@
virtual void didHandleAcceptedCandidate() = 0;
#endif
+virtual void microphoneCaptureWillChange() { }
+virtual void cameraCaptureWillChange() { }
virtual void microphoneCaptureChanged() { }
virtual void cameraCaptureChanged() { }
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (276503 => 276504)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp
[webkit-changes] [276503] branches/safari-611-branch/Source/WebCore/layout/inlineformatting /InlineContentBreaker.cpp
Title: [276503] branches/safari-611-branch/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp
Revision 276503
Author repst...@apple.com
Date 2021-04-23 10:04:53 -0700 (Fri, 23 Apr 2021)
Log Message
Apply patch. rdar://problem/76963029
Modified Paths
branches/safari-611-branch/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp
Diff
Modified: branches/safari-611-branch/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp (276502 => 276503)
--- branches/safari-611-branch/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp 2021-04-23 16:55:47 UTC (rev 276502)
+++ branches/safari-611-branch/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp 2021-04-23 17:04:53 UTC (rev 276503)
@@ -87,10 +87,11 @@
return { };
}
-static inline bool isWrappingAllowed(const RenderStyle& style)
+static inline bool isWrappingAllowed(const InlineItem& inlineItem)
{
// Do not try to wrap overflown 'pre' and 'no-wrap' content to next line.
-return style.whiteSpace() != WhiteSpace::Pre && style.whiteSpace() != WhiteSpace::NoWrap;
+auto& styleToUse = inlineItem.isBox() ? inlineItem.layoutBox().parent().style() : inlineItem.layoutBox().style();
+return styleToUse.whiteSpace() != WhiteSpace::Pre && styleToUse.whiteSpace() != WhiteSpace::NoWrap;
}
static inline Optional lastWrapOpportunityIndex(const InlineContentBreaker::ContinuousContent::RunList& runList)
@@ -102,7 +103,7 @@
// Return #0 as the index where the second continuous content can wrap at.
ASSERT(!runList.isEmpty());
auto lastItemIndex = runList.size() - 1;
-return isWrappingAllowed(runList[lastItemIndex].inlineItem.style()) ? makeOptional(lastItemIndex) : WTF::nullopt;
+return isWrappingAllowed(runList[lastItemIndex].inlineItem) ? makeOptional(lastItemIndex) : WTF::nullopt;
}
bool InlineContentBreaker::shouldKeepEndOfLineWhitespace(const ContinuousContent& continuousContent) const
@@ -226,20 +227,20 @@
// e.g. some text.
// While the inline-block has pre-wrap which allows wrapping, the content lives in a nowrap context.
if (lastInlineItem.isBox() || lastInlineItem.isInlineBoxStart() || lastInlineItem.isInlineBoxEnd())
-return isWrappingAllowed(lastInlineItem.layoutBox().parent().style());
+return isWrappingAllowed(lastInlineItem);
if (lastInlineItem.isText()) {
if (runs.size() == 1) {
// Fast path for the most common case of an individual text item.
-return isWrappingAllowed(lastInlineItem.layoutBox().style());
+return isWrappingAllowed(lastInlineItem);
}
for (auto& run : WTF::makeReversedRange(runs)) {
auto& inlineItem = run.inlineItem;
if (inlineItem.isInlineBoxStart() || inlineItem.isInlineBoxStart())
-return isWrappingAllowed(inlineItem.layoutBox().parent().style());
+return isWrappingAllowed(inlineItem);
ASSERT(!inlineItem.isBox());
}
// This must be a set of individual text runs. We could just check the last item.
-return isWrappingAllowed(lastInlineItem.layoutBox().style());
+return isWrappingAllowed(lastInlineItem);
}
ASSERT_NOT_REACHED();
return true;
@@ -261,7 +262,7 @@
return false;
}
// Check if this text run needs to stay on the current line.
-return isWrappingAllowed(run.inlineItem.style());
+return isWrappingAllowed(run.inlineItem);
};
// Check where the overflow occurs and use the corresponding style to figure out the breaking behaviour.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276502] trunk/Source
Title: [276502] trunk/Source Revision 276502 Author cdu...@apple.com Date 2021-04-23 09:55:47 -0700 (Fri, 23 Apr 2021) Log Message Improve our constructDeletedValue() template specializations https://bugs.webkit.org/show_bug.cgi?id=224889 Reviewed by Darin Adler. Source/WebCore: Improve our constructDeletedValue() template specializations and make them more consistent: - Use placement-new instead of object assignment since we don't want/need to destroy the existing object (since it is uninitialized). - Do as little initialization as possible for performance reasons. * Modules/indexeddb/IDBKeyData.cpp: (WebCore::IDBKeyData::deletedValue): Deleted. * Modules/indexeddb/IDBKeyData.h: (WebCore::IDBKeyDataHashTraits::constructDeletedValue): (WebCore::IDBKeyDataHashTraits::isDeletedValue): (WebCore::IDBKeyData::isDeletedValue const): Deleted. * Modules/indexeddb/shared/IDBResourceIdentifier.cpp: (WebCore::IDBResourceIdentifier::deletedValue): Deleted. (WebCore::IDBResourceIdentifier::isHashTableDeletedValue const): Deleted. * Modules/indexeddb/shared/IDBResourceIdentifier.h: (WebCore::IDBResourceIdentifierHashTraits::constructDeletedValue): (WebCore::IDBResourceIdentifierHashTraits::isDeletedValue): * dom/MessagePortIdentifier.h: (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): * history/BackForwardItemIdentifier.h: (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): * layout/LayoutUnits.h: (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): * loader/PrivateClickMeasurement.h: (WebCore::PrivateClickMeasurement::AttributionDestinationSite::matches const): (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): (WebCore::PrivateClickMeasurement::SourceSite::isHashTableDeletedValue const): Deleted. (WebCore::PrivateClickMeasurement::SourceSite::deletedValue): Deleted. (WebCore::PrivateClickMeasurement::SourceSite::constructDeletedValue): Deleted. (WebCore::PrivateClickMeasurement::SourceSite::deleteValue): Deleted. (WebCore::PrivateClickMeasurement::SourceSite::isDeletedValue const): Deleted. (WebCore::PrivateClickMeasurement::AttributionDestinationSite::isHashTableDeletedValue const): Deleted. (WebCore::PrivateClickMeasurement::AttributionDestinationSite::deletedValue): Deleted. (WebCore::PrivateClickMeasurement::AttributionDestinationSite::constructDeletedValue): Deleted. (WebCore::PrivateClickMeasurement::AttributionDestinationSite::deleteValue): Deleted. (WebCore::PrivateClickMeasurement::AttributionDestinationSite::isDeletedValue const): Deleted. * page/ClientOrigin.h: (WTF::HashTraits::constructDeletedValue): * page/GlobalWindowIdentifier.h: (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): * platform/Cookie.h: (WTF::HashTraits::constructDeletedValue): (WebCore::Cookie::Cookie): Deleted. * platform/graphics/FontCache.cpp: (WebCore::FontPlatformDataCacheKeyHashTraits::constructDeletedValue): * platform/graphics/FontCache.h: (WebCore::FontCascadeCacheKeyHashTraits::constructDeletedValue): * platform/graphics/IntPointHash.h: (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): * rendering/CSSValueKey.h: (WTF::HashTraits::constructDeletedValue): * workers/service/ServiceWorkerClientIdentifier.h: (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): Source/WebCore/PAL: * pal/SessionID.h: (WTF::HashTraits::constructDeletedValue): Source/WebKit: Improve our constructDeletedValue() template specializations and make them more consistent: - Use placement-new instead of object assignment since we don't want/need to destroy the existing object (since it is uninitialized). - Do as little initialization as possible for performance reasons. * NetworkProcess/cache/NetworkCache.h: (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): * Platform/IPC/StringReference.h: (WTF::HashTraits::constructDeletedValue): * Shared/CallbackID.h: (WTF::HashTraits::constructDeletedValue): (WTF::HashTraits::isDeletedValue): Source/WebKitLegacy/mac: Improve our constructDeletedValue() template specializations and make them more consistent: - Use placement-new instead of object assignment since we don't want/need to destroy the existing object (since it is uninitialized). - Do as little initialization as possible for performance reasons. * History/BinaryPropertyList.cpp: (IntegerArray::integers const): (IntegerArray::size const): (IntegerArrayHashTraits::constructDeletedValue): (IntegerArrayHashTraits::isDeletedValue): (IntegerArray::markDeleted): Deleted. (IntegerArray::isDeletedValue const): Deleted. (IntegerArray::deletedValueSize): Deleted. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h
[webkit-changes] [276501] branches/safari-611-branch/Source/WebKit
Title: [276501] branches/safari-611-branch/Source/WebKit
Revision 276501
Author repst...@apple.com
Date 2021-04-23 09:53:23 -0700 (Fri, 23 Apr 2021)
Log Message
Cherry-pick r276482. rdar://problem/77074513
[Mac] CMBaseClass object pointers can become unaligned on x86
https://bugs.webkit.org/show_bug.cgi?id=224950
Reviewed by Eric Carlson.
CMBaseClass has a 4-byte version member before its 8-byte pointers on x86. Deal with this
the same way we do with other pointer-bearing, static, CM-type objects: enforce a 4-byte
packing, and prepend the struct with another 4-byte object in order to force the pointers
into 8-byte alignment.
* Shared/mac/MediaFormatReader/CoreMediaWrapped.h:
(WebKit::CoreMediaWrapped::vTable):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276482 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
branches/safari-611-branch/Source/WebKit/ChangeLog
branches/safari-611-branch/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h
Diff
Modified: branches/safari-611-branch/Source/WebKit/ChangeLog (276500 => 276501)
--- branches/safari-611-branch/Source/WebKit/ChangeLog 2021-04-23 16:31:30 UTC (rev 276500)
+++ branches/safari-611-branch/Source/WebKit/ChangeLog 2021-04-23 16:53:23 UTC (rev 276501)
@@ -1,3 +1,40 @@
+2021-04-23 Russell Epstein
+
+Cherry-pick r276482. rdar://problem/77074513
+
+[Mac] CMBaseClass object pointers can become unaligned on x86
+https://bugs.webkit.org/show_bug.cgi?id=224950
+
+
+Reviewed by Eric Carlson.
+
+CMBaseClass has a 4-byte version member before its 8-byte pointers on x86. Deal with this
+the same way we do with other pointer-bearing, static, CM-type objects: enforce a 4-byte
+packing, and prepend the struct with another 4-byte object in order to force the pointers
+into 8-byte alignment.
+
+* Shared/mac/MediaFormatReader/CoreMediaWrapped.h:
+(WebKit::CoreMediaWrapped::vTable):
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276482 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+2021-04-22 Jer Noble
+
+[Mac] CMBaseClass object pointers can become unaligned on x86
+https://bugs.webkit.org/show_bug.cgi?id=224950
+
+
+Reviewed by Eric Carlson.
+
+CMBaseClass has a 4-byte version member before its 8-byte pointers on x86. Deal with this
+the same way we do with other pointer-bearing, static, CM-type objects: enforce a 4-byte
+packing, and prepend the struct with another 4-byte object in order to force the pointers
+into 8-byte alignment.
+
+* Shared/mac/MediaFormatReader/CoreMediaWrapped.h:
+(WebKit::CoreMediaWrapped::vTable):
+
2021-04-21 Alan Coon
Cherry-pick r275805. rdar://problem/76963040
Modified: branches/safari-611-branch/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h (276500 => 276501)
--- branches/safari-611-branch/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h 2021-04-23 16:31:30 UTC (rev 276500)
+++ branches/safari-611-branch/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h 2021-04-23 16:53:23 UTC (rev 276501)
@@ -142,12 +142,23 @@
template
const typename CoreMediaWrapped::WrapperVTable& CoreMediaWrapped::vTable()
{
-static constexpr CMBaseClass baseClass = wrapperClass();
-static constexpr WrapperClass derivedClass = Wrapped::wrapperClass();
+// CMBaseClass contains 64-bit pointers that aren't 8-byte aligned. To suppress the linker
+// warning about this, we prepend 4 bytes of padding when building.
+#if CPU(X86_64)
+constexpr size_t padSize = 4;
+#else
+constexpr size_t padSize = 0;
+#endif
+
+#pragma pack(push, 4)
+static constexpr struct { uint8_t pad[padSize]; CMBaseClass baseClass; } baseClass { { }, wrapperClass() };
+static constexpr struct { uint8_t pad[padSize]; WrapperClass derivedClass; } derivedClass { { }, Wrapped::wrapperClass() };
+#pragma pack(pop)
+
IGNORE_WARNINGS_BEGIN("missing-field-initializers")
static constexpr WrapperVTable vTable {
-{ nullptr, },
-,
+{ nullptr, },
+,
};
IGNORE_WARNINGS_END
return vTable;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276500] trunk/Source/WebCore
Title: [276500] trunk/Source/WebCore
Revision 276500
Author calva...@igalia.com
Date 2021-04-23 09:31:30 -0700 (Fri, 23 Apr 2021)
Log Message
[GStreamer][EME] cbcs fixes
https://bugs.webkit.org/show_bug.cgi?id=224976
Reviewed by Philippe Normand.
In cbcs you can get from qtdemux buffers without an iv_size
because it had constant_iv_size. We need to check that.
When decryption bails out because of the buffer being unencrypted,
we should TRACE so.
cbcs buffers could not include the subsample_count, we consider 0
as default.
* platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:
(transformInPlace):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (276499 => 276500)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 15:40:24 UTC (rev 276499)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 16:31:30 UTC (rev 276500)
@@ -1,3 +1,22 @@
+2021-04-23 Xabier Rodriguez Calvar
+
+[GStreamer][EME] cbcs fixes
+https://bugs.webkit.org/show_bug.cgi?id=224976
+
+Reviewed by Philippe Normand.
+
+In cbcs you can get from qtdemux buffers without an iv_size
+because it had constant_iv_size. We need to check that.
+
+When decryption bails out because of the buffer being unencrypted,
+we should TRACE so.
+
+cbcs buffers could not include the subsample_count, we consider 0
+as default.
+
+* platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:
+(transformInPlace):
+
2021-04-23 Michael Catanzaro
Improve HashTableDeletedValue of ServiceWorkerRegistrationKey
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp (276499 => 276500)
--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp 2021-04-23 15:40:24 UTC (rev 276499)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp 2021-04-23 16:31:30 UTC (rev 276500)
@@ -225,6 +225,10 @@
GST_ERROR_OBJECT(self, "Failed to get iv_size");
return GST_FLOW_NOT_SUPPORTED;
}
+if (!ivSize && !gst_structure_get_uint(protectionMeta->info, "constant_iv_size", )) {
+GST_ERROR_OBJECT(self, "No iv_size and failed to get constant_iv_size");
+return GST_FLOW_NOT_SUPPORTED;
+}
gboolean encrypted;
if (!gst_structure_get_boolean(protectionMeta->info, "encrypted", )) {
@@ -232,13 +236,17 @@
return GST_FLOW_NOT_SUPPORTED;
}
-if (!ivSize || !encrypted)
+if (!ivSize || !encrypted) {
+GST_TRACE_OBJECT(self, "iv size %u, encrypted %s, bailing out OK as unencrypted", ivSize, boolForPrinting(encrypted));
return GST_FLOW_OK;
+}
GST_DEBUG_OBJECT(base, "protection meta: %" GST_PTR_FORMAT, protectionMeta->info);
-unsigned subSampleCount;
-if (!gst_structure_get_uint(protectionMeta->info, "subsample_count", )) {
+unsigned subSampleCount = 0;
+// cbcs could not include the subsample_count.
+if (!gst_structure_get_uint(protectionMeta->info, "subsample_count", )
+&& !gst_structure_has_name(protectionMeta->info, "application/x-cbcs")) {
GST_ERROR_OBJECT(self, "Failed to get subsample_count");
return GST_FLOW_NOT_SUPPORTED;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276499] trunk/Source/WebCore
Title: [276499] trunk/Source/WebCore
Revision 276499
Author commit-qu...@webkit.org
Date 2021-04-23 08:40:24 -0700 (Fri, 23 Apr 2021)
Log Message
Improve HashTableDeletedValue of ServiceWorkerRegistrationKey
https://bugs.webkit.org/show_bug.cgi?id=224975
Patch by Michael Catanzaro on 2021-04-23
Reviewed by Chris Dumez.
We construct only the SecurityOriginData, no need to construct a full
ServiceWorkerRegistrationKey or URL. No behavior changes.
* workers/service/ServiceWorkerRegistrationKey.h:
(WTF::HashTraits::constructDeletedValue):
(WTF::HashTraits::isDeletedValue):
(WebCore::ServiceWorkerRegistrationKey::isHashTableDeletedValue const): Deleted.
(WebCore::ServiceWorkerRegistrationKey::ServiceWorkerRegistrationKey): Deleted.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/workers/service/ServiceWorkerRegistrationKey.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (276498 => 276499)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 15:16:30 UTC (rev 276498)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 15:40:24 UTC (rev 276499)
@@ -1,3 +1,19 @@
+2021-04-23 Michael Catanzaro
+
+Improve HashTableDeletedValue of ServiceWorkerRegistrationKey
+https://bugs.webkit.org/show_bug.cgi?id=224975
+
+Reviewed by Chris Dumez.
+
+We construct only the SecurityOriginData, no need to construct a full
+ServiceWorkerRegistrationKey or URL. No behavior changes.
+
+* workers/service/ServiceWorkerRegistrationKey.h:
+(WTF::HashTraits::constructDeletedValue):
+(WTF::HashTraits::isDeletedValue):
+(WebCore::ServiceWorkerRegistrationKey::isHashTableDeletedValue const): Deleted.
+(WebCore::ServiceWorkerRegistrationKey::ServiceWorkerRegistrationKey): Deleted.
+
2021-04-23 Youenn Fablet
Handle rotation correctly in WebRTC GPUProcess rendering pipeline
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerRegistrationKey.h (276498 => 276499)
--- trunk/Source/WebCore/workers/service/ServiceWorkerRegistrationKey.h 2021-04-23 15:16:30 UTC (rev 276498)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerRegistrationKey.h 2021-04-23 15:40:24 UTC (rev 276499)
@@ -35,7 +35,6 @@
class ServiceWorkerRegistrationKey {
public:
ServiceWorkerRegistrationKey() = default;
-explicit ServiceWorkerRegistrationKey(WTF::HashTableDeletedValueType);
WEBCORE_EXPORT ServiceWorkerRegistrationKey(SecurityOriginData&& topOrigin, URL&& scope);
static ServiceWorkerRegistrationKey emptyKey();
@@ -66,18 +65,13 @@
String loggingString() const;
#endif
-bool isHashTableDeletedValue() const { return m_topOrigin.isHashTableDeletedValue(); }
+private:
+friend struct HashTraits;
-private:
SecurityOriginData m_topOrigin;
URL m_scope;
};
-inline ServiceWorkerRegistrationKey::ServiceWorkerRegistrationKey(WTF::HashTableDeletedValueType)
-: m_topOrigin(WTF::HashTableDeletedValue)
-{
-}
-
template
void ServiceWorkerRegistrationKey::encode(Encoder& encoder) const
{
@@ -114,8 +108,8 @@
template<> struct HashTraits : GenericHashTraits {
static WebCore::ServiceWorkerRegistrationKey emptyValue() { return WebCore::ServiceWorkerRegistrationKey::emptyKey(); }
-static void constructDeletedValue(WebCore::ServiceWorkerRegistrationKey& slot) { new (NotNull, ) WebCore::ServiceWorkerRegistrationKey(HashTableDeletedValue); }
-static bool isDeletedValue(const WebCore::ServiceWorkerRegistrationKey& slot) { return slot.isHashTableDeletedValue(); }
+static void constructDeletedValue(WebCore::ServiceWorkerRegistrationKey& slot) { new (NotNull, _topOrigin) WebCore::SecurityOriginData(HashTableDeletedValue); }
+static bool isDeletedValue(const WebCore::ServiceWorkerRegistrationKey& slot) { return slot.m_topOrigin.isHashTableDeletedValue(); }
};
template<> struct DefaultHash : ServiceWorkerRegistrationKeyHash { };
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276498] trunk/LayoutTests/imported/w3c
Title: [276498] trunk/LayoutTests/imported/w3c Revision 276498 Author cathiec...@igalia.com Date 2021-04-23 08:16:30 -0700 (Fri, 23 Apr 2021) Log Message Import the update to "mapping attribute width and height to aspect ratio" tests from WPT https://bugs.webkit.org/show_bug.cgi?id=224911 Reviewed by Rob Buis. Import the update to "mapping attribute width and height to aspect ratio" tests from WPT commit 0ae0bb7cab. Split up the test cases, to make sure each image has its own test case and won't affect testing other images. * web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio-expected.txt: * web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt: * web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.html: * web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio-expected.txt: * web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html: * web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/resources/aspect-ratio.js: (test_computed_style_aspect_ratio): * web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio-expected.txt: Modified Paths trunk/LayoutTests/imported/w3c/ChangeLog trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio-expected.txt trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.html trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio-expected.txt trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/resources/aspect-ratio.js trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio-expected.txt Diff Modified: trunk/LayoutTests/imported/w3c/ChangeLog (276497 => 276498) --- trunk/LayoutTests/imported/w3c/ChangeLog 2021-04-23 14:32:36 UTC (rev 276497) +++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-04-23 15:16:30 UTC (rev 276498) @@ -1,3 +1,22 @@ +2021-04-23 Cathie Chen + +Import the update to "mapping attribute width and height to aspect ratio" tests from WPT +https://bugs.webkit.org/show_bug.cgi?id=224911 + +Reviewed by Rob Buis. + +Import the update to "mapping attribute width and height to aspect ratio" tests from WPT commit 0ae0bb7cab. Split up the test cases, to make sure +each image has its own test case and won't affect testing other images. + +* web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio-expected.txt: +* web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt: +* web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.html: +* web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio-expected.txt: +* web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html: +* web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/resources/aspect-ratio.js: +(test_computed_style_aspect_ratio): +* web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/video-aspect-ratio-expected.txt: + 2021-04-22 Tyler Wilcock [css-counter-styles] Parse @counter-style descriptors Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio-expected.txt (276497 => 276498) --- trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio-expected.txt 2021-04-23 14:32:36 UTC (rev 276497) +++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/canvas-aspect-ratio-expected.txt 2021-04-23 15:16:30
[webkit-changes] [276497] trunk/Source
Title: [276497] trunk/Source
Revision 276497
Author you...@apple.com
Date 2021-04-23 07:32:36 -0700 (Fri, 23 Apr 2021)
Log Message
Handle rotation correctly in WebRTC GPUProcess rendering pipeline
https://bugs.webkit.org/show_bug.cgi?id=224927
Reviewed by Eric Carlson.
Source/WebCore:
Add a routine to update the affine transformn of the root layer.
Manually tested.
* platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.h:
* platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.mm:
(WebCore::LocalSampleBufferDisplayLayer::updateRootLayerAffineTransform):
Source/WebKit:
Instead of updating the inner layer, update the root layer.
* GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.cpp:
(WebKit::RemoteSampleBufferDisplayLayer::updateAffineTransform):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.h
trunk/Source/WebCore/platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.mm
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (276496 => 276497)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 14:07:46 UTC (rev 276496)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 14:32:36 UTC (rev 276497)
@@ -1,3 +1,18 @@
+2021-04-23 Youenn Fablet
+
+Handle rotation correctly in WebRTC GPUProcess rendering pipeline
+https://bugs.webkit.org/show_bug.cgi?id=224927
+
+
+Reviewed by Eric Carlson.
+
+Add a routine to update the affine transformn of the root layer.
+Manually tested.
+
+* platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.h:
+* platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.mm:
+(WebCore::LocalSampleBufferDisplayLayer::updateRootLayerAffineTransform):
+
2021-04-23 Philippe Normand
Unreviewed, GStreamer follow-up after r276493
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.h (276496 => 276497)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.h 2021-04-23 14:07:46 UTC (rev 276496)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.h 2021-04-23 14:32:36 UTC (rev 276497)
@@ -60,6 +60,7 @@
enum class ShouldUpdateRootLayer { No, Yes };
void updateRootLayerBoundsAndPosition(CGRect, MediaSample::VideoRotation, ShouldUpdateRootLayer);
+void updateRootLayerAffineTransform(CGAffineTransform);
void initialize(bool hideRootLayer, IntSize, CompletionHandler&&) final;
bool didFail() const final;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.mm (276496 => 276497)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.mm 2021-04-23 14:07:46 UTC (rev 276496)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.mm 2021-04-23 14:32:36 UTC (rev 276497)
@@ -248,6 +248,13 @@
return m_rootLayer.get().bounds;
}
+void LocalSampleBufferDisplayLayer::updateRootLayerAffineTransform(CGAffineTransform transform)
+{
+runWithoutAnimations([&] {
+m_rootLayer.get().affineTransform = transform;
+});
+}
+
void LocalSampleBufferDisplayLayer::updateAffineTransform(CGAffineTransform transform)
{
runWithoutAnimations([&] {
Modified: trunk/Source/WebKit/ChangeLog (276496 => 276497)
--- trunk/Source/WebKit/ChangeLog 2021-04-23 14:07:46 UTC (rev 276496)
+++ trunk/Source/WebKit/ChangeLog 2021-04-23 14:32:36 UTC (rev 276497)
@@ -1,3 +1,16 @@
+2021-04-23 Youenn Fablet
+
+Handle rotation correctly in WebRTC GPUProcess rendering pipeline
+https://bugs.webkit.org/show_bug.cgi?id=224927
+
+
+Reviewed by Eric Carlson.
+
+Instead of updating the inner layer, update the root layer.
+
+* GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.cpp:
+(WebKit::RemoteSampleBufferDisplayLayer::updateAffineTransform):
+
2021-04-23 Carlos Garcia Campos
[GTK] Implement PageClient::makeViewBlank()
Modified: trunk/Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.cpp (276496 => 276497)
--- trunk/Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.cpp 2021-04-23 14:07:46 UTC (rev 276496)
+++ trunk/Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.cpp 2021-04-23 14:32:36 UTC (rev 276497)
@@ -78,7 +78,7 @@
void RemoteSampleBufferDisplayLayer::updateAffineTransform(CGAffineTransform transform)
{
-m_sampleBufferDisplayLayer->updateAffineTransform(transform);
+m_sampleBufferDisplayLayer->updateRootLayerAffineTransform(transform);
}
void RemoteSampleBufferDisplayLayer::updateBoundsAndPosition(CGRect bounds, WebCore::MediaSample::VideoRotation rotation)
[webkit-changes] [276496] trunk/Source/JavaScriptCore
Title: [276496] trunk/Source/_javascript_Core
Revision 276496
Author commit-qu...@webkit.org
Date 2021-04-23 07:07:46 -0700 (Fri, 23 Apr 2021)
Log Message
Unreviewed, reverting r276486.
https://bugs.webkit.org/show_bug.cgi?id=224973
broke windows build
Reverted changeset:
"[JSC][Win] callOperationNoExceptionCheck() also needs to
support operations that return SlowPathReturnType"
https://bugs.webkit.org/show_bug.cgi?id=224964
https://trac.webkit.org/changeset/276486
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/JIT.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (276495 => 276496)
--- trunk/Source/_javascript_Core/ChangeLog 2021-04-23 13:29:26 UTC (rev 276495)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-04-23 14:07:46 UTC (rev 276496)
@@ -1,3 +1,17 @@
+2021-04-23 Commit Queue
+
+Unreviewed, reverting r276486.
+https://bugs.webkit.org/show_bug.cgi?id=224973
+
+broke windows build
+
+Reverted changeset:
+
+"[JSC][Win] callOperationNoExceptionCheck() also needs to
+support operations that return SlowPathReturnType"
+https://bugs.webkit.org/show_bug.cgi?id=224964
+https://trac.webkit.org/changeset/276486
+
2021-04-22 Fujii Hironori
[JSC][Win] callOperationNoExceptionCheck() also needs to support operations that return SlowPathReturnType
Modified: trunk/Source/_javascript_Core/jit/JIT.h (276495 => 276496)
--- trunk/Source/_javascript_Core/jit/JIT.h 2021-04-23 13:29:26 UTC (rev 276495)
+++ trunk/Source/_javascript_Core/jit/JIT.h 2021-04-23 14:07:46 UTC (rev 276496)
@@ -824,18 +824,32 @@
}
#if OS(WINDOWS) && CPU(X86_64)
-template static constexpr bool is64BitType = sizeof(Type) <= 8;
-template<> static constexpr bool is64BitType = true;
-
template
-MacroAssembler::Call callOperation(OperationType operation, Args... args)
+std::enable_if_t::ResultType, SlowPathReturnType>::value, MacroAssembler::Call>
+callOperation(OperationType operation, Args... args)
{
setupArguments(args...);
-// x64 Windows cannot use standard call when the return type is larger than 64 bits.
-if constexpr (is64BitType::ResultType>)
-return appendCallWithExceptionCheck(operation);
return appendCallWithExceptionCheckAndSlowPathReturnType(operation);
}
+
+template
+struct is64BitType {
+static constexpr bool value = sizeof(Type) <= 8;
+};
+
+template<>
+struct is64BitType {
+static constexpr bool value = true;
+};
+
+template
+std::enable_if_t::ResultType, SlowPathReturnType>::value, MacroAssembler::Call>
+callOperation(OperationType operation, Args... args)
+{
+static_assert(is64BitType::ResultType>::value, "Win64 cannot use standard call when return type is larger than 64 bits.");
+setupArguments(args...);
+return appendCallWithExceptionCheck(operation);
+}
#else // OS(WINDOWS) && CPU(X86_64)
template
MacroAssembler::Call callOperation(OperationType operation, Args... args)
@@ -862,26 +876,13 @@
return result;
}
-#if OS(WINDOWS) && CPU(X86_64)
template
MacroAssembler::Call callOperationNoExceptionCheck(OperationType operation, Args... args)
{
setupArguments(args...);
updateTopCallFrame();
-// x64 Windows cannot use standard call when the return type is larger than 64 bits.
-if constexpr (is64BitType::ResultType>)
-return appendCall(operation);
-return appendCallWithSlowPathReturnType(operation);
-}
-#else
-template
-MacroAssembler::Call callOperationNoExceptionCheck(OperationType operation, Args... args)
-{
-setupArguments(args...);
-updateTopCallFrame();
return appendCall(operation);
}
-#endif // OS(WINDOWS) && CPU(X86_64)
template
MacroAssembler::Call callOperationWithCallFrameRollbackOnException(OperationType operation, Args... args)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276495] trunk/Source/WebCore
Title: [276495] trunk/Source/WebCore
Revision 276495
Author ph...@webkit.org
Date 2021-04-23 06:29:26 -0700 (Fri, 23 Apr 2021)
Log Message
Unreviewed, GStreamer follow-up after r276493
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Remove spurious adoptGRef call, as
this is not transfer-full.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (276494 => 276495)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 13:17:06 UTC (rev 276494)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 13:29:26 UTC (rev 276495)
@@ -1,5 +1,13 @@
2021-04-23 Philippe Normand
+Unreviewed, GStreamer follow-up after r276493
+
+* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Remove spurious adoptGRef call, as
+this is not transfer-full.
+
+2021-04-23 Philippe Normand
+
[Media] Allow access to MediaElement id from MediaPlayerPrivate
https://bugs.webkit.org/show_bug.cgi?id=224818
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (276494 => 276495)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-04-23 13:17:06 UTC (rev 276494)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-04-23 13:29:26 UTC (rev 276495)
@@ -2700,7 +2700,7 @@
static Atomic pipelineId;
-m_pipeline = adoptGRef(gst_element_factory_make(playbinName, makeString(type, elementId, '-', pipelineId.exchangeAdd(1)).ascii().data()));
+m_pipeline = gst_element_factory_make(playbinName, makeString(type, elementId, '-', pipelineId.exchangeAdd(1)).ascii().data());
if (!m_pipeline) {
GST_WARNING("%s not found, make sure to install gst-plugins-base", playbinName);
loadingFailed(MediaPlayer::NetworkState::FormatError, MediaPlayer::ReadyState::HaveNothing, true);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276494] trunk/LayoutTests
Title: [276494] trunk/LayoutTests Revision 276494 Author ph...@webkit.org Date 2021-04-23 06:17:06 -0700 (Fri, 23 Apr 2021) Log Message Unreviewed, GTK gardening * platform/gtk/TestExpectations: Remove test expectation for imported/w3c/web-platform-tests/mediacapture-fromelement/capture.html which is tracked in the main TestExpectations already. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/gtk/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (276493 => 276494) --- trunk/LayoutTests/ChangeLog 2021-04-23 09:46:01 UTC (rev 276493) +++ trunk/LayoutTests/ChangeLog 2021-04-23 13:17:06 UTC (rev 276494) @@ -1,5 +1,13 @@ 2021-04-23 Philippe Normand +Unreviewed, GTK gardening + +* platform/gtk/TestExpectations: Remove test expectation for +imported/w3c/web-platform-tests/mediacapture-fromelement/capture.html which is tracked in +the main TestExpectations already. + +2021-04-23 Philippe Normand + [LibWebRTC][WPE][GTK] Enable vp9 and NO_MAIN_THREAD_WRAPPING https://bugs.webkit.org/show_bug.cgi?id=222795 Modified: trunk/LayoutTests/platform/gtk/TestExpectations (276493 => 276494) --- trunk/LayoutTests/platform/gtk/TestExpectations 2021-04-23 09:46:01 UTC (rev 276493) +++ trunk/LayoutTests/platform/gtk/TestExpectations 2021-04-23 13:17:06 UTC (rev 276494) @@ -1120,8 +1120,6 @@ webkit.org/b/177527 [ Release ] fast/hidpi/filters-blur.html [ Pass ImageOnlyFailure ] -webkit.org/b/179356 imported/w3c/web-platform-tests/mediacapture-fromelement/capture.html [ Failure ] - webkit.org/b/178784 [ Release ] inspector/console/webcore-logging.html [ Pass Crash ] webkit.org/b/179948 [ Release ] fast/hidpi/filters-reference.html [ Pass ImageOnlyFailure ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276493] trunk/Source/WebCore
Title: [276493] trunk/Source/WebCore
Revision 276493
Author commit-qu...@webkit.org
Date 2021-04-23 02:46:01 -0700 (Fri, 23 Apr 2021)
Log Message
[Media] Allow access to MediaElement id from MediaPlayerPrivate
https://bugs.webkit.org/show_bug.cgi?id=224818
Patch by Philippe Normand on 2021-04-23
Reviewed by Xabier Rodriguez-Calvar.
A new method is added in the MediaPlayer allowing to query the client media element for its
identifier. That could be useful for accurate naming of the internal player/pipeline in the
MediaPlayerPrivate. If no specific id was set on the media element then the id is empty
string and the MediaPlayerPrivate needs to handle that by forging a unique id.
This also lead me to simplify pipeline-related code in the GStreamer player. The player can
handle only one pipeline in its entire life-time so the code handling pipeline "re-loading"
was actually never hit.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* html/HTMLMediaElement.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::elementId const):
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerElementId const):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::load):
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
(WebCore::MediaPlayerPrivateGStreamer::loadFull): Deleted.
(WebCore::MediaPlayerPrivateGStreamer::setPipeline): Deleted.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLMediaElement.cpp
trunk/Source/WebCore/html/HTMLMediaElement.h
trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp
trunk/Source/WebCore/platform/graphics/MediaPlayer.h
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (276492 => 276493)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 09:43:09 UTC (rev 276492)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 09:46:01 UTC (rev 276493)
@@ -1,3 +1,33 @@
+2021-04-23 Philippe Normand
+
+[Media] Allow access to MediaElement id from MediaPlayerPrivate
+https://bugs.webkit.org/show_bug.cgi?id=224818
+
+Reviewed by Xabier Rodriguez-Calvar.
+
+A new method is added in the MediaPlayer allowing to query the client media element for its
+identifier. That could be useful for accurate naming of the internal player/pipeline in the
+MediaPlayerPrivate. If no specific id was set on the media element then the id is empty
+string and the MediaPlayerPrivate needs to handle that by forging a unique id.
+
+This also lead me to simplify pipeline-related code in the GStreamer player. The player can
+handle only one pipeline in its entire life-time so the code handling pipeline "re-loading"
+was actually never hit.
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::parseAttribute):
+* html/HTMLMediaElement.h:
+* platform/graphics/MediaPlayer.cpp:
+(WebCore::MediaPlayer::elementId const):
+* platform/graphics/MediaPlayer.h:
+(WebCore::MediaPlayerClient::mediaPlayerElementId const):
+* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+(WebCore::MediaPlayerPrivateGStreamer::load):
+(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+(WebCore::MediaPlayerPrivateGStreamer::loadFull): Deleted.
+(WebCore::MediaPlayerPrivateGStreamer::setPipeline): Deleted.
+* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
2021-04-22 Sergio Villar Senin
Do not set synchronous scrolling for layers without relevant scrolling scopes
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (276492 => 276493)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2021-04-23 09:43:09 UTC (rev 276492)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2021-04-23 09:46:01 UTC (rev 276493)
@@ -712,6 +712,9 @@
void HTMLMediaElement::parseAttribute(const QualifiedName& name, const AtomString& value)
{
+if (name == idAttr)
+m_id = value;
+
if (name == srcAttr) {
// https://html.spec.whatwg.org/multipage/embedded-content.html#location-of-the-media-resource
// Location of the Media Resource
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (276492 => 276493)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2021-04-23 09:43:09 UTC (rev 276492)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2021-04-23 09:46:01 UTC (rev 276493)
@@ -725,6 +725,8 @@
String mediaPlayerSourceApplicationIdentifier() const override { return sourceApplicationIdentifier(); }
Vector mediaPlayerPreferredAudioCharacteristics() const override;
+String mediaPlayerElementId() const override { return m_id; }
+
#if
[webkit-changes] [276492] trunk/Source/WebCore
Title: [276492] trunk/Source/WebCore
Revision 276492
Author svil...@igalia.com
Date 2021-04-23 02:43:09 -0700 (Fri, 23 Apr 2021)
Log Message
Do not set synchronous scrolling for layers without relevant scrolling scopes
https://bugs.webkit.org/show_bug.cgi?id=221383
Reviewed by Simon Fraser.
Fixed backgrounds could force the layer compositor to set synchronous scrolling because they're slow
to repaint. However that cannot be done if the layer's boxScrollingScope hasn't been previously updated
in RenderLayer::updateLayerPosition.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateSynchronousScrollingNodes): Do not call
setSynchronousScrollingReasons() if there is no scrollingScope.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (276491 => 276492)
--- trunk/Source/WebCore/ChangeLog 2021-04-23 09:23:04 UTC (rev 276491)
+++ trunk/Source/WebCore/ChangeLog 2021-04-23 09:43:09 UTC (rev 276492)
@@ -1,3 +1,18 @@
+2021-04-22 Sergio Villar Senin
+
+Do not set synchronous scrolling for layers without relevant scrolling scopes
+https://bugs.webkit.org/show_bug.cgi?id=221383
+
+Reviewed by Simon Fraser.
+
+Fixed backgrounds could force the layer compositor to set synchronous scrolling because they're slow
+to repaint. However that cannot be done if the layer's boxScrollingScope hasn't been previously updated
+in RenderLayer::updateLayerPosition.
+
+* rendering/RenderLayerCompositor.cpp:
+(WebCore::RenderLayerCompositor::updateSynchronousScrollingNodes): Do not call
+setSynchronousScrollingReasons() if there is no scrollingScope.
+
2021-04-23 Philippe Normand
[LibWebRTC][WPE][GTK] Enable vp9 and NO_MAIN_THREAD_WRAPPING
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (276491 => 276492)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2021-04-23 09:23:04 UTC (rev 276491)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2021-04-23 09:43:09 UTC (rev 276492)
@@ -4948,8 +4948,7 @@
if (!layer)
continue;
-auto scrollingScope = relevantScrollingScope(renderer, *layer);
-if (scrollingScope != rootScrollingScope) {
+if (auto scrollingScope = relevantScrollingScope(renderer, *layer); scrollingScope && scrollingScope != rootScrollingScope) {
auto enclosingScrollingNodeID = asyncScrollableContainerNodeID(renderer);
ASSERT(enclosingScrollingNodeID);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276491] trunk
Title: [276491] trunk Revision 276491 Author commit-qu...@webkit.org Date 2021-04-23 02:23:04 -0700 (Fri, 23 Apr 2021) Log Message [LibWebRTC][WPE][GTK] Enable vp9 and NO_MAIN_THREAD_WRAPPING https://bugs.webkit.org/show_bug.cgi?id=222795 Patch by Philippe Normand on 2021-04-23 Reviewed by Xabier Rodriguez-Calvar. Source/ThirdParty/libwebrtc: * CMakeLists.txt: Enable NO_MAIN_THREAD_WRAPPING as in the XCode build and harmonize options between Apple and non-Apple ports. * Source/webrtc/common_video/h265/h265_pps_parser.h: Source/WebCore: Add VP9 encoding and decoding support in the WPE/GTK LibWebRTC backend. The underlying encoding support is based on LibWebRTC's internal VP9 support. The GStreamer VPx encoders lack simulcast and high profile support, so can't really be used anyway. The GStreamerVP8Encoder was removed for this reason as well. * platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp: (WebCore::VP9Decoder::VP9Decoder): (WebCore::VP9Decoder::Create): (WebCore::GStreamerVideoDecoderFactory::CreateVideoDecoder): (WebCore::GStreamerVideoDecoderFactory::GStreamerVideoDecoderFactory): (WebCore::GStreamerVideoDecoderFactory::GetSupportedFormats const): * platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.h: * platform/mediastream/libwebrtc/GStreamerVideoEncoder.cpp: * platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp: (WebCore::GStreamerVideoEncoder::makeElement): (WebCore::GStreamerVideoEncoder::createEncoder): (WebCore::GStreamerVideoEncoder::SetRestrictionCaps): (WebCore::GStreamerVideoEncoderFactory::CreateVideoEncoder): (WebCore::GStreamerVideoEncoderFactory::GStreamerVideoEncoderFactory): (WebCore::GStreamerVideoEncoderFactory::GetSupportedFormats const): * platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.h: * platform/mediastream/libwebrtc/LibWebRTCProviderGStreamer.cpp: (WebCore::LibWebRTCProviderGStreamer::createDecoderFactory): (WebCore::LibWebRTCProviderGStreamer::createEncoderFactory): LayoutTests: Update GLIB baselines for webrtc tests. * platform/glib/TestExpectations: * platform/glib/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded-expected.txt: Added. * platform/glib/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-restartIce.https-expected.txt: Added. * platform/glib/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver-setCodecPreferences-expected.txt: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/glib/TestExpectations trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Source/webrtc/common_video/h265/h265_pps_parser.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.h trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoder.cpp trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.h trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProviderGStreamer.cpp Added Paths trunk/LayoutTests/platform/glib/imported/w3c/web-platform-tests/webrtc/ trunk/LayoutTests/platform/glib/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded-expected.txt trunk/LayoutTests/platform/glib/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-restartIce.https-expected.txt trunk/LayoutTests/platform/glib/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver-setCodecPreferences-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (276490 => 276491) --- trunk/LayoutTests/ChangeLog 2021-04-23 07:16:49 UTC (rev 276490) +++ trunk/LayoutTests/ChangeLog 2021-04-23 09:23:04 UTC (rev 276491) @@ -1,3 +1,17 @@ +2021-04-23 Philippe Normand + +[LibWebRTC][WPE][GTK] Enable vp9 and NO_MAIN_THREAD_WRAPPING +https://bugs.webkit.org/show_bug.cgi?id=222795 + +Reviewed by Xabier Rodriguez-Calvar. + +Update GLIB baselines for webrtc tests. + +* platform/glib/TestExpectations: +* platform/glib/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded-expected.txt: Added. +* platform/glib/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-restartIce.https-expected.txt: Added. +* platform/glib/imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver-setCodecPreferences-expected.txt: Added. + 2021-04-22 Diego Pino Garcia [GTK] Unreviewed test gardening. Update baseline after r276448. Modified: trunk/LayoutTests/platform/glib/TestExpectations (276490 => 276491) --- trunk/LayoutTests/platform/glib/TestExpectations 2021-04-23 07:16:49 UTC (rev 276490) +++ trunk/LayoutTests/platform/glib/TestExpectations 2021-04-23 09:23:04 UTC (rev 276491) @@ -1120,8 +1120,6 @@ webkit.org/b/210272
[webkit-changes] [276490] trunk/Source/WebKit
Title: [276490] trunk/Source/WebKit Revision 276490 Author carlo...@webkit.org Date 2021-04-23 00:16:49 -0700 (Fri, 23 Apr 2021) Log Message [GTK] Implement PageClient::makeViewBlank() https://bugs.webkit.org/show_bug.cgi?id=224236 Reviewed by Chris Dumez. Make most of the changes in r275485 cross platform and implement PageClient::makeViewBlank() for the GTK port. * UIProcess/API/glib/WebKitUIClient.cpp: * UIProcess/API/gtk/PageClientImpl.cpp: (WebKit::PageClientImpl::makeViewBlank): * UIProcess/API/gtk/PageClientImpl.h: * UIProcess/API/gtk/WebKitWebViewBase.cpp: (webkitWebViewBaseSnapshot): (webkitWebViewBaseDraw): (webkitWebViewBaseMakeBlank): * UIProcess/API/gtk/WebKitWebViewBasePrivate.h: * UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::didUpdateRenderingAfterCommittingLoad): (WebKit::WebPageProxy::stopMakingViewBlankDueToLackOfRenderingUpdate): (WebKit::WebPageProxy::makeViewBlankIfUnpaintedSinceLastLoadCommit): (WebKit::WebPageProxy::didCommitLoadForFrame): * UIProcess/WebPageProxy.h: * UIProcess/WebPageProxy.messages.in: * UIProcess/mac/WebPageProxyMac.mm: (WebKit::WebPageProxy::didUpdateRenderingAfterCommittingLoad): Deleted. * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp: (WebKit::CompositingCoordinator::flushPendingLayerChanges): * WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp: (WebKit::DrawingAreaCoordinatedGraphics::updateBackingStoreState): (WebKit::DrawingAreaCoordinatedGraphics::display): * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::didUpdateRendering): (WebKit::WebPage::didCommitLoad): * WebProcess/WebPage/WebPage.h: * WebProcess/WebPage/mac/WebPageMac.mm: (WebKit::WebPage::didUpdateRendering): Deleted. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h trunk/Source/WebKit/UIProcess/WebPageProxy.cpp trunk/Source/WebKit/UIProcess/WebPageProxy.h trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp trunk/Source/WebKit/WebProcess/WebPage/WebPage.h trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm Diff Modified: trunk/Source/WebKit/ChangeLog (276489 => 276490) --- trunk/Source/WebKit/ChangeLog 2021-04-23 05:42:30 UTC (rev 276489) +++ trunk/Source/WebKit/ChangeLog 2021-04-23 07:16:49 UTC (rev 276490) @@ -1,3 +1,42 @@ +2021-04-23 Carlos Garcia Campos + +[GTK] Implement PageClient::makeViewBlank() +https://bugs.webkit.org/show_bug.cgi?id=224236 + +Reviewed by Chris Dumez. + +Make most of the changes in r275485 cross platform and implement PageClient::makeViewBlank() for the GTK port. + +* UIProcess/API/glib/WebKitUIClient.cpp: +* UIProcess/API/gtk/PageClientImpl.cpp: +(WebKit::PageClientImpl::makeViewBlank): +* UIProcess/API/gtk/PageClientImpl.h: +* UIProcess/API/gtk/WebKitWebViewBase.cpp: +(webkitWebViewBaseSnapshot): +(webkitWebViewBaseDraw): +(webkitWebViewBaseMakeBlank): +* UIProcess/API/gtk/WebKitWebViewBasePrivate.h: +* UIProcess/WebPageProxy.cpp: +(WebKit::WebPageProxy::didUpdateRenderingAfterCommittingLoad): +(WebKit::WebPageProxy::stopMakingViewBlankDueToLackOfRenderingUpdate): +(WebKit::WebPageProxy::makeViewBlankIfUnpaintedSinceLastLoadCommit): +(WebKit::WebPageProxy::didCommitLoadForFrame): +* UIProcess/WebPageProxy.h: +* UIProcess/WebPageProxy.messages.in: +* UIProcess/mac/WebPageProxyMac.mm: +(WebKit::WebPageProxy::didUpdateRenderingAfterCommittingLoad): Deleted. +* WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp: +(WebKit::CompositingCoordinator::flushPendingLayerChanges): +* WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp: +(WebKit::DrawingAreaCoordinatedGraphics::updateBackingStoreState): +(WebKit::DrawingAreaCoordinatedGraphics::display): +* WebProcess/WebPage/WebPage.cpp: +(WebKit::WebPage::didUpdateRendering): +(WebKit::WebPage::didCommitLoad): +* WebProcess/WebPage/WebPage.h: +* WebProcess/WebPage/mac/WebPageMac.mm: +(WebKit::WebPage::didUpdateRendering): Deleted. + 2021-04-22 Jer Noble [Mac] CMBaseClass object pointers can become unaligned on x86 Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp (276489 => 276490) --- trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
