Changeset 128085 in webkit


Ignore:
Timestamp:
Sep 10, 2012 11:49:07 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

webkit build for 64-bit Mac chromium
​https://bugs.webkit.org/show_bug.cgi?id=95977

Patch by Catalin Badea <​badea@adobe.com> on 2012-09-10
Reviewed by Eric Seidel.

Source/WebCore:

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):

Source/WebKit/chromium:

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:
Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r128083 r128085  
     12012-09-10  Catalin Badea  <badea@adobe.com>
     2
     3        webkit build for 64-bit Mac chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=95977
     5
     6        Reviewed by Eric Seidel.
     7
     8        Use the correct definitions for NS types in order to fix build issues for 64-bit chromium on mac.
     9
     10        * platform/chromium/PlatformSupport.h:
     11        Remove a deprecated Carbon typedef.
     12        * platform/graphics/FloatPoint.h:
     13        (FloatPoint):
     14        * platform/graphics/FloatRect.h:
     15        (FloatRect):
     16        * platform/graphics/FloatSize.h:
     17        (FloatSize):
     18        * platform/graphics/IntRect.h:
     19        (IntRect):
     20
    1212012-09-10  Hans Muller  <hmuller@adobe.com>
    222

  • trunk/Source/WebCore/platform/chromium/PlatformSupport.h

    r127623 r128085  
    5252#if OS(DARWIN)
    5353typedef struct CGFont* CGFontRef;
    54 typedef uintptr_t ATSFontContainerRef;
    5554#ifdef __OBJC__
    5655@class NSFont;

  • trunk/Source/WebCore/platform/graphics/FloatPoint.h

    r125167 r128085  
    155155#endif
    156156
    157 #if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
    158         || (PLATFORM(CHROMIUM) && OS(DARWIN))
     157#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
     158        && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    159159    FloatPoint(const NSPoint&);
    160160    operator NSPoint() const;

  • trunk/Source/WebCore/platform/graphics/FloatRect.h

    r114548 r128085  
    200200#endif
    201201
    202 #if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
    203         || (PLATFORM(CHROMIUM) && OS(DARWIN))
     202#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
     203        && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    204204    FloatRect(const NSRect&);
    205205    operator NSRect() const;

  • trunk/Source/WebCore/platform/graphics/FloatSize.h

    r125167 r128085  
    136136#endif
    137137
    138 #if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
    139         || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(QT) && USE(QTKIT))
     138#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
     139        && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) \
     140        || (PLATFORM(QT) && USE(QTKIT))
    140141    explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
    141142    operator NSSize() const;

  • trunk/Source/WebCore/platform/graphics/IntRect.h

    r113466 r128085  
    232232#endif
    233233
    234 #if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
    235         || (PLATFORM(CHROMIUM) && OS(DARWIN))  || (PLATFORM(QT) && USE(QTKIT))
     234#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
     235        && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) \
     236        || (PLATFORM(QT) && USE(QTKIT))
    236237    operator NSRect() const;
    237238#endif

  • trunk/Source/WebKit/chromium/ChangeLog

    r128082 r128085  
     12012-09-10  Catalin Badea  <badea@adobe.com>
     2
     3        webkit build for 64-bit Mac chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=95977
     5
     6        Reviewed by Eric Seidel.
     7
     8        Ensure header completeness and use the correct include order. This fixes a compilation issues noticeable when building chromium for 64-bit Mac.
     9
     10        * public/mac/WebSubstringUtil.h:
     11        * src/mac/WebSubstringUtil.mm:
     12
    1132012-09-10  Adrienne Walker  <enne@google.com>
    214

  • trunk/Source/WebKit/chromium/public/mac/WebSubstringUtil.h

    r95901 r128085  
    3232#define WebSubstringUtil_h
    3333
     34#include "../platform/WebCommon.h"
     35
    3436namespace WebKit {
    3537class WebFrame;

  • trunk/Source/WebKit/chromium/src/mac/WebSubstringUtil.mm

    r126359 r128085  
    3131
    3232#include "config.h"
    33 #include "WebFrameImpl.h"
    3433#include "WebSubstringUtil.h"
     34
     35#import <Cocoa/Cocoa.h>
    3536
    3637#include "ColorMac.h"
    … …  
    4647#include "RenderStyle.h"
    4748#include "TextIterator.h"
     49#include "WebFrameImpl.h"
    4850#include "platform/WebRect.h"
    49 
    50 #import <Cocoa/Cocoa.h>
    5151
    5252using namespace WebCore;
Note: See TracChangeset for help on using the changeset viewer.