Changeset 198697 in webkit


Ignore:
Timestamp:
Mar 25, 2016 4:15:03 PM (8 years ago)
Author:
dino@apple.com
Message:

Remove use of extern "C" to include QuartzCore files
​https://bugs.webkit.org/show_bug.cgi?id=155905
Source/WebCore:

<rdar://problem/25364798>

Reviewed by Anders Carlson.

We can avoid having to wrap constants in extern "C", since they
are mangled the same in both C and C++.

  • platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm: Now that

QuartzCoreSPI.h has CABackdropLayer, remove the duplicate entry.

  • platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm: Ditto.
  • platform/spi/cocoa/QuartzCoreSPI.h: Include the framework private

file. Repace EXTERN_C with "extern".

Source/WebKit2:

Reviewed by Anders Carlson.

We can avoid having to wrap constants in extern "C", since they
are mangled the same in both C and C++.

  • UIProcess/mac/RemoteLayerTreeHost.mm: Remove the

mention of CABackdropLayer.

Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r198696 r198697  
     12016-03-25  Dean Jackson  <dino@apple.com>
     2
     3        Remove use of extern "C" to include QuartzCore files
     4        https://bugs.webkit.org/show_bug.cgi?id=155905
     5        <rdar://problem/25364798>
     6
     7        Reviewed by Anders Carlson.
     8
     9        We can avoid having to wrap constants in extern "C", since they
     10        are mangled the same in both C and C++.
     11
     12        * platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm: Now that
     13        QuartzCoreSPI.h has CABackdropLayer, remove the duplicate entry.
     14        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm: Ditto.
     15        * platform/spi/cocoa/QuartzCoreSPI.h: Include the framework private
     16        file. Repace EXTERN_C with "extern".
     17
    1182016-03-25  Alex Christensen  <achristensen@webkit.org>
    219

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm

    r192712 r198697  
    3434#import <QuartzCore/QuartzCore.h>
    3535
    36 #if ENABLE(FILTERS_LEVEL_2)
    37 @interface CABackdropLayer : CALayer
    38 @end
    39 #endif
    40 
    4136using namespace WebCore;
    4237

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

    r198189 r198697  
    6060#endif
    6161
    62 #if ENABLE(FILTERS_LEVEL_2)
    63 @interface CABackdropLayer : CALayer
    64 @property BOOL windowServerAware;
    65 @end
    66 #endif
    67 
    6862#if USE(APPLE_INTERNAL_SDK)
    6963#import <WebKitAdditions/LayerBackingStoreAdditions.mm>

  • trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h

    r194318 r198697  
    3333
    3434#ifdef __OBJC__
     35
    3536#import <QuartzCore/CALayerHost.h>
    3637#import <QuartzCore/CALayerPrivate.h>
     38#import <QuartzCore/QuartzCorePrivate.h>
    3739
    3840#if PLATFORM(IOS)
    … …  
    4042#endif
    4143
    42 // FIXME: As a workaround for <rdar://problem/18985152>, we conditionally enclose the following
    43 // headers in an extern "C" linkage block to make it suitable for Objective-C++ use. Once this
    44 // bug has been fixed we can simply include header <QuartzCore/QuartzCorePrivate.h> instead of
    45 // including specific QuartzCore headers.
    46 #ifdef __cplusplus
    47 extern "C" {
    48 #endif
    49 
    50 #import <QuartzCore/CAContext.h>
    51 #import <QuartzCore/CAFilter.h>
    52 #import <QuartzCore/CATiledLayerPrivate.h>
    53 #import <QuartzCore/CATransactionPrivate.h>
    54 
    55 #ifdef __cplusplus
    56 }
    57 #endif
    5844#endif // __OBJC__
    5945
    … …  
    10793@interface CADisplay ()
    10894@property (nonatomic, readonly) NSString *name;
     95@end
     96#endif
     97
     98#if ENABLE(FILTERS_LEVEL_2)
     99@interface CABackdropLayer : CALayer
     100@property BOOL windowServerAware;
    109101@end
    110102#endif
    … …  
    167159@end
    168160
    169 EXTERN_C NSString * const kCATiledLayerRemoveImmediately;
     161extern NSString * const kCATiledLayerRemoveImmediately;
    170162
    171 EXTERN_C NSString * const kCAFilterColorInvert;
    172 EXTERN_C NSString * const kCAFilterColorMatrix;
    173 EXTERN_C NSString * const kCAFilterColorMonochrome;
    174 EXTERN_C NSString * const kCAFilterColorHueRotate;
    175 EXTERN_C NSString * const kCAFilterColorSaturate;
    176 EXTERN_C NSString * const kCAFilterGaussianBlur;
    177 EXTERN_C NSString * const kCAFilterPlusD;
    178 EXTERN_C NSString * const kCAFilterPlusL;
     163extern NSString * const kCAFilterColorInvert;
     164extern NSString * const kCAFilterColorMatrix;
     165extern NSString * const kCAFilterColorMonochrome;
     166extern NSString * const kCAFilterColorHueRotate;
     167extern NSString * const kCAFilterColorSaturate;
     168extern NSString * const kCAFilterGaussianBlur;
     169extern NSString * const kCAFilterPlusD;
     170extern NSString * const kCAFilterPlusL;
    179171
    180 EXTERN_C NSString * const kCAFilterNormalBlendMode;
    181 EXTERN_C NSString * const kCAFilterMultiplyBlendMode;
    182 EXTERN_C NSString * const kCAFilterScreenBlendMode;
    183 EXTERN_C NSString * const kCAFilterOverlayBlendMode;
    184 EXTERN_C NSString * const kCAFilterDarkenBlendMode;
    185 EXTERN_C NSString * const kCAFilterLightenBlendMode;
    186 EXTERN_C NSString * const kCAFilterColorDodgeBlendMode;
    187 EXTERN_C NSString * const kCAFilterColorBurnBlendMode;
    188 EXTERN_C NSString * const kCAFilterSoftLightBlendMode;
    189 EXTERN_C NSString * const kCAFilterHardLightBlendMode;
    190 EXTERN_C NSString * const kCAFilterDifferenceBlendMode;
    191 EXTERN_C NSString * const kCAFilterExclusionBlendMode;
     172extern NSString * const kCAFilterNormalBlendMode;
     173extern NSString * const kCAFilterMultiplyBlendMode;
     174extern NSString * const kCAFilterScreenBlendMode;
     175extern NSString * const kCAFilterOverlayBlendMode;
     176extern NSString * const kCAFilterDarkenBlendMode;
     177extern NSString * const kCAFilterLightenBlendMode;
     178extern NSString * const kCAFilterColorDodgeBlendMode;
     179extern NSString * const kCAFilterColorBurnBlendMode;
     180extern NSString * const kCAFilterSoftLightBlendMode;
     181extern NSString * const kCAFilterHardLightBlendMode;
     182extern NSString * const kCAFilterDifferenceBlendMode;
     183extern NSString * const kCAFilterExclusionBlendMode;
    192184
    193 EXTERN_C NSString * const kCAContextDisplayName;
    194 EXTERN_C NSString * const kCAContextDisplayId;
    195 EXTERN_C NSString * const kCAContextIgnoresHitTest;
     185extern NSString * const kCAContextDisplayName;
     186extern NSString * const kCAContextDisplayId;
     187extern NSString * const kCAContextIgnoresHitTest;
    196188
    197189#if (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 100000) \

  • trunk/Source/WebKit2/ChangeLog

    r198678 r198697  
     12016-03-25  Dean Jackson  <dino@apple.com>
     2
     3        Remove use of extern "C" to include QuartzCore files
     4        https://bugs.webkit.org/show_bug.cgi?id=155905
     5
     6        Reviewed by Anders Carlson.
     7
     8        We can avoid having to wrap constants in extern "C", since they
     9        are mangled the same in both C and C++.
     10
     11        * UIProcess/mac/RemoteLayerTreeHost.mm: Remove the
     12        mention of CABackdropLayer.
     13
    1142016-03-25  Brian Burg  <bburg@apple.com>
    215

  • trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm

    r188991 r198697  
    4242#endif
    4343
    44 #if ENABLE(FILTERS_LEVEL_2)
    45 @interface CABackdropLayer : CALayer
    46 @end
    47 #endif
    48 
    4944using namespace WebCore;
    5045
Note: See TracChangeset for help on using the changeset viewer.