diff options
-rw-r--r-- | webkit/port/page/AXObjectCacheMac.cpp | 9 | ||||
-rw-r--r-- | webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj | 12 | ||||
-rw-r--r-- | webkit/tools/test_shell/mac/temp/WebKitSystemInterface.h | 180 | ||||
-rw-r--r-- | webkit/tools/test_shell/mac/temp/WebSystemInterface.h | 37 | ||||
-rw-r--r-- | webkit/tools/test_shell/mac/temp/WebSystemInterface.m | 108 | ||||
-rw-r--r-- | webkit/tools/test_shell/mac/temp/libWebKitSystemInterfaceLeopard.a | bin | 1791488 -> 0 bytes |
6 files changed, 0 insertions, 346 deletions
diff --git a/webkit/port/page/AXObjectCacheMac.cpp b/webkit/port/page/AXObjectCacheMac.cpp index bc187fe..80b2e52 100644 --- a/webkit/port/page/AXObjectCacheMac.cpp +++ b/webkit/port/page/AXObjectCacheMac.cpp @@ -54,13 +54,4 @@ void AXObjectCache::handleFocusedUIElementChanged() { } -AXID AXObjectCache::getAXID(AccessibilityObject*) -{ - return AXID(); -} - -void AXObjectCache::removeAXID(AccessibilityObject*) -{ -} - } // namespace WebCore diff --git a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj index 6dd3580..7274f2a 100644 --- a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj +++ b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 7B779D510E83001A00C2971E /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B779D500E82FFAC00C2971E /* libevent.a */; }; 7BA363BD0E8C40C30023C8B9 /* libsdch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BA363BA0E8C409A0023C8B9 /* libsdch.a */; }; 82F372150E82AE0500DF5AFE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F372140E82AE0500DF5AFE /* Security.framework */; }; - 82F399480E7EE4D500785E15 /* libWebKitSystemInterfaceLeopard.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F399470E7EE4D500785E15 /* libWebKitSystemInterfaceLeopard.a */; }; 82F399B70E7EF75800785E15 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205260E770291008F45CF /* libbase.a */; }; 82F399B80E7EF75A00785E15 /* libbase_gfx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205280E770291008F45CF /* libbase_gfx.a */; }; 82F399F90E7EF7C000785E15 /* libgoogleurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205370E770291008F45CF /* libgoogleurl.a */; }; @@ -21,7 +20,6 @@ 82F39A220E7EF85F00785E15 /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F39A210E7EF85C00785E15 /* libgtest.a */; }; 82F39CF40E7EF90F00785E15 /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205B90E770291008F45CF /* libzlib.a */; }; 82F39CF90E7EF92500785E15 /* libbzip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B82052F0E770291008F45CF /* libbzip2.a */; }; - 82F39CFD0E7EF93600785E15 /* WebSystemInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 820A5E760DE35E2E00871E2D /* WebSystemInterface.m */; }; 82F39D050E7EF95D00785E15 /* libmodp_b64.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F39D040E7EF95A00785E15 /* libmodp_b64.a */; }; 82F39D080E7EF97000785E15 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B82055E0E770291008F45CF /* libpng.a */; }; 82F39D0E0E7EFA5500785E15 /* libglue.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205AA0E770291008F45CF /* libglue.a */; }; @@ -535,9 +533,6 @@ 7B8203F10E76FED8008F45CF /* libxml.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libxml.xcodeproj; path = third_party/libxml/libxml.xcodeproj; sourceTree = "<group>"; }; 7BA363B50E8C409A0023C8B9 /* sdch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sdch.xcodeproj; path = sdch/sdch.xcodeproj; sourceTree = "<group>"; }; 7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libjpeg.xcodeproj; path = third_party/libjpeg/libjpeg.xcodeproj; sourceTree = "<group>"; }; - 820A5E750DE35E2E00871E2D /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSystemInterface.h; path = temp/WebSystemInterface.h; sourceTree = "<group>"; }; - 820A5E760DE35E2E00871E2D /* WebSystemInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebSystemInterface.m; path = temp/WebSystemInterface.m; sourceTree = "<group>"; }; - 820A5E850DE35FC600871E2D /* WebKitSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebKitSystemInterface.h; path = temp/WebKitSystemInterface.h; sourceTree = "<group>"; }; 820A61B80DE7623F00871E2D /* missingImage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = missingImage.tiff; sourceTree = "<group>"; }; 824CB6100DAFEF14000C5DDE /* test_shell */ = {isa = PBXFileReference; lastKnownFileType = folder; name = test_shell; path = ../../../data/test_shell; sourceTree = SOURCE_ROOT; }; 8287BDFA0E0AA28000CC8F2F /* aliasCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = aliasCursor.png; sourceTree = "<group>"; }; @@ -575,7 +570,6 @@ 829E35590DC0D37B00819EBF /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = "<group>"; }; 829E355C0DC0D47400819EBF /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = "<group>"; }; 82F372140E82AE0500DF5AFE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = "<group>"; }; - 82F399470E7EE4D500785E15 /* libWebKitSystemInterfaceLeopard.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWebKitSystemInterfaceLeopard.a; path = temp/libWebKitSystemInterfaceLeopard.a; sourceTree = "<group>"; }; 82F39A1C0E7EF85C00785E15 /* gtest.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gtest.xcodeproj; path = testing/gtest.xcodeproj; sourceTree = "<group>"; }; 82F39CFF0E7EF95A00785E15 /* modp_b64.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = modp_b64.xcodeproj; path = third_party/modp_b64/modp_b64.xcodeproj; sourceTree = "<group>"; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; @@ -645,7 +639,6 @@ 82F39D2B0E7EFC2600785E15 /* libskia.a in Frameworks */, 82F39D4A0E7EFDAA00785E15 /* libv8.a in Frameworks */, 82F39D110E7EFA5A00785E15 /* libwebcore.a in Frameworks */, - 82F399480E7EE4D500785E15 /* libWebKitSystemInterfaceLeopard.a in Frameworks */, 82F39D100E7EFA5800785E15 /* libwtf.a in Frameworks */, 82F39D400E7EFD9300785E15 /* libxml.a in Frameworks */, 82F39CF40E7EF90F00785E15 /* libzlib.a in Frameworks */, @@ -877,14 +870,10 @@ 7BFDF4FD0E37AB4200F1D7D8 /* mac */ = { isa = PBXGroup; children = ( - 82F399470E7EE4D500785E15 /* libWebKitSystemInterfaceLeopard.a */, 29B97316FDCFA39411CA2CEA /* main.mm */, ABA65EFD0DD50BFF003A4FC8 /* test_shell_webview.h */, ABA65EFE0DD50BFF003A4FC8 /* test_shell_webview.mm */, 32CA4F630368D1EE00C91783 /* TestShell_Prefix.pch */, - 820A5E850DE35FC600871E2D /* WebKitSystemInterface.h */, - 820A5E750DE35E2E00871E2D /* WebSystemInterface.h */, - 820A5E760DE35E2E00871E2D /* WebSystemInterface.m */, ); path = mac; sourceTree = "<group>"; @@ -1425,7 +1414,6 @@ E456291E0E26B4FE005E4685 /* test_shell_webview.mm in Sources */, E456291C0E26B4FE005E4685 /* test_webview_delegate.mm in Sources */, E456291D0E26B4FE005E4685 /* text_input_controller.cc in Sources */, - 82F39CFD0E7EF93600785E15 /* WebSystemInterface.m in Sources */, E456290F0E26B4FE005E4685 /* webview_host.mm in Sources */, E45629100E26B4FE005E4685 /* webwidget_host.mm in Sources */, ); diff --git a/webkit/tools/test_shell/mac/temp/WebKitSystemInterface.h b/webkit/tools/test_shell/mac/temp/WebKitSystemInterface.h deleted file mode 100644 index de8cb12..0000000 --- a/webkit/tools/test_shell/mac/temp/WebKitSystemInterface.h +++ /dev/null @@ -1,180 +0,0 @@ -/* - 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 deleted file mode 100644 index 6e20279..0000000 --- a/webkit/tools/test_shell/mac/temp/WebSystemInterface.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 deleted file mode 100644 index c9003d3..0000000 --- a/webkit/tools/test_shell/mac/temp/WebSystemInterface.m +++ /dev/null @@ -1,108 +0,0 @@ -/* - * 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 Binary files differdeleted file mode 100644 index 48fbd61..0000000 --- a/webkit/tools/test_shell/mac/temp/libWebKitSystemInterfaceLeopard.a +++ /dev/null |