Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Unified Diff: sky/engine/platform/geometry/IntRect.h

Issue 709603006: Remove a bunch of OS(MACOSX) code (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Even more Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/platform/geometry/IntRect.h
diff --git a/sky/engine/platform/geometry/IntRect.h b/sky/engine/platform/geometry/IntRect.h
index 2597c9a5949bf6f4caa46e992c96081646b9fdd4..6ee31aa288a61aa47708b7f406321b31c42e710e 100644
--- a/sky/engine/platform/geometry/IntRect.h
+++ b/sky/engine/platform/geometry/IntRect.h
@@ -31,14 +31,6 @@
#include "wtf/Vector.h"
#include "wtf/VectorTraits.h"
-#if OS(MACOSX)
-typedef struct CGRect CGRect;
-
-#ifdef __OBJC__
-#import <Foundation/Foundation.h>
-#endif
-#endif
-
struct SkRect;
struct SkIRect;
@@ -151,13 +143,6 @@ public:
IntRect transposedRect() const { return IntRect(m_location.transposedPoint(), m_size.transposedSize()); }
-#if OS(MACOSX)
- operator CGRect() const;
-#if defined(__OBJC__) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
- operator NSRect() const;
-#endif
-#endif
-
operator SkRect() const;
operator SkIRect() const;
@@ -197,13 +182,6 @@ inline bool operator!=(const IntRect& a, const IntRect& b)
return a.location() != b.location() || a.size() != b.size();
}
-#if OS(MACOSX)
-PLATFORM_EXPORT IntRect enclosingIntRect(const CGRect&);
-#if defined(__OBJC__) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
-PLATFORM_EXPORT IntRect enclosingIntRect(const NSRect&);
-#endif
-#endif
-
} // namespace blink
WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::IntRect);

Powered by Google App Engine
This is Rietveld 408576698