third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp - Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize

Side by Side Diff: third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/weborigin/DatabaseIdentifier.cpp ('k') | third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2007 Apple Inc. All rights reserved.	2 * Copyright (C) 2007 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 18 matching lines...) Expand all Loading...
29 #include "platform/weborigin/SecurityOrigin.h"	29 #include "platform/weborigin/SecurityOrigin.h"

30	30

31 #include "platform/RuntimeEnabledFeatures.h"	31 #include "platform/RuntimeEnabledFeatures.h"

32 #include "platform/weborigin/KURL.h"	32 #include "platform/weborigin/KURL.h"

33 #include "platform/weborigin/KnownPorts.h"	33 #include "platform/weborigin/KnownPorts.h"

34 #include "platform/weborigin/SchemeRegistry.h"	34 #include "platform/weborigin/SchemeRegistry.h"

35 #include "platform/weborigin/SecurityOriginCache.h"	35 #include "platform/weborigin/SecurityOriginCache.h"

36 #include "platform/weborigin/SecurityPolicy.h"	36 #include "platform/weborigin/SecurityPolicy.h"

37 #include "url/url_canon_ip.h"	37 #include "url/url_canon_ip.h"

38 #include "wtf/HexNumber.h"	38 #include "wtf/HexNumber.h"

39 #include "wtf/MainThread.h"

40 #include "wtf/NotFound.h"	39 #include "wtf/NotFound.h"

41 #include "wtf/OwnPtr.h"	40 #include "wtf/OwnPtr.h"

42 #include "wtf/PassOwnPtr.h"	41 #include "wtf/PassOwnPtr.h"

43 #include "wtf/StdLibExtras.h"	42 #include "wtf/StdLibExtras.h"

44 #include "wtf/text/StringBuilder.h"	43 #include "wtf/text/StringBuilder.h"

45	44

46 namespace blink {	45 namespace blink {

47	46

48 const int InvalidPort = 0;	47 const int InvalidPort = 0;

49 const int MaxAllowedPort = 65535;	48 const int MaxAllowedPort = 65535;

(...skipping 526 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
576 m_blockLocalAccessFromLocalOrigin = privilegeData->m_blockLocalAccessFromLoc alOrigin;	575 m_blockLocalAccessFromLocalOrigin = privilegeData->m_blockLocalAccessFromLoc alOrigin;

577 }	576 }

578	577

579 void SecurityOrigin::setUniqueOriginIsPotentiallyTrustworthy(bool isUniqueOrigin PotentiallyTrustworthy)	578 void SecurityOrigin::setUniqueOriginIsPotentiallyTrustworthy(bool isUniqueOrigin PotentiallyTrustworthy)

580 {	579 {

581 ASSERT(!isUniqueOriginPotentiallyTrustworthy \|\| isUnique());	580 ASSERT(!isUniqueOriginPotentiallyTrustworthy \|\| isUnique());

582 m_isUniqueOriginPotentiallyTrustworthy = isUniqueOriginPotentiallyTrustworth y;	581 m_isUniqueOriginPotentiallyTrustworthy = isUniqueOriginPotentiallyTrustworth y;

583 }	582 }

584	583

585 } // namespace blink	584 } // namespace blink

OLD	NEW