Source/platform/geometry/IntRect.h - Issue 208333020: [Mac] Rely on science, not chance, to get the proper definition of the macro

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/platform/geometry/IntRect.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

Index: Source/platform/geometry/IntRect.h

diff --git a/Source/platform/geometry/IntRect.h b/Source/platform/geometry/IntRect.h

index 5abb74e13e2a9325ca32d66e3028fbe4753c3f3a..43cd436c14c0a985d563df556e9758dc4088ed25 100644

--- a/Source/platform/geometry/IntRect.h

+++ b/Source/platform/geometry/IntRect.h

@@ -33,10 +33,8 @@

#if OS(MACOSX)

typedef struct CGRect CGRect;

-#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES

-typedef struct CGRect NSRect;

-#else

-typedef struct _NSRect NSRect;

+#ifdef __OBJC__

+#import <Foundation/Foundation.h>

#endif

@@ -154,7 +152,7 @@ public:

#if OS(MACOSX)

operator CGRect() const;

-#if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)

+#if defined(__OBJC__) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)

operator NSRect() const;

#endif

@@ -195,7 +193,7 @@ inline bool operator!=(const IntRect& a, const IntRect& b)

#if OS(MACOSX)

PLATFORM_EXPORT IntRect enclosingIntRect(const CGRect&);

-#if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)

+#if defined(__OBJC__) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)

PLATFORM_EXPORT IntRect enclosingIntRect(const NSRect&);

#endif

« no previous file with comments | « Source/platform/geometry/IntPoint.h ('k') | Source/platform/geometry/IntSize.h » ('j') | no next file with comments »