Fixups post 83-merge for Windows

Change-Id: I5d5d1205874d7333377875ab4071740dc98c6ec7
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>

3 files changed, 18 insertions, 18 deletions

diff --git a/chromium/ppapi/cpp/point.h b/chromium/ppapi/cpp/point.h
index 028d050e7ad..9d2d87d14e5 100644
--- a/chromium/ppapi/cpp/point.h
+++ b/chromium/ppapi/cpp/point.h
@@ -291,15 +291,13 @@ class FloatPoint {
   PP_FloatPoint float_point_;
 };
 
-}  // namespace pp
-
 /// Determines whether the x and y values of two Points are equal.
 ///
 /// @param[in] lhs The Point on the left-hand side of the equation.
 /// @param[in] rhs The Point on the right-hand side of the equation.
 ///
 /// @return true if they are equal, false if unequal.
-inline bool operator==(const pp::Point& lhs, const pp::Point& rhs) {
+inline bool operator==(const Point& lhs, const Point& rhs) {
   return lhs.x() == rhs.x() && lhs.y() == rhs.y();
 }
 
@@ -310,7 +308,7 @@ inline bool operator==(const pp::Point& lhs, const pp::Point& rhs) {
 ///
 /// @return true if the coordinates of lhs are equal to the coordinates
 /// of rhs, otherwise false.
-inline bool operator!=(const pp::Point& lhs, const pp::Point& rhs) {
+inline bool operator!=(const Point& lhs, const Point& rhs) {
   return !(lhs == rhs);
 }
 
@@ -320,7 +318,7 @@ inline bool operator!=(const pp::Point& lhs, const pp::Point& rhs) {
 /// @param[in] rhs The Point on the right-hand side of the equation.
 ///
 /// @return true if they are equal, false if unequal.
-inline bool operator==(const pp::FloatPoint& lhs, const pp::FloatPoint& rhs) {
+inline bool operator==(const FloatPoint& lhs, const FloatPoint& rhs) {
   return lhs.x() == rhs.x() && lhs.y() == rhs.y();
 }
 
@@ -331,8 +329,10 @@ inline bool operator==(const pp::FloatPoint& lhs, const pp::FloatPoint& rhs) {
 ///
 /// @return true if the coordinates of lhs are equal to the coordinates
 /// of rhs, otherwise false.
-inline bool operator!=(const pp::FloatPoint& lhs, const pp::FloatPoint& rhs) {
+inline bool operator!=(const FloatPoint& lhs, const FloatPoint& rhs) {
   return !(lhs == rhs);
 }
 
+}  // namespace pp
+
 #endif  // PPAPI_CPP_POINT_H_
diff --git a/chromium/ppapi/cpp/rect.h b/chromium/ppapi/cpp/rect.h
index 7973a83d805..99a3a99db98 100644
--- a/chromium/ppapi/cpp/rect.h
+++ b/chromium/ppapi/cpp/rect.h
@@ -784,8 +784,6 @@ class FloatRect {
   PP_FloatRect rect_;
 };
 
-}  // namespace pp
-
 /// This function determines whether the x, y, width, and height values of two
 /// rectangles and are equal.
 ///
@@ -793,7 +791,7 @@ class FloatRect {
 /// @param[in] rhs The <code>Rect</code> on the right-hand side of the equation.
 ///
 /// @return true if they are equal, false if unequal.
-inline bool operator==(const pp::Rect& lhs, const pp::Rect& rhs) {
+inline bool operator==(const Rect& lhs, const Rect& rhs) {
   return lhs.x() == rhs.x() &&
          lhs.y() == rhs.y() &&
          lhs.width() == rhs.width() &&
@@ -807,7 +805,7 @@ inline bool operator==(const pp::Rect& lhs, const pp::Rect& rhs) {
 /// equation.
 ///
 /// @return true if the given Rects are equal, otherwise false.
-inline bool operator!=(const pp::Rect& lhs, const pp::Rect& rhs) {
+inline bool operator!=(const Rect& lhs, const Rect& rhs) {
   return !(lhs == rhs);
 }
 
@@ -820,7 +818,7 @@ inline bool operator!=(const pp::Rect& lhs, const pp::Rect& rhs) {
 /// equation.
 ///
 /// @return true if they are equal, false if unequal.
-inline bool operator==(const pp::FloatRect& lhs, const pp::FloatRect& rhs) {
+inline bool operator==(const FloatRect& lhs, const FloatRect& rhs) {
   return lhs.x() == rhs.x() &&
          lhs.y() == rhs.y() &&
          lhs.width() == rhs.width() &&
@@ -835,9 +833,11 @@ inline bool operator==(const pp::FloatRect& lhs, const pp::FloatRect& rhs) {
 /// equation.
 ///
 /// @return true if the given Rects are equal, otherwise false.
-inline bool operator!=(const pp::FloatRect& lhs, const pp::FloatRect& rhs) {
+inline bool operator!=(const FloatRect& lhs, const FloatRect& rhs) {
   return !(lhs == rhs);
 }
 
+}  // namespace pp
+
 #endif
 
diff --git a/chromium/ppapi/cpp/size.h b/chromium/ppapi/cpp/size.h
index e96b598b3f8..69e836a294b 100644
--- a/chromium/ppapi/cpp/size.h
+++ b/chromium/ppapi/cpp/size.h
@@ -279,8 +279,6 @@ class FloatSize {
   PP_FloatSize size_;
 };
 
-}  // namespace pp
-
 /// This function determines whether the width and height values of two sizes
 /// are equal.
 ///
@@ -289,7 +287,7 @@ class FloatSize {
 /// equation.
 ///
 /// @return true if they are equal, false if unequal.
-inline bool operator==(const pp::Size& lhs, const pp::Size& rhs) {
+inline bool operator==(const Size& lhs, const Size& rhs) {
   return lhs.width() == rhs.width() && lhs.height() == rhs.height();
 }
 
@@ -300,7 +298,7 @@ inline bool operator==(const pp::Size& lhs, const pp::Size& rhs) {
 ///
 /// @return true if the <code>Size</code> of lhs are equal to the
 /// <code>Size</code> of rhs, otherwise false.
-inline bool operator!=(const pp::Size& lhs, const pp::Size& rhs) {
+inline bool operator!=(const Size& lhs, const Size& rhs) {
   return !(lhs == rhs);
 }
 
@@ -313,7 +311,7 @@ inline bool operator!=(const pp::Size& lhs, const pp::Size& rhs) {
 /// equation.
 ///
 /// @return true if they are equal, false if unequal.
-inline bool operator==(const pp::FloatSize& lhs, const pp::FloatSize& rhs) {
+inline bool operator==(const FloatSize& lhs, const FloatSize& rhs) {
   return lhs.width() == rhs.width() && lhs.height() == rhs.height();
 }
 
@@ -326,9 +324,11 @@ inline bool operator==(const pp::FloatSize& lhs, const pp::FloatSize& rhs) {
 ///
 /// @return true if the <code>FloatSize</code> of lhs are equal to the
 /// <code>FloatSize</code> of rhs, otherwise false.
-inline bool operator!=(const pp::FloatSize& lhs, const pp::FloatSize& rhs) {
+inline bool operator!=(const FloatSize& lhs, const FloatSize& rhs) {
   return !(lhs == rhs);
 }
 
+}  // namespace pp
+
 #endif  // PPAPI_CPP_SIZE_H_