4 files changed, 325 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/mac/temp/WebKitSystemInterface.h b/webkit/tools/test_shell/mac/temp/WebKitSystemInterface.h
new file mode 100644
index 0000000..de8cb12
--- /dev/null
+++ b/webkit/tools/test_shell/mac/temp/WebKitSystemInterface.h
@@ -0,0 +1,180 @@
+/*      
+    WebKitSystemInterface.h
+    Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.    
+
+    Public header file.
+*/
+
+#import <Cocoa/Cocoa.h>
+#import <Carbon/Carbon.h>
+
+@class QTMovie;
+@class QTMovieView;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    WKCertificateParseResultSucceeded  = 0,
+    WKCertificateParseResultFailed     = 1,
+    WKCertificateParseResultPKCS7      = 2,
+} WKCertificateParseResult;
+
+CFStringRef WKCopyCFLocalizationPreferredName(CFStringRef localization);
+CFStringRef WKSignedPublicKeyAndChallengeString(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
+WKCertificateParseResult WKAddCertificatesToKeychainFromData(const void *bytes, unsigned length);
+
+NSString *WKGetPreferredExtensionForMIMEType(NSString *type);
+NSArray *WKGetExtensionsForMIMEType(NSString *type);
+NSString *WKGetMIMETypeForExtension(NSString *extension);
+
+NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response);
+NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response);
+NSTimeInterval WKGetNSURLResponseCalculatedExpiration(NSURLResponse *response);
+BOOL WKGetNSURLResponseMustRevalidate(NSURLResponse *response);
+
+CFStringEncoding WKGetWebDefaultCFStringEncoding(void);
+
+float WKSecondsSinceLastInputEvent(void);
+CFStringRef WKPreferRGB32Key(void);
+
+void WKSetMetadataURL(NSString *URLString, NSString *referrer, NSString *path);
+void WKSetNSURLConnectionDefersCallbacks(NSURLConnection *connection, BOOL defers);
+float WKSecondsSinceLastInputEvent(void);
+
+void WKShowKeyAndMain(void);
+#ifndef __LP64__
+OSStatus WKSyncWindowWithCGAfterMove(WindowRef);
+unsigned WKCarbonWindowMask(void);
+void *WKGetNativeWindowFromWindowRef(WindowRef);
+OSType WKCarbonWindowPropertyCreator(void);
+OSType WKCarbonWindowPropertyTag(void);
+#endif
+
+typedef id WKNSURLConnectionDelegateProxyPtr;
+
+WKNSURLConnectionDelegateProxyPtr WKCreateNSURLConnectionDelegateProxy(void);
+
+void WKDisableCGDeferredUpdates(void);
+
+Class WKNSURLProtocolClassForReqest(NSURLRequest *request);
+void WKSetNSURLRequestShouldContentSniff(NSMutableURLRequest *request, BOOL shouldContentSniff);
+
+unsigned WKGetNSAutoreleasePoolCount(void);
+
+NSString *WKMouseMovedNotification(void);
+void WKSetNSWindowShouldPostEventNotifications(NSWindow *window, BOOL post);
+
+CFTypeID WKGetAXTextMarkerTypeID(void);
+CFTypeID WKGetAXTextMarkerRangeTypeID(void);
+CFTypeRef WKCreateAXTextMarker(const void *bytes, size_t len);
+BOOL WKGetBytesFromAXTextMarker(CFTypeRef textMarker, void *bytes, size_t length);
+CFTypeRef WKCreateAXTextMarkerRange(CFTypeRef start, CFTypeRef end);
+CFTypeRef WKCopyAXTextMarkerRangeStart(CFTypeRef range);
+CFTypeRef WKCopyAXTextMarkerRangeEnd(CFTypeRef range);
+void WKAccessibilityHandleFocusChanged(void);
+AXUIElementRef WKCreateAXUIElementRef(id element);
+void WKUnregisterUniqueIdForElement(id element);
+
+BOOL WKFontSmoothingModeIsLCD(int mode);
+void WKSetUpFontCache(size_t s);
+
+void WKSignalCFReadStreamEnd(CFReadStreamRef stream);
+void WKSignalCFReadStreamHasBytes(CFReadStreamRef stream);
+void WKSignalCFReadStreamError(CFReadStreamRef stream, CFStreamError *error);
+
+CFReadStreamRef WKCreateCustomCFReadStream(void *(*formCreate)(CFReadStreamRef, void *), 
+    void (*formFinalize)(CFReadStreamRef, void *), 
+    Boolean (*formOpen)(CFReadStreamRef, CFStreamError *, Boolean *, void *), 
+    CFIndex (*formRead)(CFReadStreamRef, UInt8 *, CFIndex, CFStreamError *, Boolean *, void *), 
+    Boolean (*formCanRead)(CFReadStreamRef, void *), 
+    void (*formClose)(CFReadStreamRef, void *), 
+    void (*formSchedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *), 
+    void (*formUnschedule)(CFReadStreamRef, CFRunLoopRef, CFStringRef, void *),
+    void *context);
+
+void WKDrawCapsLockIndicator(CGContextRef, CGRect);
+
+void WKDrawFocusRing(CGContextRef context, CGColorRef color, int radius);
+    // The CG context's current path is the focus ring's path.
+    // A color of 0 means "use system focus ring color".
+    // A radius of 0 means "use default focus ring radius".
+
+void WKSetDragImage(NSImage *image, NSPoint offset);
+
+void WKDrawBezeledTextFieldCell(NSRect, BOOL enabled);
+void WKDrawTextFieldCellFocusRing(NSTextFieldCell*, NSRect);
+void WKDrawBezeledTextArea(NSRect, BOOL enabled);
+void WKPopupMenu(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*);
+
+void WKSendUserChangeNotifications(void);
+#ifndef __LP64__    
+BOOL WKConvertNSEventToCarbonEvent(EventRecord *carbonEvent, NSEvent *cocoaEvent);
+void WKSendKeyEventToTSM(NSEvent *theEvent);
+void WKCallDrawingNotification(CGrafPtr port, Rect *bounds);
+#endif
+
+BOOL WKGetGlyphTransformedAdvances(CGFontRef, NSFont*, CGAffineTransform *m, ATSGlyphRef *glyph, CGSize *advance);
+CGFontRef WKGetCGFontFromNSFont(NSFont *font);
+void WKGetFontMetrics(CGFontRef font, int *ascent, int *descent, int *lineGap, unsigned *unitsPerEm);
+NSFont *WKGetFontInLanguageForRange(NSFont *font, NSString *string, NSRange range);
+NSFont *WKGetFontInLanguageForCharacter(NSFont *font, UniChar ch);
+void WKSetCGFontRenderingMode(CGContextRef cgContext, NSFont *font);
+ATSUFontID WKGetNSFontATSUFontId(NSFont *font);
+void WKReleaseStyleGroup(void *group);
+BOOL WKCGContextGetShouldSmoothFonts(CGContextRef cgContext);
+
+void WKSetPatternBaseCTM(CGContextRef, CGAffineTransform);
+void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint);
+
+typedef void *WKGlyphVectorRef;
+OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar *characters, unsigned numCharacters, WKGlyphVectorRef glyphs);
+OSStatus WKGetATSStyleGroup(ATSUStyle fontStyle, void **styleGroup);
+OSStatus WKInitializeGlyphVector(int count, WKGlyphVectorRef glyphs);
+void WKClearGlyphVector(WKGlyphVectorRef glyphs);
+
+int WKGetGlyphVectorNumGlyphs(WKGlyphVectorRef glyphVector);
+ATSLayoutRecord *WKGetGlyphVectorFirstRecord(WKGlyphVectorRef glyphVector);
+size_t WKGetGlyphVectorRecordSize(WKGlyphVectorRef glyphVector);
+ATSGlyphRef WKGetDefaultGlyphForChar(NSFont *font, UniChar c);
+
+#ifndef __LP64__
+NSEvent *WKCreateNSEventWithCarbonEvent(EventRef eventRef);
+NSEvent *WKCreateNSEventWithCarbonMouseMoveEvent(EventRef inEvent, NSWindow *window);
+NSEvent *WKCreateNSEventWithCarbonClickEvent(EventRef inEvent, WindowRef windowRef);
+#endif
+
+CGContextRef WKNSWindowOverrideCGContext(NSWindow *, CGContextRef);
+void WKNSWindowRestoreCGContext(NSWindow *, CGContextRef);
+
+void WKNSWindowMakeBottomCornersSquare(NSWindow *);
+
+BOOL WKSupportsMultipartXMixedReplace(NSMutableURLRequest *request);
+NSString* WKPathFromFont(NSFont *font);
+
+BOOL WKCGContextIsBitmapContext(CGContextRef context);
+
+void WKGetWheelEventDeltas(NSEvent *, float *deltaX, float *deltaY, BOOL *continuous);
+
+BOOL WKAppVersionCheckLessThan(NSString *, int, double);
+
+int WKQTMovieDataRate(QTMovie* movie);
+float WKQTMovieMaxTimeLoaded(QTMovie* movie);
+void WKQTMovieViewSetDrawSynchronously(QTMovieView* view, BOOL sync);
+
+CFStringRef WKCopyFoundationCacheDirectory(void);
+
+void WKDrawMediaFullscreenButton(CGContextRef context, CGRect rect, BOOL active);
+void WKDrawMediaMuteButton(CGContextRef context, CGRect rect, BOOL active);
+void WKDrawMediaPauseButton(CGContextRef context, CGRect rect, BOOL active);
+void WKDrawMediaPlayButton(CGContextRef context, CGRect rect, BOOL active);
+void WKDrawMediaSeekBackButton(CGContextRef context, CGRect rect, BOOL active);
+void WKDrawMediaSeekForwardButton(CGContextRef context, CGRect rect, BOOL active);
+void WKDrawMediaSliderTrack(CGContextRef context, CGRect rect, float percentLoaded);
+void WKDrawMediaSliderThumb(CGContextRef context, CGRect rect, BOOL active);
+void WKDrawMediaUnMuteButton(CGContextRef context, CGRect rect, BOOL active);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/webkit/tools/test_shell/mac/temp/WebSystemInterface.h b/webkit/tools/test_shell/mac/temp/WebSystemInterface.h
new file mode 100644
index 0000000..6e20279
--- /dev/null
+++ b/webkit/tools/test_shell/mac/temp/WebSystemInterface.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void InitWebCoreSystemInterface(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/webkit/tools/test_shell/mac/temp/WebSystemInterface.m b/webkit/tools/test_shell/mac/temp/WebSystemInterface.m
new file mode 100644
index 0000000..c9003d3
--- /dev/null
+++ b/webkit/tools/test_shell/mac/temp/WebSystemInterface.m
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2006, 2007, 2008 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "WebSystemInterface.h"
+
+//#import <WebCore/WebCoreSystemInterface.h>
+//#import <WebKitSystemInterface.h>
+// NOTE: This isn't the way to fix it; we should have a build phase that links
+// these two files so they can be found with those references. But since these
+// copies are temporary anyway, we can get away with it.
+// TODO(port): erase these files, use the ones from the merge, and do it right
+#import "platform/mac/WebCoreSystemInterface.h"
+#import "WebKitSystemInterface.h"
+
+#define INIT(function) wk##function = WK##function
+
+void InitWebCoreSystemInterface(void)
+{
+    static bool didInit;
+    if (didInit)
+        return;
+
+    INIT(CGContextGetShouldSmoothFonts);
+    INIT(ClearGlyphVector);
+    INIT(ConvertCharToGlyphs);
+    INIT(CreateCustomCFReadStream);
+    INIT(CreateNSURLConnectionDelegateProxy);
+    INIT(DrawCapsLockIndicator);
+    INIT(DrawBezeledTextArea);
+    INIT(DrawBezeledTextFieldCell);
+    INIT(DrawFocusRing);
+    INIT(DrawMediaFullscreenButton);
+    INIT(DrawMediaMuteButton);
+    INIT(DrawMediaPauseButton);
+    INIT(DrawMediaPlayButton);
+    INIT(DrawMediaSeekBackButton);
+    INIT(DrawMediaSeekForwardButton);
+    INIT(DrawMediaSliderTrack);
+    INIT(DrawMediaSliderThumb);
+    INIT(DrawMediaUnMuteButton);
+    INIT(DrawTextFieldCellFocusRing);
+    INIT(FontSmoothingModeIsLCD);
+    INIT(GetATSStyleGroup);
+    INIT(GetCGFontFromNSFont);
+    INIT(GetExtensionsForMIMEType);
+    INIT(GetFontInLanguageForCharacter);
+    INIT(GetFontInLanguageForRange);
+    INIT(GetFontMetrics);
+    INIT(GetGlyphTransformedAdvances);
+    INIT(GetGlyphVectorFirstRecord);
+    INIT(GetGlyphVectorNumGlyphs);
+    INIT(GetGlyphVectorRecordSize);
+    INIT(GetMIMETypeForExtension);
+    INIT(GetNSFontATSUFontId);
+    INIT(GetNSURLResponseCalculatedExpiration);
+    INIT(GetNSURLResponseLastModifiedDate);
+    INIT(GetNSURLResponseMustRevalidate);
+    INIT(GetPreferredExtensionForMIMEType);
+    INIT(GetWheelEventDeltas);
+    INIT(InitializeGlyphVector);
+    INIT(NSURLProtocolClassForReqest);
+    INIT(PathFromFont);
+    INIT(PopupMenu);
+    INIT(ReleaseStyleGroup);
+    INIT(SecondsSinceLastInputEvent);
+    INIT(SetCGFontRenderingMode);
+    INIT(SetDragImage);
+    INIT(SetNSURLConnectionDefersCallbacks);
+    INIT(SetNSURLRequestShouldContentSniff);
+    INIT(SetPatternBaseCTM);
+    INIT(SetPatternPhaseInUserSpace);
+    INIT(SetUpFontCache);
+    INIT(SignalCFReadStreamEnd);
+    INIT(SignalCFReadStreamError);
+    INIT(SignalCFReadStreamHasBytes);
+    INIT(SupportsMultipartXMixedReplace);
+    INIT(QTMovieDataRate);
+    INIT(QTMovieMaxTimeLoaded);
+    INIT(QTMovieViewSetDrawSynchronously);
+
+    
+    didInit = true;
+}
diff --git a/webkit/tools/test_shell/mac/temp/libWebKitSystemInterfaceLeopard.a b/webkit/tools/test_shell/mac/temp/libWebKitSystemInterfaceLeopard.a
new file mode 100644
index 0000000..48fbd61
--- /dev/null
+++ b/webkit/tools/test_shell/mac/temp/libWebKitSystemInterfaceLeopard.a