diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/page/SecurityOriginHash.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/page/SecurityOriginHash.h')
| -rw-r--r-- | Source/WebCore/page/SecurityOriginHash.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/WebCore/page/SecurityOriginHash.h b/Source/WebCore/page/SecurityOriginHash.h index 9886c7d04..ee2572c5a 100644 --- a/Source/WebCore/page/SecurityOriginHash.h +++ b/Source/WebCore/page/SecurityOriginHash.h @@ -10,7 +10,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -26,8 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SecurityOriginHash_h -#define SecurityOriginHash_h +#pragma once #include "URL.h" #include "SecurityOrigin.h" @@ -41,7 +40,7 @@ struct SecurityOriginHash { unsigned hashCodes[3] = { origin->protocol().impl() ? origin->protocol().impl()->hash() : 0, origin->host().impl() ? origin->host().impl()->hash() : 0, - origin->port() + origin->port().value_or(0) }; return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes); } @@ -54,7 +53,7 @@ struct SecurityOriginHash { { if (!a || !b) return a == b; - return a->isSameSchemeHostPort(b); + return a->isSameSchemeHostPort(*b); } static bool equal(SecurityOrigin* a, const RefPtr<SecurityOrigin>& b) { @@ -82,5 +81,3 @@ namespace WTF { }; } // namespace WTF - -#endif // SecurityOriginHash_h |