Port remaining WebCore/loader types to the new serialization format #9383

gavin-apple · 2023-01-31T16:02:07Z

`148e18a`

Port remaining WebCore/loader types to the new serialization format
https://bugs.webkit.org/show_bug.cgi?id=251434
rdar://104866054

Reviewed by Alex Christensen.

This change includes porting types:
    - CanvasActivityRecord
    - AttributionSecondsUntilSendData
    - CrossOriginOpenerPolicyValue
    - CrossOriginOpenerPolicy
    - CustomHeaderFields
    - HTTPHeaderField
    - NavigationRequester
    - PolicyContainer
    - SessionHistoryVisibility
    - SubstituteData

* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/loader/AttributionSecondsUntilSendData.h:
(WebCore::PCM::AttributionSecondsUntilSendData::minSecondsUntilSend):
(WebCore::PCM::AttributionSecondsUntilSendData::encode const): Deleted.
(WebCore::PCM::AttributionSecondsUntilSendData::decode): Deleted.
* Source/WebCore/loader/CanvasActivityRecord.h:
(WebCore::CanvasActivityRecord::encode const): Deleted.
(WebCore::CanvasActivityRecord::decode): Deleted.
* Source/WebCore/loader/CrossOriginOpenerPolicy.h:
(WebCore::CrossOriginOpenerPolicy::encode const): Deleted.
(WebCore::CrossOriginOpenerPolicy::decode): Deleted.
* Source/WebCore/loader/CustomHeaderFields.h:
(WebCore::CustomHeaderFields::encode const): Deleted.
(WebCore::CustomHeaderFields::decode): Deleted.
* Source/WebCore/loader/HTTPHeaderField.cpp:
(WebCore::HTTPHeaderField::HTTPHeaderField):
(WebCore::HTTPHeaderField::isValid):
(WebCore::HTTPHeaderField::create):
* Source/WebCore/loader/HTTPHeaderField.h:
(WebCore::HTTPHeaderField::encode const): Deleted.
(WebCore::HTTPHeaderField::decode): Deleted.
* Source/WebCore/loader/NavigationRequester.h:
(WebCore::NavigationRequester::encode const): Deleted.
(WebCore::NavigationRequester::decode): Deleted.
* Source/WebCore/loader/PolicyContainer.h:
(WebCore::PolicyContainer::isolatedCopy):
(WebCore::PolicyContainer::encode const): Deleted.
(WebCore::PolicyContainer::decode): Deleted.
* Source/WebCore/loader/SubstituteData.h:
(WebCore::SubstituteData::SubstituteData):
(WebCore::SubstituteData::isValid const):
(WebCore::SubstituteData::shouldRevealToSessionHistory const):
(WebCore::SubstituteData::content const):
(WebCore::SubstituteData::mimeType const):
(WebCore::SubstituteData::textEncoding const):
(WebCore::SubstituteData::failingURL const):
(WebCore::SubstituteData::response const):
(WebCore::SubstituteData::encode const): Deleted.
(WebCore::SubstituteData::decode): Deleted.
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:

Canonical link: https://commits.webkit.org/259811@main

2768bfc

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	~~🧪 api-gtk~~
	✅ 🛠 tv	✅ 🧪 mac-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-01-31T16:05:56Z

EWS run on previous version of this PR (hash 6663991)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	❌ 🛠 ios	❌ 🛠 mac	❌ 🛠 wpe	⏳ 🛠 🧪 win
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🛠 gtk	⏳ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	❌ 🧪 api-mac	❌ 🧪 gtk-wk2
	❌ 🧪 api-ios	❌ 🧪 mac-wk1	❌ 🧪 api-gtk
⏳ 🛠 🧪 jsc	❌ 🛠 tv	❌ 🧪 mac-wk2
	❌ 🛠 tv-sim	~~🧪 mac-AS-debug-wk2~~
	❌ 🛠 watch	❌ 🧪 mac-wk2-stress
	❌ 🛠 watch-sim

webkit-early-warning-system · 2023-01-31T16:28:28Z

EWS run on previous version of this PR (hash 3198bc9)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	❌ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
	✅ 🛠 watch-sim

achristensen07 · 2023-02-01T00:26:03Z

Source/WebCore/loader/SubstituteData.h

+    bool isValid() const { return m_content != nullptr; }
+    bool shouldRevealToSessionHistory() const { return m_shouldRevealToSessionHistory == SessionHistoryVisibility::Visible; }
+
+    const FragmentedSharedBuffer* content() const { return m_content.get(); }


If you changed this return type to RefPtr and shouldRevealToSessionHistory to SessionHistoryVisibility you could avoid "friend struct IPC::ArgumentCoder"

achristensen07 · 2023-02-01T00:29:53Z

Source/WebCore/loader/HTTPHeaderField.cpp

+    StringView strippedName = StringView(name).stripLeadingAndTrailingMatchedCharacters(RFC7230::isWhitespace<UChar>);
+    StringView strippedValue = StringView(value).stripLeadingAndTrailingMatchedCharacters(RFC7230::isWhitespace<UChar>);
+
+    ASSERT(RFC7230::isValidName(strippedName) && RFC7230::isValidValue(strippedValue));


