Implemented port filter for URLMatcher

chrome/browser/extensions/api/declarative/url_matcher.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/extensions/api/declarative/url_matcher.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 385 matching lines @@
     : filters_(filters) {}
 
 URLMatcherSchemeFilter::~URLMatcherSchemeFilter() {}
 
 bool URLMatcherSchemeFilter::IsMatch(const GURL& url) const {
   return std::find(filters_.begin(), filters_.end(), url.scheme()) !=
       filters_.end();
 }
 
 //
+// URLMatcherPortFilter
+//
+
+URLMatcherPortFilter::URLMatcherPortFilter(
+    const std::vector<URLMatcherPortFilter::Range>& ranges)
+    : ranges_(ranges) {}
+
+URLMatcherPortFilter::~URLMatcherPortFilter() {}
+
+bool URLMatcherPortFilter::IsMatch(const GURL& url) const {
+  int port = url.EffectiveIntPort();
+  for (std::vector<Range>::const_iterator i = ranges_.begin();
+       i != ranges_.end(); ++i) {
+    if (i->first <= port && port <= i->second)
+      return true;
+  }
+  return false;
+}
+
+// static
+URLMatcherPortFilter::Range URLMatcherPortFilter::CreateRange(int from,
+                                                              int to) {
+  return Range(from, to);
+}
+
+// static
+URLMatcherPortFilter::Range URLMatcherPortFilter::CreateRange(int port) {
+  return Range(port, port);
+}
+
+//
 // URLMatcherConditionSet
 //
 
 URLMatcherConditionSet::~URLMatcherConditionSet() {}
 
 URLMatcherConditionSet::URLMatcherConditionSet(
     ID id,
     const Conditions& conditions)
     : id_(id),
       conditions_(conditions) {}
 
 URLMatcherConditionSet::URLMatcherConditionSet(
     ID id,
     const Conditions& conditions,
-    scoped_ptr<URLMatcherSchemeFilter> scheme_filter)
+    scoped_ptr<URLMatcherSchemeFilter> scheme_filter,
+    scoped_ptr<URLMatcherPortFilter> port_filter)
     : id_(id),
       conditions_(conditions),
-      scheme_filter_(scheme_filter.Pass()) {}
+      scheme_filter_(scheme_filter.Pass()),
+      port_filter_(port_filter.Pass()) {}
 
 bool URLMatcherConditionSet::IsMatch(
     const std::set<SubstringPattern::ID>& matching_substring_patterns,
     const GURL& url) const {
   for (Conditions::const_iterator i = conditions_.begin();
        i != conditions_.end(); ++i) {
     if (!i->IsMatch(matching_substring_patterns, url))
       return false;
   }
   if (scheme_filter_.get() && !scheme_filter_->IsMatch(url))
     return false;
+  if (port_filter_.get() && !port_filter_->IsMatch(url))
+    return false;
   return true;
 }
 
 
 //
 // URLMatcher
 //
 
 URLMatcher::URLMatcher() {}
 
@@ skipping 190 matching lines @@
 }
 
 void URLMatcher::UpdateInternalDatastructures() {
   UpdateSubstringSetMatcher(false);
   UpdateSubstringSetMatcher(true);
   UpdateTriggers();
   UpdateConditionFactory();
 }
 
 }  // namespace extensions