Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org>

Source/WebCore/platform/graphics/IntPoint.h

 /*
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 19 matching lines @@
 
 #if PLATFORM(QT)
 #include <QDataStream>
 #endif
 
 #if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGPoint CGPoint;
 #endif
 
 
-#if PLATFORM(MAC)
+#if OS(DARWIN)
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGPoint NSPoint;
 #else
 typedef struct _NSPoint NSPoint;
 #endif
 #endif
 
 #if PLATFORM(WIN)
 typedef struct tagPOINT POINT;
 typedef struct tagPOINTS POINTS;
@@ skipping 62 matching lines @@
     IntPoint transposedPoint() const
     {
         return IntPoint(m_y, m_x);
     }
 
 #if USE(CG) || USE(SKIA_ON_MAC_CHROME)
     explicit IntPoint(const CGPoint&); // don't do this implicitly since it's lossy
     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
 
 #if PLATFORM(WIN)
     IntPoint(const POINT&);
     operator POINT() const;
     IntPoint(const POINTS&);
     operator POINTS() const;
 #elif PLATFORM(QT)
@@ skipping 95 matching lines @@
     stream >> x >> y;
     point.setX(x);
     point.setY(y);
     return stream;
 }
 #endif
 
 } // namespace WebCore
 
 #endif // IntPoint_h