I don't think this assertion is valid when decoding from an untrusted source, even after stripping whitespace.

achristensen07 · 2023-02-01T00:31:29Z

Source/WebCore/loader/HTTPHeaderField.cpp

-    String name = strippedName.length() == unparsedName.length() ? WTFMove(unparsedName) : strippedName.toString();
-    String value = strippedValue.length() == unparsedValue.length() ? WTFMove(unparsedValue) : strippedValue.toString();
-    return {{ WTFMove(name), WTFMove(value) }};
+std::optional<HTTPHeaderField> HTTPHeaderField::create(String&& unparsedName, String&& unparsedValue)


I think we should use CreateUsing=create and make a new attribute to allow the create function to return a std::optional, then just leave HTTPHeaderField class alone.

webkit-early-warning-system · 2023-02-01T22:46:21Z

EWS run on previous version of this PR (hash 1534fd2)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	~~🛠 ios~~	✅ 🛠 mac	⏳ 🛠 wpe	⏳ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🛠 gtk	⏳ 🛠 wincairo
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	⏳ 🧪 gtk-wk2
	~~🧪 api-ios~~	~~🧪 mac-wk1~~	⏳ 🧪 api-gtk
⏳ 🛠 🧪 jsc	✅ 🛠 tv	~~🧪 mac-wk2~~
	⏳ 🛠 tv-sim	~~🧪 mac-AS-debug-wk2~~
	✅ 🛠 watch	~~🧪 mac-wk2-stress~~
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2023-02-01T23:46:34Z

EWS run on previous version of this PR (hash 749b27d)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	❌ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
❌ 🛠 🧪 merge	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-02-03T00:23:54Z

EWS run on previous version of this PR (hash 9656efd)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	⏳ 🛠 ios	⏳ 🛠 mac	⏳ 🛠 wpe	⏳ 🛠 🧪 win
❌ 🧪 bindings	❌ 🛠 ios-sim	⏳ 🛠 mac-AS-debug	⏳ 🛠 gtk	⏳ 🛠 wincairo
❌ 🧪 webkitperl	❌ 🧪 ios-wk2	⏳ 🧪 api-mac	⏳ 🧪 gtk-wk2
	❌ 🧪 api-ios	⏳ 🧪 mac-wk1	⏳ 🧪 api-gtk
⏳ 🛠 🧪 jsc	⏳ 🛠 tv	⏳ 🧪 mac-wk2
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv-sim	⏳ 🧪 mac-AS-debug-wk2
	⏳ 🛠 watch	⏳ 🧪 mac-wk2-stress
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2023-02-03T00:36:03Z

EWS run on current version of this PR (hash 2768bfc)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	~~🧪 api-gtk~~
	✅ 🛠 tv	✅ 🧪 mac-wk2
	✅ 🛠 tv-sim	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge	✅ 🛠 watch-sim

https://bugs.webkit.org/show_bug.cgi?id=251434 rdar://104866054 Reviewed by Alex Christensen. This change includes porting types: - CanvasActivityRecord - AttributionSecondsUntilSendData - CrossOriginOpenerPolicyValue - CrossOriginOpenerPolicy - CustomHeaderFields - HTTPHeaderField - NavigationRequester - PolicyContainer - SessionHistoryVisibility - SubstituteData * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/loader/AttributionSecondsUntilSendData.h: (WebCore::PCM::AttributionSecondsUntilSendData::minSecondsUntilSend): (WebCore::PCM::AttributionSecondsUntilSendData::encode const): Deleted. (WebCore::PCM::AttributionSecondsUntilSendData::decode): Deleted. * Source/WebCore/loader/CanvasActivityRecord.h: (WebCore::CanvasActivityRecord::encode const): Deleted. (WebCore::CanvasActivityRecord::decode): Deleted. * Source/WebCore/loader/CrossOriginOpenerPolicy.h: (WebCore::CrossOriginOpenerPolicy::encode const): Deleted. (WebCore::CrossOriginOpenerPolicy::decode): Deleted. * Source/WebCore/loader/CustomHeaderFields.h: (WebCore::CustomHeaderFields::encode const): Deleted. (WebCore::CustomHeaderFields::decode): Deleted. * Source/WebCore/loader/HTTPHeaderField.cpp: (WebCore::HTTPHeaderField::HTTPHeaderField): (WebCore::HTTPHeaderField::isValid): (WebCore::HTTPHeaderField::create): * Source/WebCore/loader/HTTPHeaderField.h: (WebCore::HTTPHeaderField::encode const): Deleted. (WebCore::HTTPHeaderField::decode): Deleted. * Source/WebCore/loader/NavigationRequester.h: (WebCore::NavigationRequester::encode const): Deleted. (WebCore::NavigationRequester::decode): Deleted. * Source/WebCore/loader/PolicyContainer.h: (WebCore::PolicyContainer::isolatedCopy): (WebCore::PolicyContainer::encode const): Deleted. (WebCore::PolicyContainer::decode): Deleted. * Source/WebCore/loader/SubstituteData.h: (WebCore::SubstituteData::SubstituteData): (WebCore::SubstituteData::isValid const): (WebCore::SubstituteData::shouldRevealToSessionHistory const): (WebCore::SubstituteData::content const): (WebCore::SubstituteData::mimeType const): (WebCore::SubstituteData::textEncoding const): (WebCore::SubstituteData::failingURL const): (WebCore::SubstituteData::response const): (WebCore::SubstituteData::encode const): Deleted. (WebCore::SubstituteData::decode): Deleted. * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: Canonical link: https://commits.webkit.org/259811@main

