Unreviewed, rolling out r143088.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Feb 2013 04:31:14 +0000 (04:31 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Feb 2013 04:31:14 +0000 (04:31 +0000)
http://trac.webkit.org/changeset/143088
https://bugs.webkit.org/show_bug.cgi?id=110000

Breaks the build (Requested by dgorbik on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-15

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@143095 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
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 b125fe86ced1c8d31b23382f9fd5254f08ab7e09..a720f4841ddd16b875b9a827999efd0ad6a420ba 100644 (file)
@@ -1,3 +1,14 @@
+2013-02-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r143088.
+        http://trac.webkit.org/changeset/143088
+        https://bugs.webkit.org/show_bug.cgi?id=110000
+
+        Breaks the build (Requested by dgorbik on #webkit).
+
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/mac/WebCoreSystemInterface.mm:
+
 2013-02-15  Chris Rogers  <crogers@google.com>
 
         Enhance AudioBus copyFrom() and sumFrom() to be able to handle discrete and speakers up and down-mixing
index ae1c11a02293a5f45f57417444b391027257dafe..6715f071190a3c86561c1f95f5a0ff3ebceab489 100644 (file)
@@ -351,6 +351,40 @@ 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 9283bf3fa089a8d17c7abd7d47447aaeff7304f6..a392930bdb9bf516088b64968569c11183b576f5 100644 (file)
@@ -222,3 +222,16 @@ 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 fb34b8e02654d844ffdaca0923b1c54b1ba46f79..8fe6dba20e97cf2f788d2a40226ec30e72fe2331 100644 (file)
@@ -1,3 +1,14 @@
+2013-02-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r143088.
+        http://trac.webkit.org/changeset/143088
+        https://bugs.webkit.org/show_bug.cgi?id=110000
+
+        Breaks the build (Requested by dgorbik on #webkit).
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2013-02-15  Eric Carlson  <eric.carlson@apple.com>
 
         [Mac] remove wkCaptionAppearance from WebKitSystemInterface
index 9ffbc42e58f5c6d4e830a78d4e983f162402da22..93fde9060a1e221ac15ddbf874fe79027b7b7859 100644 (file)
@@ -220,6 +220,19 @@ 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 60f9389082f2151dca03296242405395d36d2fd5..d1b2c0de45ee1223036ddca14427f2240edc42c3 100644 (file)
@@ -1,3 +1,14 @@
+2013-02-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r143088.
+        http://trac.webkit.org/changeset/143088
+        https://bugs.webkit.org/show_bug.cgi?id=110000
+
+        Breaks the build (Requested by dgorbik on #webkit).
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
 2013-02-15  Kiran Muppala  <cmuppala@apple.com>
 
         Disable sudden termination on Mac
index 7b4c1add61fdecceef97479e7bcdc10d0a08279f..33ad32d539ec2d83014fc7c79714ec44f4a02251 100644 (file)
@@ -183,5 +183,17 @@ 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);
     });
 }