Allow invalid patterns for comparison; Make the compare method a order relation.

chrome/browser/content_settings/content_settings_pattern.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Patterns used in content setting rules.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PATTERN_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PATTERN_H_
 #pragma once
 
 #include <ostream>
 #include <string>
 
 #include "base/basictypes.h"
 
 class GURL;
 
 namespace content_settings {
 class PatternParser;
 }
 
 // A pattern used in content setting rules. See |IsValid| for a description of
 // possible patterns.
 class ContentSettingsPattern {
  public:
   // Each content settings pattern describes a set of origins. Patterns, and the
   // sets they describe, have specific relations. |Relation| describes the
   // relation of two patterns A and B. When pattern A is compared with pattern B
   // (A compare B) interessting relations are:

[Bernhard Bauer, 2011/06/02 18:39:29]

Nit: "interesting", while you're at it :-)

[markusheintz_, 2011/06/03 15:20:36]

Done.

-  // - IDENTITY : Pattern A and B are identical. The patterns are equal.
-  // - DISJOINT : Pattern A and B have no intersection. A and B never match
-  //              a the origin of a URL at the same time.
-  // - SUCCESSOR  : Pattern A and B have an intersection. But pattern B has a
-  //                higher precedence than pattern A for URLs that are matched
-  //                by both pattern.
-  // - PREDECESSOR : Pattern A and B have an intersection. But pattern A has a
-  //                 higher precedence than pattern B for URLs that are matched
-  //                 by both pattern.
+  // - IDENTITY :

[Bernhard Bauer, 2011/06/02 18:39:29]

Nit: no space before :

[markusheintz_, 2011/06/03 15:20:36]

Done. Also below.

+  //   Pattern A and B are identical. The patterns are equal.
+  //
+  // - DISJOINT_ORDER_PRE :
+  //   Pattern A and B have no intersection. A and B never match the origin of
+  //   a URL at the same time. But pattern A has a higher precedence than
+  //   pattern B when patterns are sorted.
+  //
+  // - DISJOINT_ORDER_POST :
+  //   Pattern A and B have no intersection. A and B never match the origin of
+  //   a URL at the same time. But pattern A has a lower precedence than
+  //   pattern B when patterns are sorted.
+  //
+  // - SUCCESSOR  :
+  //   Pattern A and B have an intersection. But pattern B has a higher
+  //   precedence than pattern A for URLs that are matched by both pattern.
+  //
+  // - PREDECESSOR :
+  //   Pattern A and B have an intersection. But pattern A has a higher
+  //   precedence than pattern B for URLs that are matched by both pattern.
   enum Relation {
-    DISJOINT = -2,
+    DISJOINT_ORDER_POST = -2,
     SUCCESSOR = -1,
     IDENTITY = 0,
     PREDECESSOR = 1,
+    DISJOINT_ORDER_PRE = 2,
   };
 
   class BuilderInterface {
    public:
     virtual ~BuilderInterface() {}
 
     virtual BuilderInterface* WithPort(const std::string& port) = 0;
 
     virtual BuilderInterface* WithPortWildcard() = 0;
 
@@ skipping 57 matching lines @@
   // True if |url| matches this pattern.
   bool Matches(const GURL& url) const;
 
   // Returns a std::string representation of this pattern.
   const std::string ToString() const;
 
   // Compares the pattern with a given |other| pattern and returns the
   // |Relation| of the two patterns.
   Relation Compare(const ContentSettingsPattern& other) const;
 
-  bool operator==(const ContentSettingsPattern& other) const {
-    return Compare(other) == IDENTITY;
-  }
+  // Returns true if the pattern and the |other| pattern are identical.
+  bool operator==(const ContentSettingsPattern& other) const;
+
+  // Returns true if the pattern has a lower priority than the |other| pattern.
+  bool operator<(const ContentSettingsPattern& other) const;
+
+  // Returns true if the pattern has a higher priority than the |other| pattern.
+  bool operator>(const ContentSettingsPattern& other) const;
 
  private:
   friend class content_settings::PatternParser;
   friend class ContentSettingsPatternParserTest_SerializePatterns_Test;
   friend class Builder;
 
   struct PatternParts {
     PatternParts();
     ~PatternParts();
 
@@ skipping 84 matching lines @@
 };
 
 // Stream operator so ContentSettingsPattern can be used in assertion
 // statements.
 inline std::ostream& operator<<(
     std::ostream& out, const ContentSettingsPattern& pattern) {
   return out << pattern.ToString();
 }
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PATTERN_H_