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

Unified Diff: Source/platform/geometry/IntSize.h

Issue 208333020: [Mac] Rely on science, not chance, to get the proper definition of the macro (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 months 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
« no previous file with comments | « Source/platform/geometry/IntRect.h ('k') | Source/web/mac/WebSubstringUtil.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/geometry/IntSize.h
diff --git a/Source/platform/geometry/IntSize.h b/Source/platform/geometry/IntSize.h
index 8b7a582ffe5c5df0e901427f7931823bc1469414..42a977973437b7f9670f13ccb8a0e8490c4f6d0a 100644
--- a/Source/platform/geometry/IntSize.h
+++ b/Source/platform/geometry/IntSize.h
@@ -32,10 +32,8 @@
#if OS(MACOSX)
typedef struct CGSize CGSize;
-#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
-typedef struct CGSize NSSize;
-#else
-typedef struct _NSSize NSSize;
+#ifdef __OBJC__
+#import <Foundation/Foundation.h>
#endif
#endif
@@ -118,7 +116,7 @@ public:
explicit IntSize(const CGSize&); // don't do this implicitly since it's lossy
operator CGSize() const;
-#if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
+#if defined(__OBJC__) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
explicit IntSize(const NSSize &); // don't do this implicitly since it's lossy
operator NSSize() const;
#endif
« no previous file with comments | « Source/platform/geometry/IntRect.h ('k') | Source/web/mac/WebSubstringUtil.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698