Changeset 85501 in webkit


Ignore:
Timestamp:
May 2, 2011 12:11:17 PM (13 years ago)
Author:
weinig@apple.com
Message:

2011-05-02 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

Prune ApplicationServices.h out of the headers
​https://bugs.webkit.org/show_bug.cgi?id=59952

More forward declares are better.

  • html/canvas/CanvasRenderingContext2D.cpp:
  • html/canvas/CanvasRenderingContext2D.h:
  • platform/graphics/GlyphBuffer.h:
  • platform/graphics/cg/ImageBufferCG.cpp:
  • platform/graphics/cg/PDFDocumentImage.cpp:
  • platform/graphics/cg/PDFDocumentImage.h:
  • platform/graphics/mac/ComplexTextController.h:
  • platform/graphics/mac/ComplexTextControllerCoreText.cpp:
  • platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
  • platform/mac/ScrollAnimatorMac.h:
  • platform/mac/ScrollAnimatorMac.mm:
  • platform/mac/ScrollbarThemeMac.h:
  • platform/mac/ScrollbarThemeMac.mm:
  • platform/mac/WebCoreNSStringExtras.h:
  • platform/mac/WebCoreSystemInterface.h:
Location:
trunk/Source/WebCore
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r85499 r85501  
     12011-05-02  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Prune ApplicationServices.h out of the headers
     6        https://bugs.webkit.org/show_bug.cgi?id=59952
     7
     8        More forward declares are better.
     9
     10        * html/canvas/CanvasRenderingContext2D.cpp:
     11        * html/canvas/CanvasRenderingContext2D.h:
     12        * platform/graphics/GlyphBuffer.h:
     13        * platform/graphics/cg/ImageBufferCG.cpp:
     14        * platform/graphics/cg/PDFDocumentImage.cpp:
     15        * platform/graphics/cg/PDFDocumentImage.h:
     16        * platform/graphics/mac/ComplexTextController.h:
     17        * platform/graphics/mac/ComplexTextControllerCoreText.cpp:
     18        * platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
     19        * platform/mac/ScrollAnimatorMac.h:
     20        * platform/mac/ScrollAnimatorMac.mm:
     21        * platform/mac/ScrollbarThemeMac.h:
     22        * platform/mac/ScrollbarThemeMac.mm:
     23        * platform/mac/WebCoreNSStringExtras.h:
     24        * platform/mac/WebCoreSystemInterface.h:
     25
    1262011-05-02  Dan Bernstein  <mitz@apple.com>
    227

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

    r85143 r85501  
    7777#include <wtf/UnusedParam.h>
    7878
     79#if USE(CG)
     80#include <ApplicationServices/ApplicationServices.h>
     81#endif
     82
    7983using namespace std;
    8084

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h

    r84764 r85501  
    3535#include "Path.h"
    3636#include "PlatformString.h"
    37 
    3837#include <wtf/Vector.h>
    3938
    40 #if USE(CG)
    41 #include <ApplicationServices/ApplicationServices.h>
    42 #endif
    4339
    4440#if USE(ACCELERATED_COMPOSITING)

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

    r84489 r85501  
    3737
    3838#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    39 #include <ApplicationServices/ApplicationServices.h>
     39#include <CoreGraphics/CGGeometry.h>
    4040#endif
    4141

  • trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

    r84842 r85501  
    4747#endif
    4848
     49#if USE(IOSURFACE_CANVAS_BACKING_STORE)
     50#include <IOSurface/IOSurface.h>
     51#endif
     52
    4953using namespace std;
    5054

  • trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

    r84504 r85501  
    3333#include "ImageObserver.h"
    3434#include "SharedBuffer.h"
     35#include <CoreGraphics/CGContext.h>
     36#include <CoreGraphics/CGPDFDocument.h>
    3537#include <wtf/MathExtras.h>
    3638#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h

    r84101 r85501  
    2727#define PDFDocumentImage_h
    2828
    29 #include "Image.h"
    30 
    3129#include "FloatRect.h"
    3230#include "GraphicsTypes.h"
     31#include "Image.h"
    3332
    3433#if USE(CG)
    3534
    36 #include <ApplicationServices/ApplicationServices.h>
     35typedef struct CGPDFDocument *CGPDFDocumentRef;
    3736
    3837namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.h

    r85036 r85501  
    2626#define ComplexTextController_h
    2727
    28 #include <ApplicationServices/ApplicationServices.h>
    2928#include "GlyphBuffer.h"
    3029#include <wtf/HashSet.h>
    … …  
    3433#include <wtf/Vector.h>
    3534#include <wtf/unicode/Unicode.h>
     35
     36typedef unsigned short CGGlyph;
     37typedef const struct __CTRun * CTRunRef;
     38typedef const struct __CTLine * CTLineRef;
    3639
    3740namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp

    r85036 r85501  
    2424
    2525#include "config.h"
    26 #include "ComplexTextController.h"
    27 #include "TextRun.h"
    28 #include "WebCoreSystemInterface.h"
    2926
    3027#if USE(CORE_TEXT)
    3128
     29#include "ComplexTextController.h"
     30
    3231#include "Font.h"
     32#include "TextRun.h"
     33#include "WebCoreSystemInterface.h"
     34#include <CoreText/CoreText.h>
    3335
    3436#if defined(BUILDING_ON_LEOPARD)

  • trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp

    r85036 r85501  
    2929#include "config.h"
    3030#include "GlyphPageTreeNode.h"
     31
    3132#include "Font.h"
    32 
    3333#include "SimpleFontData.h"
    3434#include "WebCoreSystemInterface.h"

  • trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h

    r84553 r85501  
    3434#include "ScrollAnimator.h"
    3535#include "Timer.h"
    36 #include "WebCoreSystemInterface.h"
    3736#include <wtf/RetainPtr.h>
    3837
    … …  
    4746class ScrollbarPainterControllerDelegate;
    4847class ScrollbarPainterDelegate;
     48#endif
     49
     50#if USE(WK_SCROLLBAR_PAINTER)
     51typedef struct __WKScrollbarPainterController *WKScrollbarPainterControllerRef;
    4952#endif
    5053

  • trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

    r84553 r85501  
    3737#include "ScrollbarTheme.h"
    3838#include "ScrollbarThemeMac.h"
     39#include "WebCoreSystemInterface.h"
    3940#include <wtf/PassOwnPtr.h>
    4041#include <wtf/UnusedParam.h>

  • trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h

    r84767 r85501  
    2828
    2929#include "ScrollbarThemeComposite.h"
    30 #include "WebCoreSystemInterface.h"
     30
     31#if USE(WK_SCROLLBAR_PAINTER)
     32typedef struct __WKScrollbarPainter *WKScrollbarPainterRef;
     33#endif
    3134
    3235namespace WebCore {

  • trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm

    r85269 r85501  
    3232#include "ScrollAnimatorMac.h"
    3333#include "ScrollView.h"
     34#include "WebCoreSystemInterface.h"
    3435#include <Carbon/Carbon.h>
    3536#include <wtf/HashMap.h>

  • trunk/Source/WebCore/platform/mac/WebCoreNSStringExtras.h

    r38333 r85501  
    2727 */
    2828
    29 #include <ApplicationServices/ApplicationServices.h>
    3029#include <objc/objc.h>
    3130

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

    r85036 r85501  
    2727#define WebCoreSystemInterface_h
    2828
    29 #include <ApplicationServices/ApplicationServices.h>
    3029#include <objc/objc.h>
    3130
     31typedef const struct __CFString * CFStringRef;
     32typedef const struct __CFNumber * CFNumberRef;
     33typedef const struct __CFDictionary * CFDictionaryRef;
     34typedef struct CGPoint CGPoint;
     35typedef struct CGSize CGSize;
     36typedef struct CGRect CGRect;
     37typedef struct CGAffineTransform CGAffineTransform;
     38typedef struct CGContext *CGContextRef;
     39typedef struct CGImage *CGImageRef;
     40typedef struct CGColor *CGColorRef;
     41typedef struct CGFont *CGFontRef;
     42typedef struct CGColorSpace *CGColorSpaceRef;
     43typedef unsigned short CGGlyph;
     44typedef struct __CFReadStream * CFReadStreamRef;
     45typedef struct __CFRunLoop * CFRunLoopRef;
     46typedef struct __CFHTTPMessage *CFHTTPMessageRef;
     47typedef struct _CFURLResponse *CFURLResponseRef;
     48typedef const struct __CTLine * CTLineRef;
     49typedef const struct __CTTypesetter * CTTypesetterRef;
     50typedef const struct __AXUIElement *AXUIElementRef;
     51typedef uint32_t ATSUFontID;
     52typedef uint16_t ATSGlyphRef;
     53typedef struct _NSRange NSRange;
     54
    3255#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    33 #include <IOSurface/IOSurface.h>
    34 #endif
    35 
    36 typedef struct _NSRange NSRange;
     56typedef struct __IOSurface *IOSurfaceRef;
     57#endif
    3758
    3859#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    … …  
    86107class QTMovieView;
    87108#endif
    88 
    89 typedef struct _CFURLResponse *CFURLResponseRef;
    90109
    91110extern "C" {
Note: See TracChangeset for help on using the changeset viewer.