Rubber-stamped by Adam Roben.
authoradachan@apple.com <adachan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Oct 2010 19:47:32 +0000 (19:47 +0000)
committeradachan@apple.com <adachan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Oct 2010 19:47:32 +0000 (19:47 +0000)
        Fix Windows build.

        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
        * win/lib/WebKitSystemInterface.lib:
        * win/lib/WebKitSystemInterface_debug.lib:

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

WebKitLibraries/ChangeLog
WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
WebKitLibraries/win/lib/WebKitSystemInterface.lib
WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib

index c493680eb8f9617caed9db2ae9fac376a9774a31..f99f6bd8e9e778ca3987c4e94983eb32c1689146 100644 (file)
@@ -1,3 +1,13 @@
+2010-10-14  Ada Chan  <adachan@apple.com>
+
+        Rubber-stamped by Adam Roben.
+
+        Fix Windows build.
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
 2010-10-14  Ada Chan  <adachan@apple.com>
 
         Reviewed by Steve Falkenburg.
 2010-10-14  Ada Chan  <adachan@apple.com>
 
         Reviewed by Steve Falkenburg.
index 427b2575cb24baf6d0dd3326af41337c279bc41d..676ef14360e2668229d88a00a0d288315055a1df 100644 (file)
@@ -127,10 +127,18 @@ typedef enum {
     WKMediaControllerFlagFocused = 1 << 4
 } WKMediaControllerThemeState;
 
     WKMediaControllerFlagFocused = 1 << 4
 } WKMediaControllerThemeState;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 bool WKMediaControllerThemeAvailable(int themeStyle);
 bool WKHitTestMediaUIPart(int part, int themeStyle, CGRect bounds, CGPoint point);
 void WKMeasureMediaUIPart(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
 void WKDrawMediaUIPart(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state);
 void WKDrawMediaSliderTrack(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state);
 
 bool WKMediaControllerThemeAvailable(int themeStyle);
 bool WKHitTestMediaUIPart(int part, int themeStyle, CGRect bounds, CGPoint point);
 void WKMeasureMediaUIPart(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
 void WKDrawMediaUIPart(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state);
 void WKDrawMediaSliderTrack(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // WebKitSystemInterface_h
 #endif // WebKitSystemInterface_h
index 2128d6c0c5fe46b98c47e7b45104d1e45637cabf..a52d9c2858b42e7373caa7d03f4062039afea9c3 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ
index 05f044f037937416c0b8ae63f8fb906b236d3e86..2b0dea537205274e7ef67f5c28e1e6f38a1f8685 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