Changeset 143096 in webkit


Ignore:
Timestamp:
Feb 15, 2013 9:19:33 PM (11 years ago)
Author:
benjamin@webkit.org
Message:

[Mac] remove wkCaptionAppearance from WebKitSystemInterface
​https://bugs.webkit.org/show_bug.cgi?id=109996

Patch by Eric Carlson <​eric.carlson@apple.com> on 2013-02-15
Reviewed by Simon Fraser.

Source/WebCore:

  • 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:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r143095 r143096  
     12013-02-15  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [Mac] remove wkCaptionAppearance from WebKitSystemInterface
     4        https://bugs.webkit.org/show_bug.cgi?id=109996
     5
     6        Reviewed by Simon Fraser.
     7
     8        * platform/mac/WebCoreSystemInterface.h:
     9        * platform/mac/WebCoreSystemInterface.mm:
     10
    1112013-02-15  Sheriff Bot  <webkit.review.bot@gmail.com>
    212

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

    r143034 r143096  
    27502750#endif
    27512751
    2752 #if ENABLE(VIDEO_TRACK)
    2753 _wkCaptionAppearanceHasUserPreferences
    2754 _wkCaptionAppearanceShowCaptionsWhenAvailable
    2755 _wkCaptionAppearanceCopyForegroundColor
    2756 _wkCaptionAppearanceCopyBackgroundColor
    2757 _wkCaptionAppearanceCopyWindowColor
    2758 _wkCaptionAppearanceGetForegroundOpacity
    2759 _wkCaptionAppearanceGetBackgroundOpacity
    2760 _wkCaptionAppearanceGetWindowOpacity
    2761 _wkCaptionAppearanceCopyFontForStyle
    2762 _wkCaptionAppearanceGetRelativeCharacterSize
    2763 _wkCaptionAppearanceGetTextEdgeStyle
    2764 _wkCaptionAppearanceGetSettingsChangedNotification
    2765 #endif
    2766 
    27672752#if ENABLE(SHADOW_DOM)
    27682753__ZN7WebCore18HTMLContentElement6createEPNS_8DocumentE

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

    r143095 r143096  
    352352#endif
    353353
    354 typedef enum {
    355     wkCaptionFontStyleDefault = 0,
    356     wkCaptionFontStyleMonospacedWithSerif,
    357     wkCaptionFontStyleProportionalWithSerif,
    358     wkCaptionFontStyleMonospacedWithoutSerif,
    359     wkCaptionFontStyleProportionalWithoutSerif,
    360     wkCaptionFontStyleCasual,
    361     wkCaptionFontStyleCursive,
    362     wkCaptionFontStyleSmallCapital,
    363     wkCaptionFontStyleMax
    364 } wkCaptionFontStyle;
    365 
    366 typedef enum {
    367     wkCaptionTextEdgeStyleUndefined = 0,
    368     wkCaptionTextEdgeStyleNone,
    369     wkCaptionTextEdgeStyleRaised,
    370     wkCaptionTextEdgeStyleDepressed,
    371     wkCaptionTextEdgeStyleUniform,
    372     wkCaptionTextEdgeStyleDropShadow,
    373     wkCaptionTextEdgeStyleMax
    374 } wkCaptionTextEdgeStyle;
    375 
    376 extern bool (*wkCaptionAppearanceHasUserPreferences)(void);
    377 extern bool (*wkCaptionAppearanceShowCaptionsWhenAvailable)(void);
    378 extern CGColorRef(*wkCaptionAppearanceCopyForegroundColor)(void);
    379 extern CGColorRef(*wkCaptionAppearanceCopyBackgroundColor)(void);
    380 extern CGColorRef(*wkCaptionAppearanceCopyWindowColor)(void);
    381 extern bool(*wkCaptionAppearanceGetForegroundOpacity)(CGFloat*);
    382 extern bool(*wkCaptionAppearanceGetBackgroundOpacity)(CGFloat*);
    383 extern bool(*wkCaptionAppearanceGetWindowOpacity)(CGFloat*);
    384 extern CGFontRef(*wkCaptionAppearanceCopyFontForStyle)(int);
    385 extern bool(*wkCaptionAppearanceGetRelativeCharacterSize)(CGFloat*);
    386 extern int(*wkCaptionAppearanceGetTextEdgeStyle)(void);
    387 extern CFStringRef(*wkCaptionAppearanceGetSettingsChangedNotification)(void);
    388354}
    389355

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

    r143095 r143096  
    223223CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
    224224#endif
    225 
    226 bool (*wkCaptionAppearanceHasUserPreferences)(void);
    227 bool (*wkCaptionAppearanceShowCaptionsWhenAvailable)(void);
    228 CGColorRef(*wkCaptionAppearanceCopyForegroundColor)(void);
    229 CGColorRef(*wkCaptionAppearanceCopyBackgroundColor)(void);
    230 CGColorRef(*wkCaptionAppearanceCopyWindowColor)(void);
    231 bool(*wkCaptionAppearanceGetForegroundOpacity)(CGFloat*);
    232 bool(*wkCaptionAppearanceGetBackgroundOpacity)(CGFloat*);
    233 bool(*wkCaptionAppearanceGetWindowOpacity)(CGFloat*);
    234 CGFontRef(*wkCaptionAppearanceCopyFontForStyle)(int);
    235 bool(*wkCaptionAppearanceGetRelativeCharacterSize)(CGFloat*);
    236 int(*wkCaptionAppearanceGetTextEdgeStyle)(void);
    237 CFStringRef(*wkCaptionAppearanceGetSettingsChangedNotification)(void);

  • trunk/Source/WebKit/mac/ChangeLog

    r143095 r143096  
     12013-02-15  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [Mac] remove wkCaptionAppearance from WebKitSystemInterface
     4        https://bugs.webkit.org/show_bug.cgi?id=109996
     5
     6        Reviewed by Simon Fraser.
     7
     8        * WebCoreSupport/WebSystemInterface.mm:
     9        (InitWebCoreSystemInterface):
     10
    1112013-02-15  Sheriff Bot  <webkit.review.bot@gmail.com>
    212

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

    r143095 r143096  
    221221#endif
    222222
    223     INIT(CaptionAppearanceHasUserPreferences);
    224     INIT(CaptionAppearanceShowCaptionsWhenAvailable);
    225     INIT(CaptionAppearanceCopyForegroundColor);
    226     INIT(CaptionAppearanceCopyBackgroundColor);
    227     INIT(CaptionAppearanceCopyWindowColor);
    228     INIT(CaptionAppearanceGetForegroundOpacity);
    229     INIT(CaptionAppearanceGetBackgroundOpacity);
    230     INIT(CaptionAppearanceGetWindowOpacity);
    231     INIT(CaptionAppearanceCopyFontForStyle);
    232     INIT(CaptionAppearanceGetRelativeCharacterSize);
    233     INIT(CaptionAppearanceGetTextEdgeStyle);
    234     INIT(CaptionAppearanceGetSettingsChangedNotification);
    235 
    236223#endif
    237224    didInit = true;

  • trunk/Source/WebKit2/ChangeLog

    r143095 r143096  
     12013-02-15  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [Mac] remove wkCaptionAppearance from WebKitSystemInterface
     4        https://bugs.webkit.org/show_bug.cgi?id=109996
     5
     6        Reviewed by Simon Fraser.
     7
     8        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
     9        (InitWebCoreSystemInterface):
     10
    1112013-02-15  Sheriff Bot  <webkit.review.bot@gmail.com>
    212

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

    r143095 r143096  
    184184#endif
    185185
    186         INIT(CaptionAppearanceHasUserPreferences);
    187         INIT(CaptionAppearanceShowCaptionsWhenAvailable);
    188         INIT(CaptionAppearanceCopyForegroundColor);
    189         INIT(CaptionAppearanceCopyBackgroundColor);
    190         INIT(CaptionAppearanceCopyWindowColor);
    191         INIT(CaptionAppearanceGetForegroundOpacity);
    192         INIT(CaptionAppearanceGetBackgroundOpacity);
    193         INIT(CaptionAppearanceGetWindowOpacity);
    194         INIT(CaptionAppearanceCopyFontForStyle);
    195         INIT(CaptionAppearanceGetRelativeCharacterSize);
    196         INIT(CaptionAppearanceGetTextEdgeStyle);
    197         INIT(CaptionAppearanceGetSettingsChangedNotification);
    198186    });
    199187}
Note: See TracChangeset for help on using the changeset viewer.