Backed out changeset 31f15a3b5ce0 (bug 1321412)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 09 Dec 2016 22:27:15 +0100
changeset 325562 7121735f6c766a3bcc3169c83681074b8005b763
parent 325561 3141d9e9e6349d4db3929f06e1373c42fa97d937
child 325563 284e73444c60dfcff0dcfcd4bd45a3c248a7b8ec
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
bugs1321412
milestone53.0a1
backs out31f15a3b5ce0e02ce66d7ed04fa6055853749d20
Backed out changeset 31f15a3b5ce0 (bug 1321412)
gfx/2d/BaseSize.h
--- a/gfx/2d/BaseSize.h
+++ b/gfx/2d/BaseSize.h
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef MOZILLA_GFX_BASESIZE_H_
 #define MOZILLA_GFX_BASESIZE_H_
 
-#include <algorithm>
 #include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace gfx {
 
 /**
  * Do not use this class directly. Subclass it, pass that subclass as the
  * Sub parameter, and only use that subclass. This allows methods to safely
@@ -88,24 +87,14 @@ struct BaseSize {
   }
 
   Sub operator*(const Sub& aSize) const {
     return Sub(width * aSize.width, height * aSize.height);
   }
   Sub operator/(const Sub& aSize) const {
     return Sub(width / aSize.width, height / aSize.height);
   }
-
-  friend Sub Min(const Sub& aA, const Sub& aB) {
-    return Sub(std::min(aA.width, aB.width),
-               std::min(aA.height, aB.height));
-  }
-
-  friend Sub Max(const Sub& aA, const Sub& aB) {
-    return Sub(std::max(aA.width, aB.width),
-               std::max(aA.height, aB.height));
-  }
 };
 
 } // namespace gfx
 } // namespace mozilla
 
 #endif /* MOZILLA_GFX_BASESIZE_H_ */