Diff
Modified: trunk/Source/WebCore/ChangeLog (128084 => 128085)
--- trunk/Source/WebCore/ChangeLog 2012-09-10 18:41:05 UTC (rev 128084)
+++ trunk/Source/WebCore/ChangeLog 2012-09-10 18:49:07 UTC (rev 128085)
@@ -1,3 +1,23 @@
+2012-09-10 Catalin Badea <[email protected]>
+
+ webkit build for 64-bit Mac chromium
+ https://bugs.webkit.org/show_bug.cgi?id=95977
+
+ Reviewed by Eric Seidel.
+
+ Use the correct definitions for NS types in order to fix build issues for 64-bit chromium on mac.
+
+ * platform/chromium/PlatformSupport.h:
+ Remove a deprecated Carbon typedef.
+ * platform/graphics/FloatPoint.h:
+ (FloatPoint):
+ * platform/graphics/FloatRect.h:
+ (FloatRect):
+ * platform/graphics/FloatSize.h:
+ (FloatSize):
+ * platform/graphics/IntRect.h:
+ (IntRect):
+
2012-09-10 Hans Muller <[email protected]>
[CSS Exlusions] add support for the basic shapes
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (128084 => 128085)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-09-10 18:41:05 UTC (rev 128084)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-09-10 18:49:07 UTC (rev 128085)
@@ -51,7 +51,6 @@
#if OS(DARWIN)
typedef struct CGFont* CGFontRef;
-typedef uintptr_t ATSFontContainerRef;
#ifdef __OBJC__
@class NSFont;
#else
Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (128084 => 128085)
--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2012-09-10 18:41:05 UTC (rev 128084)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2012-09-10 18:49:07 UTC (rev 128085)
@@ -154,8 +154,8 @@
operator CGPoint() const;
#endif
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
- || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
+ && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
FloatPoint(const NSPoint&);
operator NSPoint() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (128084 => 128085)
--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2012-09-10 18:41:05 UTC (rev 128084)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2012-09-10 18:49:07 UTC (rev 128085)
@@ -199,8 +199,8 @@
operator CGRect() const;
#endif
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
- || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
+ && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
FloatRect(const NSRect&);
operator NSRect() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (128084 => 128085)
--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2012-09-10 18:41:05 UTC (rev 128084)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2012-09-10 18:49:07 UTC (rev 128085)
@@ -135,8 +135,9 @@
operator CGSize() const;
#endif
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
- || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(QT) && USE(QTKIT))
+#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
+ && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) \
+ || (PLATFORM(QT) && USE(QTKIT))
explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
operator NSSize() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (128084 => 128085)
--- trunk/Source/WebCore/platform/graphics/IntRect.h 2012-09-10 18:41:05 UTC (rev 128084)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2012-09-10 18:49:07 UTC (rev 128085)
@@ -231,8 +231,9 @@
operator SkIRect() const;
#endif
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
- || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(QT) && USE(QTKIT))
+#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
+ && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) \
+ || (PLATFORM(QT) && USE(QTKIT))
operator NSRect() const;
#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (128084 => 128085)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-10 18:41:05 UTC (rev 128084)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-10 18:49:07 UTC (rev 128085)
@@ -1,3 +1,15 @@
+2012-09-10 Catalin Badea <[email protected]>
+
+ webkit build for 64-bit Mac chromium
+ https://bugs.webkit.org/show_bug.cgi?id=95977
+
+ Reviewed by Eric Seidel.
+
+ Ensure header completeness and use the correct include order. This fixes a compilation issues noticeable when building chromium for 64-bit Mac.
+
+ * public/mac/WebSubstringUtil.h:
+ * src/mac/WebSubstringUtil.mm:
+
2012-09-10 Adrienne Walker <[email protected]>
[chromium] Fix deadlock between WebMediaPlayerClientImpl dtor and PutCurrentFrame
Modified: trunk/Source/WebKit/chromium/public/mac/WebSubstringUtil.h (128084 => 128085)
--- trunk/Source/WebKit/chromium/public/mac/WebSubstringUtil.h 2012-09-10 18:41:05 UTC (rev 128084)
+++ trunk/Source/WebKit/chromium/public/mac/WebSubstringUtil.h 2012-09-10 18:49:07 UTC (rev 128085)
@@ -31,6 +31,8 @@
#ifndef WebSubstringUtil_h
#define WebSubstringUtil_h
+#include "../platform/WebCommon.h"
+
namespace WebKit {
class WebFrame;
}
Modified: trunk/Source/WebKit/chromium/src/mac/WebSubstringUtil.mm (128084 => 128085)
--- trunk/Source/WebKit/chromium/src/mac/WebSubstringUtil.mm 2012-09-10 18:41:05 UTC (rev 128084)
+++ trunk/Source/WebKit/chromium/src/mac/WebSubstringUtil.mm 2012-09-10 18:49:07 UTC (rev 128085)
@@ -30,9 +30,10 @@
*/
#include "config.h"
-#include "WebFrameImpl.h"
#include "WebSubstringUtil.h"
+#import <Cocoa/Cocoa.h>
+
#include "ColorMac.h"
#include "Document.h"
#include "Element.h"
@@ -45,10 +46,9 @@
#include "RenderObject.h"
#include "RenderStyle.h"
#include "TextIterator.h"
+#include "WebFrameImpl.h"
#include "platform/WebRect.h"
-#import <Cocoa/Cocoa.h>
-
using namespace WebCore;
namespace WebKit {
