webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 13 insertions, 6 deletions

diff --git a/Source/WebCore/page/OriginAccessEntry.h b/Source/WebCore/page/OriginAccessEntry.h
index 183600bde..f55f7d938 100644
--- a/Source/WebCore/page/OriginAccessEntry.h
+++ b/Source/WebCore/page/OriginAccessEntry.h
@@ -28,8 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef OriginAccessEntry_h
-#define OriginAccessEntry_h
+#pragma once
 
 #include <wtf/text/WTFString.h>
 
@@ -44,24 +43,34 @@ public:
         DisallowSubdomains
     };
 
+    enum IPAddressSetting {
+        TreatIPAddressAsDomain,
+        TreatIPAddressAsIPAddress
+    };
+
     // If host is empty string and SubdomainSetting is AllowSubdomains, the entry will match all domains in the specified protocol.
-    OriginAccessEntry(const String& protocol, const String& host, SubdomainSetting);
+    OriginAccessEntry(const String& protocol, const String& host, SubdomainSetting, IPAddressSetting);
     bool matchesOrigin(const SecurityOrigin&) const;
 
     const String& protocol() const { return m_protocol; }
     const String& host() const { return m_host; }
     SubdomainSetting subdomainSettings() const { return m_subdomainSettings; }
+    IPAddressSetting ipAddressSettings() const { return m_ipAddressSettings; }
 
 private:
     String m_protocol;
     String m_host;
     SubdomainSetting m_subdomainSettings;
+    IPAddressSetting m_ipAddressSettings;
     bool m_hostIsIPAddress;
 };
 
 inline bool operator==(const OriginAccessEntry& a, const OriginAccessEntry& b)
 {
-    return equalIgnoringCase(a.protocol(), b.protocol()) && equalIgnoringCase(a.host(), b.host()) && a.subdomainSettings() == b.subdomainSettings();
+    return equalIgnoringASCIICase(a.protocol(), b.protocol())
+        && equalIgnoringASCIICase(a.host(), b.host())
+        && a.subdomainSettings() == b.subdomainSettings()
+        && a.ipAddressSettings() == b.ipAddressSettings();
 }
 
 inline bool operator!=(const OriginAccessEntry& a, const OriginAccessEntry& b)
@@ -70,5 +79,3 @@ inline bool operator!=(const OriginAccessEntry& a, const OriginAccessEntry& b)
 }
 
 } // namespace WebCore
-
-#endif // OriginAccessEntry_h