Attachment 340561 Details for Bug 185715 – Patch

[patch] Patch

bug-185715-20180517012520.patch (text/plain), 1.67 KB, created by Sihui Liu on 2018-05-17 01:25:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-05-17 01:25:20 PDT

Size: 1.67 KB

patch

obsolete

>Subversion Revision: 231849
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1adef6425cb6f8bf058ae5f9b2d00a707cd1ca8a..0a95e30c2bc5ac5ade65e9208c158b95133c3334 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-17  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Conversion between SecurityOriginData and DatabaseIdentifier is asymmetric when port is null
>+        https://bugs.webkit.org/show_bug.cgi?id=185715
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fixed the issue in conversion between SecurityOriginData and DatabaseIdentifier.
>+ 
>+        * page/SecurityOriginData.cpp:
>+        (WebCore::SecurityOriginData::fromDatabaseIdentifier):
>+
> 2018-05-16  Chris Nardi  <cnardi@chromium.org>
> 
>         Remove Document#selectedStylesheetSet/preferredStylesheetSet
>diff --git a/Source/WebCore/page/SecurityOriginData.cpp b/Source/WebCore/page/SecurityOriginData.cpp
>index 2aac8ee8d3bdb0b5add8631505450264c1c27592..632a2233781eba8653da2d6eae0f29f877caa4f4 100644
>--- a/Source/WebCore/page/SecurityOriginData.cpp
>+++ b/Source/WebCore/page/SecurityOriginData.cpp
>@@ -114,6 +114,9 @@ std::optional<SecurityOriginData> SecurityOriginData::fromDatabaseIdentifier(con
>     if (port < 0 || port > std::numeric_limits<uint16_t>::max())
>         return std::nullopt;
>     
>+    if (!port)
>+        return SecurityOriginData {databaseIdentifier.substring(0, separator1), databaseIdentifier.substring(separator1 + 1, separator2 - separator1 - 1), std::nullopt};
>+    
>     return SecurityOriginData {databaseIdentifier.substring(0, separator1), databaseIdentifier.substring(separator1 + 1, separator2 - separator1 - 1), static_cast<uint16_t>(port)};
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185715: 340561 | 340672 | 340716