Changeset 173276 in webkit


Ignore:
Timestamp:
Sep 4, 2014 1:54:00 PM (10 years ago)
Author:
mjs@apple.com
Message:

Remove WebCoreSystemInterface glue for otherwise unused WKSI calls
​https://bugs.webkit.org/show_bug.cgi?id=136527

Reviewed by Alexey Proskuryakov.

Source/WebCore:

  • WebCore.exp.in:
  • WebCore.order:
  • platform/ios/WebCoreSystemInterfaceIOS.mm:
  • platform/mac/WebCoreSystemInterface.h:
  • platform/mac/WebCoreSystemInterface.mm:

Source/WebKit/mac:

  • WebCoreSupport/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

Source/WebKit2:

  • WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:

(InitWebCoreSystemInterface):

Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r173275 r173276  
     12014-09-04  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Remove WebCoreSystemInterface glue for otherwise unused WKSI calls
     4        https://bugs.webkit.org/show_bug.cgi?id=136527
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebCore.exp.in:
     9        * WebCore.order:
     10        * platform/ios/WebCoreSystemInterfaceIOS.mm:
     11        * platform/mac/WebCoreSystemInterface.h:
     12        * platform/mac/WebCoreSystemInterface.mm:
     13
    1142014-09-04  Beth Dakin  <bdakin@apple.com>
    215

  • trunk/Source/WebCore/WebCore.exp.in

    r173272 r173276  
    21002100_wkCreateCTLineWithUniCharProvider
    21012101_wkCreateCTTypesetterWithUniCharProviderAndOptions
    2102 _wkCreateCustomCFReadStream
    21032102_wkCreatePrivateStorageSession
    21042103_wkDeleteAllHTTPCookies
    … …  
    21332132_wkSetPatternPhaseInUserSpace
    21342133_wkSetUpFontCache
    2135 _wkSignalCFReadStreamEnd
    2136 _wkSignalCFReadStreamError
    2137 _wkSignalCFReadStreamHasBytes
    21382134
    21392135#if !defined(NDEBUG)
    … …  
    23762372_wkCursor
    23772373_wkDrawBezeledTextArea
    2378 _wkDrawBezeledTextFieldCell
    23792374_wkDrawCapsLockIndicator
    23802375_wkDrawCellFocusRingWithFrameAtTime
    … …  
    23832378_wkDrawMediaSliderTrack
    23842379_wkDrawMediaUIPart
    2385 _wkDrawTextFieldCellFocusRing
    23862380_wkExecutableWasLinkedOnOrBeforeSnowLeopard
    23872381_wkGetAXTextMarkerRangeTypeID
    … …  
    23902384_wkGetFontInLanguageForCharacter
    23912385_wkGetFontInLanguageForRange
    2392 _wkGetGlyphTransformedAdvances
    23932386_wkGetGlyphsForCharacters
    23942387_wkGetHyphenationLocationBeforeIndex
    … …  
    24012394_wkMeasureMediaUIPart
    24022395_wkPopupMenu
    2403 _wkPopupMenuWithSize
    24042396_wkQTClearMediaDownloadCache
    24052397_wkQTClearMediaDownloadCacheForSite
    24062398_wkQTGetSitesInMediaDownloadCache
    24072399_wkQTIncludeOnlyModernMediaFileTypes
    2408 _wkQTMovieDataRate
    24092400_wkQTMovieDisableComponent
    24102401_wkQTMovieGetType
    … …  
    24562447#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    24572448_wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue
    2458 #endif
    2459 
    2460 #if PLATFORM(MAC) || PLATFORM(IOS_SIMULATOR)
    2461 _wkSetCrashReportApplicationSpecificInformation
    24622449#endif
    24632450

  • trunk/Source/WebCore/WebCore.order

    r173251 r173276  
    3062030620_wkGetUserToBaseCTM
    3062130621_wkSetUpFontCache
    30622 _wkSignalCFReadStreamEnd
    30623 _wkSignalCFReadStreamHasBytes
    30624 _wkSignalCFReadStreamError
    30625 _wkCreateCustomCFReadStream
    3062630622_wkSetNSURLConnectionDefersCallbacks
    3062730623_wkSetNSURLRequestShouldContentSniff

  • trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm

    r173249 r173276  
    3939WEBCORE_EXPORT bool (*wkCGContextIsPDFContext)(CGContextRef);
    4040WEBCORE_EXPORT void (*wkSetUpFontCache)();
    41 WEBCORE_EXPORT void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream);
    42 WEBCORE_EXPORT void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);
    43 WEBCORE_EXPORT void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error);
    44 WEBCORE_EXPORT CFReadStreamRef (*wkCreateCustomCFReadStream)(void *(*formCreate)(CFReadStreamRef, void *),
    45     void (*formFinalize)(CFReadStreamRef, void *),
    46     Boolean (*formOpen)(CFReadStreamRef, CFStreamError *, Boolean *, void *),
    47     CFIndex (*formRead)(CFReadStreamRef, UInt8 *, CFIndex, CFStreamError *, Boolean *, void *),
    48     Boolean (*formCanRead)(CFReadStreamRef, void *),
    49     void (*formClose)(CFReadStreamRef, void *),
    50     void (*formSchedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *),
    51     void (*formUnschedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *),
    52     void *context);
    5341WEBCORE_EXPORT NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
    5442WEBCORE_EXPORT void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
    … …  
    9684WEBCORE_EXPORT CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
    9785#endif // !PLATFORM(IOS_SIMULATOR)
    98 
    99 #if PLATFORM(IOS_SIMULATOR)
    100 WEBCORE_EXPORT void (*wkSetCrashReportApplicationSpecificInformation)(CFStringRef);
    101 #endif
    10286
    10387WEBCORE_EXPORT CFURLStorageSessionRef (*wkCreatePrivateStorageSession)(CFStringRef);

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

    r172975 r173276  
    4848typedef struct CGPath *CGMutablePathRef;
    4949typedef unsigned short CGGlyph;
    50 typedef struct __CFReadStream * CFReadStreamRef;
    5150typedef struct __CFRunLoop * CFRunLoopRef;
    5251typedef struct __CFHTTPMessage *CFHTTPMessageRef;
    … …  
    141140#endif
    142141extern CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
    143 extern CFReadStreamRef (*wkCreateCustomCFReadStream)(void *(*formCreate)(CFReadStreamRef, void *),
    144     void (*formFinalize)(CFReadStreamRef, void *),
    145     Boolean (*formOpen)(CFReadStreamRef, CFStreamError *, Boolean *, void *),
    146     CFIndex (*formRead)(CFReadStreamRef, UInt8 *, CFIndex, CFStreamError *, Boolean *, void *),
    147     Boolean (*formCanRead)(CFReadStreamRef, void *),
    148     void (*formClose)(CFReadStreamRef, void *),
    149     void (*formSchedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *),
    150     void (*formUnschedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *),
    151     void *context);
    152142extern NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
    153143extern CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
    154144extern CFStringEncoding (*wkGetWebDefaultCFStringEncoding)(void);
    155145#if !PLATFORM(IOS)
    156 extern void (*wkDrawBezeledTextFieldCell)(NSRect, BOOL enabled);
    157 extern void (*wkDrawTextFieldCellFocusRing)(NSTextFieldCell*, NSRect);
    158146extern void (*wkDrawCapsLockIndicator)(CGContextRef, CGRect);
    159147extern void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled);
    … …  
    164152extern NSFont* (*wkGetFontInLanguageForRange)(NSFont*, NSString*, NSRange);
    165153extern NSFont* (*wkGetFontInLanguageForCharacter)(NSFont*, UniChar);
    166 extern BOOL (*wkGetGlyphTransformedAdvances)(CGFontRef, NSFont*, CGAffineTransform*, ATSGlyphRef*, CGSize* advance);
    167154#endif
    168155#if !PLATFORM(IOS)
    … …  
    202189#if defined(__OBJC__)
    203190extern void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*, NSControlSize controlSize, bool hideArrows);
    204 extern void (*wkPopupMenuWithSize)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*, NSControlSize controlSize);
    205191#endif
    206192
    207193extern unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
    208 extern int (*wkQTMovieDataRate)(QTMovie*);
    209194extern void (*wkQTMovieDisableComponent)(uint32_t[5]);
    210195extern float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
    … …  
    231216extern bool (*wkCGContextIsPDFContext)(CGContextRef);
    232217extern void (*wkSetUpFontCache)();
    233 extern void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream);
    234 extern void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error);
    235 extern void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);
    236218extern unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
    237219extern int (*wkGetHTTPRequestPriority)(CFURLRequestRef);
    … …  
    273255extern CGContextRef (*wkIOSurfaceContextCreate)(IOSurfaceRef surface, unsigned width, unsigned height, CGColorSpaceRef colorSpace);
    274256extern CGImageRef (*wkIOSurfaceContextCreateImage)(CGContextRef context);
    275 #endif
    276 
    277 #if PLATFORM(MAC) || PLATFORM(IOS_SIMULATOR)
    278 extern void (*wkSetCrashReportApplicationSpecificInformation)(CFStringRef);
    279257#endif
    280258

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

    r173249 r173276  
    4141NSString* (*wkCreateURLPasteboardFlavorTypeName)(void);
    4242NSString* (*wkCreateURLNPasteboardFlavorTypeName)(void);
    43 void (*wkDrawBezeledTextFieldCell)(NSRect, BOOL enabled);
    44 void (*wkDrawTextFieldCellFocusRing)(NSTextFieldCell*, NSRect);
    4543void (*wkDrawCapsLockIndicator)(CGContextRef, CGRect);
    4644void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled);
    … …  
    5048NSFont* (*wkGetFontInLanguageForRange)(NSFont*, NSString*, NSRange);
    5149NSFont* (*wkGetFontInLanguageForCharacter)(NSFont*, UniChar);
    52 BOOL (*wkGetGlyphTransformedAdvances)(CGFontRef, NSFont*, CGAffineTransform*, ATSGlyphRef*, CGSize* advance);
    5350void (*wkDrawMediaSliderTrack)(CGContextRef context, CGRect rect, float timeLoaded, float currentTime,
    5451    float duration, unsigned state);
    … …  
    6764UInt8 (*wkGetNSEventKeyChar)(NSEvent *);
    6865void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*, NSControlSize controlSize, bool hideArrows);
    69 void (*wkPopupMenuWithSize)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*, NSControlSize controlSize);
    7066unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
    71 int (*wkQTMovieDataRate)(QTMovie*);
    7267void (*wkQTMovieDisableComponent)(uint32_t[5]);
    7368float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
    … …  
    9186bool (*wkCGContextIsPDFContext)(CGContextRef);
    9287void (*wkSetUpFontCache)();
    93 void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream);
    94 void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);
    95 void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error);
    96 CFReadStreamRef (*wkCreateCustomCFReadStream)(void *(*formCreate)(CFReadStreamRef, void *),
    97     void (*formFinalize)(CFReadStreamRef, void *),
    98     Boolean (*formOpen)(CFReadStreamRef, CFStreamError *, Boolean *, void *),
    99     CFIndex (*formRead)(CFReadStreamRef, UInt8 *, CFIndex, CFStreamError *, Boolean *, void *),
    100     Boolean (*formCanRead)(CFReadStreamRef, void *),
    101     void (*formClose)(CFReadStreamRef, void *),
    102     void (*formSchedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *),
    103     void (*formUnschedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *),
    104     void *context);
    10588void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
    10689void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
    … …  
    144127
    145128CFStringRef (*wkCopyDefaultSearchProviderDisplayName)(void);
    146 void (*wkSetCrashReportApplicationSpecificInformation)(CFStringRef);
    147129
    148130NSCursor *(*wkCursor)(const char*);

  • trunk/Source/WebKit/mac/ChangeLog

    r173268 r173276  
     12014-09-04  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Remove WebCoreSystemInterface glue for otherwise unused WKSI calls
     4        https://bugs.webkit.org/show_bug.cgi?id=136527
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebCoreSupport/WebSystemInterface.mm:
     9        (InitWebCoreSystemInterface):
     10
    1112014-09-04  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
    212

  • trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm

    r172975 r173276  
    6161    INIT(CopyNSURLResponseStatusLine);
    6262    INIT(CopyNSURLResponseCertificateChain);
    63     INIT(CreateCustomCFReadStream);
    6463#if !PLATFORM(IOS)
    6564    INIT(DrawCapsLockIndicator);
    6665    INIT(DrawBezeledTextArea);
    67     INIT(DrawBezeledTextFieldCell);
    6866    INIT(DrawFocusRing);
    6967    INIT(DrawFocusRingAtTime);
    … …  
    7169    INIT(DrawMediaUIPart);
    7270    INIT(DrawMediaSliderTrack);
    73     INIT(DrawTextFieldCellFocusRing);
    7471    INIT(GetFontInLanguageForCharacter);
    7572    INIT(GetFontInLanguageForRange);
    76     INIT(GetGlyphTransformedAdvances);
    7773#endif
    7874    INIT(GetHTTPRequestPriority);
    … …  
    9389    INIT(WindowSetScaledFrame);
    9490    INIT(PopupMenu);
    95     INIT(PopupMenuWithSize);
    9691    INIT(SetCGFontRenderingMode);
    9792#endif
    … …  
    112107    INIT(GetUserToBaseCTM);
    113108    INIT(SetUpFontCache);
    114     INIT(SignalCFReadStreamEnd);
    115     INIT(SignalCFReadStreamError);
    116     INIT(SignalCFReadStreamHasBytes);
    117109#if ENABLE(VIDEO) && !PLATFORM(IOS)
    118110    INIT(QTIncludeOnlyModernMediaFileTypes);
    119     INIT(QTMovieDataRate);
    120111    INIT(QTMovieDisableComponent);
    121112    INIT(QTMovieMaxTimeLoaded);
    … …  
    154145    INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
    155146    INIT(CTRunGetInitialAdvance);
    156 #if PLATFORM(MAC) || PLATFORM(IOS_SIMULATOR)
    157     INIT(SetCrashReportApplicationSpecificInformation);
    158 #endif
    159147#if !PLATFORM(IOS)
    160148    INIT(RecommendedScrollerStyle);

  • trunk/Source/WebKit2/ChangeLog

    r173272 r173276  
     12014-09-04  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Remove WebCoreSystemInterface glue for otherwise unused WKSI calls
     4        https://bugs.webkit.org/show_bug.cgi?id=136527
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
     9        (InitWebCoreSystemInterface):
     10
    1112014-09-04  Antti Koivisto  <antti@apple.com>
    212

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm

    r172975 r173276  
    5454        INIT(CopyNSURLResponseCertificateChain);
    5555        INIT(CreateCTLineWithUniCharProvider);
    56         INIT(CreateCustomCFReadStream);
    5756#if !PLATFORM(IOS)
    5857        INIT(DrawBezeledTextArea);
    59         INIT(DrawBezeledTextFieldCell);
    6058        INIT(DrawCapsLockIndicator);
    6159        INIT(DrawFocusRing);
    … …  
    6462        INIT(DrawMediaSliderTrack);
    6563        INIT(DrawMediaUIPart);
    66         INIT(DrawTextFieldCellFocusRing);
    6764        INIT(GetFontInLanguageForCharacter);
    6865        INIT(GetFontInLanguageForRange);
    69         INIT(GetGlyphTransformedAdvances);
    7066        INIT(GetGlyphsForCharacters);
    7167#endif
    … …  
    8985        INIT(MeasureMediaUIPart);
    9086        INIT(PopupMenu);
    91         INIT(PopupMenuWithSize);
    9287        INIT(QTIncludeOnlyModernMediaFileTypes);
    93         INIT(QTMovieDataRate);
    9488        INIT(QTMovieDisableComponent);
    9589        INIT(QTMovieGetType);
    … …  
    120114        INIT(SetPatternPhaseInUserSpace);
    121115        INIT(SetUpFontCache);
    122         INIT(SignalCFReadStreamEnd);
    123         INIT(SignalCFReadStreamError);
    124         INIT(SignalCFReadStreamHasBytes);
    125116        INIT(CreatePrivateStorageSession);
    126117        INIT(CopyRequestWithStorageSession);
    … …  
    144135        INIT(CreateCTTypesetterWithUniCharProviderAndOptions);
    145136        INIT(CTRunGetInitialAdvance);
    146 #if PLATFORM(MAC) || PLATFORM(IOS_SIMULATOR)
    147         INIT(SetCrashReportApplicationSpecificInformation);
    148 #endif
    149137#if !PLATFORM(IOS)
    150138        INIT(RecommendedScrollerStyle);
Note: See TracChangeset for help on using the changeset viewer.