[Mac] remove wkCaptionAppearance from WebKitSystemInterface
authorbenjamin@webkit.org <benjamin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Feb 2013 05:19:33 +0000 (05:19 +0000)
committerbenjamin@webkit.org <benjamin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Feb 2013 05:19:33 +0000 (05:19 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143096 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/platform/mac/WebCoreSystemInterface.h
Source/WebCore/platform/mac/WebCoreSystemInterface.mm
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm

index a720f48..10e3bee 100644 (file)
@@ -1,3 +1,13 @@
+2013-02-15  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] remove wkCaptionAppearance from WebKitSystemInterface
+        https://bugs.webkit.org/show_bug.cgi?id=109996
+
+        Reviewed by Simon Fraser.
+
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/mac/WebCoreSystemInterface.mm:
+
 2013-02-15  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r143088.
index 381c46c..e203207 100644 (file)
@@ -2749,21 +2749,6 @@ __ZN7WebCore24TextAlternativeWithRangeC1EP18NSTextAlternatives8_NSRange
 __ZN7WebCore32collectDictationTextAlternativesEP18NSAttributedStringRN3WTF6VectorINS_24TextAlternativeWithRangeELm0EEE
 #endif
 
-#if ENABLE(VIDEO_TRACK)
-_wkCaptionAppearanceHasUserPreferences
-_wkCaptionAppearanceShowCaptionsWhenAvailable
-_wkCaptionAppearanceCopyForegroundColor
-_wkCaptionAppearanceCopyBackgroundColor
-_wkCaptionAppearanceCopyWindowColor
-_wkCaptionAppearanceGetForegroundOpacity
-_wkCaptionAppearanceGetBackgroundOpacity
-_wkCaptionAppearanceGetWindowOpacity
-_wkCaptionAppearanceCopyFontForStyle
-_wkCaptionAppearanceGetRelativeCharacterSize
-_wkCaptionAppearanceGetTextEdgeStyle
-_wkCaptionAppearanceGetSettingsChangedNotification
-#endif
-
 #if ENABLE(SHADOW_DOM)
 __ZN7WebCore18HTMLContentElement6createEPNS_8DocumentE
 #endif
index 6715f07..ae1c11a 100644 (file)
@@ -351,40 +351,6 @@ extern CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
 extern CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
 #endif
 
-typedef enum {
-    wkCaptionFontStyleDefault = 0,
-    wkCaptionFontStyleMonospacedWithSerif,
-    wkCaptionFontStyleProportionalWithSerif,
-    wkCaptionFontStyleMonospacedWithoutSerif,
-    wkCaptionFontStyleProportionalWithoutSerif,
-    wkCaptionFontStyleCasual,
-    wkCaptionFontStyleCursive,
-    wkCaptionFontStyleSmallCapital,
-    wkCaptionFontStyleMax
-} wkCaptionFontStyle;
-
-typedef enum {
-    wkCaptionTextEdgeStyleUndefined = 0,
-    wkCaptionTextEdgeStyleNone,
-    wkCaptionTextEdgeStyleRaised,
-    wkCaptionTextEdgeStyleDepressed,
-    wkCaptionTextEdgeStyleUniform,
-    wkCaptionTextEdgeStyleDropShadow,
-    wkCaptionTextEdgeStyleMax
-} wkCaptionTextEdgeStyle;
-
-extern bool (*wkCaptionAppearanceHasUserPreferences)(void);
-extern bool (*wkCaptionAppearanceShowCaptionsWhenAvailable)(void);
-extern CGColorRef(*wkCaptionAppearanceCopyForegroundColor)(void);
-extern CGColorRef(*wkCaptionAppearanceCopyBackgroundColor)(void);
-extern CGColorRef(*wkCaptionAppearanceCopyWindowColor)(void);
-extern bool(*wkCaptionAppearanceGetForegroundOpacity)(CGFloat*);
-extern bool(*wkCaptionAppearanceGetBackgroundOpacity)(CGFloat*);
-extern bool(*wkCaptionAppearanceGetWindowOpacity)(CGFloat*);
-extern CGFontRef(*wkCaptionAppearanceCopyFontForStyle)(int);
-extern bool(*wkCaptionAppearanceGetRelativeCharacterSize)(CGFloat*);
-extern int(*wkCaptionAppearanceGetTextEdgeStyle)(void);
-extern CFStringRef(*wkCaptionAppearanceGetSettingsChangedNotification)(void);
 }
 
 #endif