webkit-commit-queue · 2023-02-03T12:40:54Z

Committed 259811@main (148e18a): https://commits.webkit.org/259811@main

Reviewed commits have been landed. Closing PR #9383 and removing active labels.

gavin-apple requested a review from cdumez as a code owner January 31, 2023 16:02

gavin-apple self-assigned this Jan 31, 2023

gavin-apple added the WebKit Process Model Bugs related to WebKit's multi-process architecture label Jan 31, 2023

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 31, 2023

gavin-apple removed the merging-blocked Applied to prevent a change from being merged label Jan 31, 2023

gavin-apple force-pushed the eng/Port-remaining-WebCoreloader-types-to-the-new-serialization-format branch from 6663991 to 3198bc9 Compare January 31, 2023 16:28

gavin-apple requested a review from achristensen07 January 31, 2023 22:58

achristensen07 requested changes Feb 1, 2023

View reviewed changes

gavin-apple force-pushed the eng/Port-remaining-WebCoreloader-types-to-the-new-serialization-format branch from 3198bc9 to 1534fd2 Compare February 1, 2023 22:45

gavin-apple force-pushed the eng/Port-remaining-WebCoreloader-types-to-the-new-serialization-format branch from 1534fd2 to 749b27d Compare February 1, 2023 23:41

achristensen07 approved these changes Feb 2, 2023

View reviewed changes

gavin-apple added the merge-queue Applied to send a pull request to merge-queue label Feb 2, 2023

gavin-apple removed the merge-queue Applied to send a pull request to merge-queue label Feb 3, 2023

gavin-apple force-pushed the eng/Port-remaining-WebCoreloader-types-to-the-new-serialization-format branch from 9656efd to 2768bfc Compare February 3, 2023 00:35

gavin-apple added the merge-queue Applied to send a pull request to merge-queue label Feb 3, 2023

webkit-early-warning-system force-pushed the eng/Port-remaining-WebCoreloader-types-to-the-new-serialization-format branch from 2768bfc to 148e18a Compare February 3, 2023 12:40

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Feb 3, 2023

webkit-early-warning-system merged commit 148e18a into WebKit:main Feb 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port remaining WebCore/loader types to the new serialization format #9383

Port remaining WebCore/loader types to the new serialization format #9383

gavin-apple commented Jan 31, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Jan 31, 2023 •

edited

webkit-early-warning-system commented Jan 31, 2023 •

edited

achristensen07 Feb 1, 2023

achristensen07 Feb 1, 2023

achristensen07 Feb 1, 2023

webkit-early-warning-system commented Feb 1, 2023 •

edited

webkit-early-warning-system commented Feb 1, 2023 •

edited

webkit-early-warning-system commented Feb 3, 2023 •

edited

webkit-early-warning-system commented Feb 3, 2023 •

edited

webkit-commit-queue commented Feb 3, 2023

Port remaining WebCore/loader types to the new serialization format #9383

Port remaining WebCore/loader types to the new serialization format #9383

Conversation

gavin-apple commented Jan 31, 2023 • edited by webkit-early-warning-system

148e18a

webkit-early-warning-system commented Jan 31, 2023 • edited

webkit-early-warning-system commented Jan 31, 2023 • edited

achristensen07 Feb 1, 2023

Choose a reason for hiding this comment

achristensen07 Feb 1, 2023

Choose a reason for hiding this comment

achristensen07 Feb 1, 2023

Choose a reason for hiding this comment

webkit-early-warning-system commented Feb 1, 2023 • edited

webkit-early-warning-system commented Feb 1, 2023 • edited

webkit-early-warning-system commented Feb 3, 2023 • edited

webkit-early-warning-system commented Feb 3, 2023 • edited

webkit-commit-queue commented Feb 3, 2023

gavin-apple commented Jan 31, 2023 •

edited by webkit-early-warning-system

`148e18a`

webkit-early-warning-system commented Jan 31, 2023 •

edited

webkit-early-warning-system commented Jan 31, 2023 •

edited

webkit-early-warning-system commented Feb 1, 2023 •

edited

webkit-early-warning-system commented Feb 1, 2023 •

edited

webkit-early-warning-system commented Feb 3, 2023 •

edited

webkit-early-warning-system commented Feb 3, 2023 •

edited