summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/platform/weborigin/kurl.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 16:23:34 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:37:21 +0000
commit38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch)
treec4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/third_party/blink/renderer/platform/weborigin/kurl.cc
parente684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff)
downloadqtwebengine-chromium-38a9a29f4f9436cace7f0e7abf9c586057df8a4e.tar.gz
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/weborigin/kurl.cc')
-rw-r--r--chromium/third_party/blink/renderer/platform/weborigin/kurl.cc32
1 files changed, 26 insertions, 6 deletions
diff --git a/chromium/third_party/blink/renderer/platform/weborigin/kurl.cc b/chromium/third_party/blink/renderer/platform/weborigin/kurl.cc
index 19f14390353..40dfe3587eb 100644
--- a/chromium/third_party/blink/renderer/platform/weborigin/kurl.cc
+++ b/chromium/third_party/blink/renderer/platform/weborigin/kurl.cc
@@ -619,14 +619,11 @@ void KURL::SetPath(const String& path) {
ReplaceComponents(replacements);
}
-String DecodeURLEscapeSequences(const String& string,
- DecodeURLResult* optional_result) {
+String DecodeURLEscapeSequences(const String& string, DecodeURLMode mode) {
StringUTF8Adaptor string_utf8(string);
url::RawCanonOutputT<base::char16> unescaped;
- DecodeURLResult result = url::DecodeURLEscapeSequences(
- string_utf8.Data(), string_utf8.length(), &unescaped);
- if (optional_result)
- *optional_result = result;
+ url::DecodeURLEscapeSequences(string_utf8.Data(), string_utf8.length(), mode,
+ &unescaped);
return StringImpl::Create8BitIfPossible(
reinterpret_cast<UChar*>(unescaped.data()), unescaped.length());
}
@@ -877,5 +874,28 @@ KURL::operator GURL() const {
StringUTF8Adaptor utf8(string_);
return GURL(utf8.Data(), utf8.length(), parsed_, is_valid_);
}
+bool operator==(const KURL& a, const KURL& b) {
+ return a.GetString() == b.GetString();
+}
+
+bool operator==(const KURL& a, const String& b) {
+ return a.GetString() == b;
+}
+
+bool operator==(const String& a, const KURL& b) {
+ return a == b.GetString();
+}
+
+bool operator!=(const KURL& a, const KURL& b) {
+ return a.GetString() != b.GetString();
+}
+
+bool operator!=(const KURL& a, const String& b) {
+ return a.GetString() != b;
+}
+
+bool operator!=(const String& a, const KURL& b) {
+ return a != b.GetString();
+}
} // namespace blink