[webkit-changes] [97897] trunk/WebKitLibraries

Wed, 19 Oct 2011 17:00:16 -0700

Title: [97897] trunk/WebKitLibraries
Revision
97897
Author
[email protected]
Date
2011-10-19 17:01:10 -0700 (Wed, 19 Oct 2011)

Log Message

Try to fix the Chromium build.

* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLeopard.a:
* libWebKitSystemInterfaceLion.a:
* libWebKitSystemInterfaceSnowLeopard.a:


Modified Paths

Diff

Modified: trunk/WebKitLibraries/ChangeLog (97896 => 97897)


--- trunk/WebKitLibraries/ChangeLog	2011-10-19 23:58:55 UTC (rev 97896)
+++ trunk/WebKitLibraries/ChangeLog	2011-10-20 00:01:10 UTC (rev 97897)
@@ -1,5 +1,14 @@
 2011-10-19  Beth Dakin  <[email protected]>
 
+        Try to fix the Chromium build.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+
+2011-10-19  Beth Dakin  <[email protected]>
+
         https://bugs.webkit.org/show_bug.cgi?id=70396
         Focus rings are too thin in HiDPI in WebKit2
         -and corresponding-

Modified: trunk/WebKitLibraries/WebKitSystemInterface.h (97896 => 97897)


--- trunk/WebKitLibraries/WebKitSystemInterface.h	2011-10-19 23:58:55 UTC (rev 97896)
+++ trunk/WebKitLibraries/WebKitSystemInterface.h	2011-10-20 00:01:10 UTC (rev 97897)
@@ -42,7 +42,10 @@
 NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response);
 NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response);
 NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *response);
+
+#ifndef BUILDING_ON_LEOPARD
 CFArrayRef WKCopyNSURLResponseCertificateChain(NSURLResponse *response);
+#endif
 
 CFStringEncoding WKGetWebDefaultCFStringEncoding(void);
 
@@ -90,6 +93,7 @@
 void WKUnregisterUniqueIdForElement(id element);
 
 
+#if !defined(BUILDING_ON_LEOPARD)
 // Remote Accessibility API.
 void WKAXRegisterRemoteApp(void);
 void WKAXInitializeElementWithPresenterPid(id, pid_t);
@@ -98,6 +102,7 @@
 void WKAXSetWindowForRemoteElement(id remoteWindow, id remoteElement);
 void WKAXRegisterRemoteProcess(bool registerProcess, pid_t);
 pid_t WKAXRemoteProcessIdentifier(id remoteElement);
+#endif
 
 void WKSetUpFontCache(void);
 
@@ -151,7 +156,7 @@
 bool WKGetVerticalGlyphsForCharacters(CTFontRef, const UniChar[], CGGlyph[], size_t);
 
 CTLineRef WKCreateCTLineWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*);
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 CTTypesetterRef WKCreateCTTypesetterWithUniCharProviderAndOptions(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
 
 CGContextRef WKIOSurfaceContextCreate(IOSurfaceRef, unsigned width, unsigned height, CGColorSpaceRef);
@@ -220,7 +225,7 @@
 
 CFStringRef WKCopyFoundationCacheDirectory(void);
 
-#if defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LEOPARD)
 typedef struct __CFURLStorageSession* CFURLStorageSessionRef;
 #else
 typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
@@ -306,6 +311,7 @@
 void WKQTClearMediaDownloadCacheForSite(NSString *site);
 void WKQTClearMediaDownloadCache();
     
+#ifndef BUILDING_ON_LEOPARD
 mach_port_t WKInitializeRenderServer(void);
     
 @class CALayer;
@@ -344,6 +350,7 @@
 
 NSUInteger WKGetInputPanelWindowStyle(void);
 UInt8 WKGetNSEventKeyChar(NSEvent *);
+#endif // !defined(BUILDING_ON_LEOPARD)
 
 @class CAPropertyAnimation;
 void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function);
@@ -358,7 +365,7 @@
 void WKSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
 CFHTTPMessageRef WKCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL);
 
-#if defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
 typedef enum {
     WKEventPhaseNone = 0,
     WKEventPhaseBegan = 1,
@@ -372,6 +379,7 @@
 void WKWindowSetAlpha(NSWindow *window, float alphaValue);
 void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScaledFrame);
 
+#ifndef BUILDING_ON_LEOPARD
 void WKSyncSurfaceToView(NSView *view);
 
 void WKEnableSettingCursorWhenInBackground(void);
@@ -386,7 +394,9 @@
 ScriptCode WKGetScriptCodeFromCurrentKeyboardInputSource(void);
 #endif
 
-#if defined(BUILDING_ON_SNOW_LEOPARD)
+#endif
+
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
 CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index);
 #endif
 
@@ -401,7 +411,7 @@
 
 CIFormat WKCIGetRGBA8Format(void);
 
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 
 typedef enum {
     WKSandboxExtensionTypeReadOnly,

Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLeopard.a


(Binary files differ)

Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a


(Binary files differ)

Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a


(Binary files differ)

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to