diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-05-14 11:47:27 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2019-07-18 08:37:12 +0000 |
| commit | f5613a4bc321972b8f72654d4c4bc9ba0c36ffbe (patch) | |
| tree | 5d87e517b64132f225750349ff0feb3e48650c83 | |
| parent | 8c03dab5f7a2c4ed511d33edb52fc64f1f9d5c26 (diff) | |
| download | qtwebengine-chromium-f5613a4bc321972b8f72654d4c4bc9ba0c36ffbe.tar.gz | |
FIXUP: Extend url library for WebEngine custom schemes
Fix blink::SecurityOrigin::ToString to match url::Origin::Serialize.
Task-number: QTBUG-75651
Change-Id: I46998fb0b4b9f7d537a3a99e2ee1fc5814bb9eec
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/blink/renderer/platform/weborigin/security_origin.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chromium/third_party/blink/renderer/platform/weborigin/security_origin.cc b/chromium/third_party/blink/renderer/platform/weborigin/security_origin.cc index d837884c9f0..cc3566a0a4e 100644 --- a/chromium/third_party/blink/renderer/platform/weborigin/security_origin.cc +++ b/chromium/third_party/blink/renderer/platform/weborigin/security_origin.cc @@ -559,6 +559,17 @@ String SecurityOrigin::ToRawString() const { } void SecurityOrigin::BuildRawString(StringBuilder& builder) const { + // NOTE(juvaldma)(Chromium 69.0.3497.128) + // + // Should match url::SchemeHostPort::Serialize(). + if (const url::CustomScheme* cs = url::CustomScheme::FindScheme(StringUTF8Adaptor(protocol_).AsStringPiece())) { + if (!cs->has_host_component()) { + builder.Append(protocol_); + builder.Append(":"); + return; + } + } + builder.Append(protocol_); builder.Append("://"); builder.Append(host_); |