Changeset 205881 in webkit


Ignore:
Timestamp:
Sep 13, 2016 2:56:55 PM (8 years ago)
Author:
Brent Fulgham
Message:

[Win] Unreviewed build fix.

Based on a suggestion by Simon Fraser, I have corrected the
headers to avoid including <d2d1.h> directly, relying instead
on forward declarations.

  • platform/graphics/FloatPoint.h:
  • platform/graphics/FloatRect.h:
  • platform/graphics/FloatSize.h:
  • platform/graphics/IntPoint.h:
  • platform/graphics/IntRect.h:
  • platform/graphics/IntSize.h:
  • platform/graphics/transforms/AffineTransform.h:
  • platform/graphics/transforms/TransformationMatrix.h:
Location:
trunk/Source/WebCore
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r205877 r205881  
     12016-09-13  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Unreviewed build fix.
     4
     5        Based on a suggestion by Simon Fraser, I have corrected the
     6        headers to avoid including <d2d1.h> directly, relying instead
     7        on forward declarations.
     8
     9        * platform/graphics/FloatPoint.h:
     10        * platform/graphics/FloatRect.h:
     11        * platform/graphics/FloatSize.h:
     12        * platform/graphics/IntPoint.h:
     13        * platform/graphics/IntRect.h:
     14        * platform/graphics/IntSize.h:
     15        * platform/graphics/transforms/AffineTransform.h:
     16        * platform/graphics/transforms/TransformationMatrix.h:
     17
    1182016-09-13  Said Abou-Hallawa  <sabouhallawa@apple.com>
    219

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

    r205871 r205881  
    11/*
    2  * Copyright (C) 2004, 2006, 2007 Apple Inc.  All rights reserved.
     2 * Copyright (C) 2004-2016 Apple Inc.  All rights reserved.
    33 * Copyright (C) 2005 Nokia.  All rights reserved.
    44 *
    … …  
    4949
    5050#if PLATFORM(WIN)
    51 #include <d2d1.h>
     51struct D2D_POINT_2F;
     52typedef D2D_POINT_2F D2D1_POINT_2F;
    5253#endif
    5354
    … …  
    154155
    155156#if PLATFORM(WIN)
    156     WEBCORE_EXPORT FloatPoint(const D2D_POINT_2F&);
    157     WEBCORE_EXPORT operator D2D_POINT_2F() const;
     157    WEBCORE_EXPORT FloatPoint(const D2D1_POINT_2F&);
     158    WEBCORE_EXPORT operator D2D1_POINT_2F() const;
    158159#endif
    159160

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

    r205871 r205881  
    11/*
    2  * Copyright (C) 2003, 2006, 2007 Apple Inc.  All rights reserved.
     2 * Copyright (C) 2003-2016 Apple Inc.  All rights reserved.
    33 * Copyright (C) 2005 Nokia.  All rights reserved.
    44 *
    … …  
    4747
    4848#if PLATFORM(WIN)
    49 #include <d2d1.h>
     49struct D2D_RECT_F;
     50typedef D2D_RECT_F D2D1_RECT_F;
    5051#endif
    5152

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

    r205871 r205881  
    11/*
    2  * Copyright (C) 2003, 2006 Apple Inc.  All rights reserved.
     2 * Copyright (C) 2003-2016 Apple Inc.  All rights reserved.
    33 * Copyright (C) 2005 Nokia.  All rights reserved.
    44 *               2008 Eric Seidel <eric@webkit.org>
    … …  
    4949
    5050#if PLATFORM(WIN)
    51 #include <d2d1.h>
     51struct D2D_SIZE_F;
     52typedef D2D_SIZE_F D2D1_SIZE_F;
    5253#endif
    5354

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

    r205871 r205881  
    3434#endif
    3535
    36 #if PLATFORM(WIN)
    37 #include <d2d1.h>
    38 #endif
    39 
    4036#if USE(CG)
    4137typedef struct CGPoint CGPoint;
    … …  
    5652typedef struct tagPOINT POINT;
    5753typedef struct tagPOINTS POINTS;
     54
     55struct D2D_POINT_2U;
     56typedef D2D_POINT_2U D2D1_POINT_2U;
     57
     58struct D2D_POINT_2F;
     59typedef D2D_POINT_2F D2D1_POINT_2F;
    5860#endif
    5961

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

    r205871 r205881  
    3030#include "LayoutUnit.h"
    3131
    32 #if PLATFORM(WIN)
    33 #include <d2d1.h>
    34 #endif
    35 
    3632#if USE(CG)
    3733typedef struct CGRect CGRect;
    … …  
    5450#if PLATFORM(WIN)
    5551typedef struct tagRECT RECT;
     52
     53struct D2D_RECT_U;
     54typedef D2D_RECT_U D2D1_RECT_U;
     55
     56struct D2D_RECT_F;
     57typedef D2D_RECT_F D2D1_RECT_F;
    5658#endif
    5759

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

    r205871 r205881  
    11/*
    2  * Copyright (C) 2003, 2004, 2005, 2006 Apple Inc.  All rights reserved.
     2 * Copyright (C) 2003-2016 Apple Inc.  All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3434#endif
    3535
    36 #if PLATFORM(WIN)
    37 #include <d2d1.h>
    38 #endif
    39 
    4036#if USE(CG)
    4137typedef struct CGSize CGSize;
    … …  
    5854#if PLATFORM(WIN)
    5955typedef struct tagSIZE SIZE;
     56
     57struct D2D_SIZE_U;
     58typedef D2D_SIZE_U D2D1_SIZE_U;
     59
     60struct D2D_SIZE_F;
     61typedef D2D_SIZE_F D2D1_SIZE_F;
    6062#endif
    6163

  • trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h

    r205871 r205881  
    4040
    4141#if PLATFORM(WIN)
    42 typedef struct D2D_MATRIX_3X2_F D2D_MATRIX_3X2_F;
     42struct D2D_MATRIX_3X2_F;
    4343typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
    4444#endif

  • trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

    r205871 r205881  
    11/*
    2  * Copyright (C) 2005, 2006 Apple Inc.  All rights reserved.
     2 * Copyright (C) 2005-2016 Apple Inc.  All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5252
    5353#if PLATFORM(WIN)
    54 typedef struct D2D_MATRIX_3X2_F D2D_MATRIX_3X2_F;
     54struct D2D_MATRIX_3X2_F;
    5555typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
    5656#endif
Note: See TracChangeset for help on using the changeset viewer.