Diff
Modified: trunk/Source/WebCore/ChangeLog (143095 => 143096)
--- trunk/Source/WebCore/ChangeLog 2013-02-16 04:31:14 UTC (rev 143095)
+++ trunk/Source/WebCore/ChangeLog 2013-02-16 05:19:33 UTC (rev 143096)
@@ -1,3 +1,13 @@
+2013-02-15 Eric Carlson <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r143088.
Modified: trunk/Source/WebCore/WebCore.exp.in (143095 => 143096)
--- trunk/Source/WebCore/WebCore.exp.in 2013-02-16 04:31:14 UTC (rev 143095)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-02-16 05:19:33 UTC (rev 143096)
@@ -2749,21 +2749,6 @@
__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
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (143095 => 143096)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-02-16 04:31:14 UTC (rev 143095)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-02-16 05:19:33 UTC (rev 143096)
@@ -351,40 +351,6 @@
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
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (143095 => 143096)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-02-16 04:31:14 UTC (rev 143095)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-02-16 05:19:33 UTC (rev 143096)
@@ -222,16 +222,3 @@
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);
Modified: trunk/Source/WebKit/mac/ChangeLog (143095 => 143096)
--- trunk/Source/WebKit/mac/ChangeLog 2013-02-16 04:31:14 UTC (rev 143095)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-02-16 05:19:33 UTC (rev 143096)
@@ -1,3 +1,13 @@
+2013-02-15 Eric Carlson <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r143088.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (143095 => 143096)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-02-16 04:31:14 UTC (rev 143095)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-02-16 05:19:33 UTC (rev 143096)
@@ -220,19 +220,6 @@
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;
}
Modified: trunk/Source/WebKit2/ChangeLog (143095 => 143096)
--- trunk/Source/WebKit2/ChangeLog 2013-02-16 04:31:14 UTC (rev 143095)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-16 05:19:33 UTC (rev 143096)
@@ -1,3 +1,13 @@
+2013-02-15 Eric Carlson <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r143088.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (143095 => 143096)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-02-16 04:31:14 UTC (rev 143095)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-02-16 05:19:33 UTC (rev 143096)
@@ -183,17 +183,5 @@
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);
});
}
