Source/WebCore/platform/graphics/IntPoint.h - Issue 7044088: Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org>

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/WebCore/platform/graphics/IntPoint.h

Issue 7044088: Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/

Patch Set: Created 9 years, 6 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/WebCore/platform/graphics/IntPoint.h

===================================================================

--- Source/WebCore/platform/graphics/IntPoint.h (revision 88458)

+++ Source/WebCore/platform/graphics/IntPoint.h (working copy)

@@ -37,7 +37,7 @@

#endif

-#if PLATFORM(MAC)

+#if OS(DARWIN)

#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES

typedef struct CGPoint NSPoint;

#else

@@ -120,7 +120,7 @@

operator CGPoint() const;

#endif

-#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)

+#if OS(DARWIN) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)

explicit IntPoint(const NSPoint&); // don't do this implicitly since it's lossy

operator NSPoint() const;

#endif

« no previous file with comments | « Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm ('k') | no next file » | no next file with comments »