index a392930..9283bf3 100644 (file)
@@ -222,16 +222,3 @@ CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initial
 CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
 CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
 #endif
-
-bool (*wkCaptionAppearanceHasUserPreferences)(void);
-bool (*wkCaptionAppearanceShowCaptionsWhenAvailable)(void);
-CGColorRef(*wkCaptionAppearanceCopyForegroundColor)(void);
-CGColorRef(*wkCaptionAppearanceCopyBackgroundColor)(void);
-CGColorRef(*wkCaptionAppearanceCopyWindowColor)(void);
-bool(*wkCaptionAppearanceGetForegroundOpacity)(CGFloat*);
-bool(*wkCaptionAppearanceGetBackgroundOpacity)(CGFloat*);
-bool(*wkCaptionAppearanceGetWindowOpacity)(CGFloat*);
-CGFontRef(*wkCaptionAppearanceCopyFontForStyle)(int);
-bool(*wkCaptionAppearanceGetRelativeCharacterSize)(CGFloat*);
-int(*wkCaptionAppearanceGetTextEdgeStyle)(void);
-CFStringRef(*wkCaptionAppearanceGetSettingsChangedNotification)(void);
index 8fe6dba..3716464 100644 (file)
@@ -1,3 +1,13 @@
+2013-02-15  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] remove wkCaptionAppearance from WebKitSystemInterface
+        https://bugs.webkit.org/show_bug.cgi?id=109996
+
+        Reviewed by Simon Fraser.
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2013-02-15  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r143088.
index 93fde90..9ffbc42 100644 (file)
@@ -220,19 +220,6 @@ void InitWebCoreSystemInterface(void)
     INIT(NSReboundDeltaForElasticDelta);
 #endif
 
-    INIT(CaptionAppearanceHasUserPreferences);
-    INIT(CaptionAppearanceShowCaptionsWhenAvailable);
-    INIT(CaptionAppearanceCopyForegroundColor);
-    INIT(CaptionAppearanceCopyBackgroundColor);
-    INIT(CaptionAppearanceCopyWindowColor);
-    INIT(CaptionAppearanceGetForegroundOpacity);
-    INIT(CaptionAppearanceGetBackgroundOpacity);
-    INIT(CaptionAppearanceGetWindowOpacity);
-    INIT(CaptionAppearanceCopyFontForStyle);
-    INIT(CaptionAppearanceGetRelativeCharacterSize);
-    INIT(CaptionAppearanceGetTextEdgeStyle);
-    INIT(CaptionAppearanceGetSettingsChangedNotification);
-
 #endif
     didInit = true;
 }
index d1b2c0d..90d54ac 100644 (file)
@@ -1,3 +1,13 @@
+2013-02-15  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] remove wkCaptionAppearance from WebKitSystemInterface
+        https://bugs.webkit.org/show_bug.cgi?id=109996
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2013-02-15  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r143088.
index 33ad32d..7b4c1ad 100644 (file)
@@ -183,17 +183,5 @@ void InitWebCoreSystemInterface(void)
         INIT(NSReboundDeltaForElasticDelta);
 #endif
 
-        INIT(CaptionAppearanceHasUserPreferences);
-        INIT(CaptionAppearanceShowCaptionsWhenAvailable);
-        INIT(CaptionAppearanceCopyForegroundColor);
-        INIT(CaptionAppearanceCopyBackgroundColor);
-        INIT(CaptionAppearanceCopyWindowColor);
-        INIT(CaptionAppearanceGetForegroundOpacity);
-        INIT(CaptionAppearanceGetBackgroundOpacity);
-        INIT(CaptionAppearanceGetWindowOpacity);
-        INIT(CaptionAppearanceCopyFontForStyle);
-        INIT(CaptionAppearanceGetRelativeCharacterSize);
-        INIT(CaptionAppearanceGetTextEdgeStyle);
-        INIT(CaptionAppearanceGetSettingsChangedNotification);
     });
 }