Diff
Modified: trunk/LayoutTests/ChangeLog (97885 => 97886)
--- trunk/LayoutTests/ChangeLog 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/LayoutTests/ChangeLog 2011-10-19 22:37:17 UTC (rev 97886)
@@ -1,3 +1,16 @@
+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-
+ <rdar://problem/10086876>
+
+ Reviewed by Dan Bernstein.
+
+ * fast/hidpi/focus-rings.html: Added.
+ * platform/mac/fast/hidpi/focus-rings-expected.png: Added.
+ * platform/mac/fast/hidpi/focus-rings-expected.txt: Added.
+
2011-10-19 Erik Arvidsson <[email protected]>
JS Test Harness: Insert the stylesheet dynamically
Added: trunk/LayoutTests/fast/hidpi/focus-rings.html (0 => 97886)
--- trunk/LayoutTests/fast/hidpi/focus-rings.html (rev 0)
+++ trunk/LayoutTests/fast/hidpi/focus-rings.html 2011-10-19 22:37:17 UTC (rev 97886)
@@ -0,0 +1,20 @@
+<html>
+<script>
+ function startTest() {
+ if (window.layoutTestController) {
+ layoutTestController.waitUntilDone();
+ layoutTestController.setBackingScaleFactor(2, finishTest);
+ }
+ }
+
+ function finishTest() {
+ var div = document.getElementById("div");
+ div.focus();
+ setTimeout(function() { layoutTestController.notifyDone(); }, 0);
+ }
+ </script>
+</head>
+<body _onload_="startTest();">
+ <div id="div" style="width:300px; height:150px; border:1px solid black;" tabindex=1></div>
+</body>
+</html>
Added: trunk/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.png
(Binary files differ)
Added: svn:mime-type
Added: trunk/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.txt (0 => 97886)
--- trunk/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.txt 2011-10-19 22:37:17 UTC (rev 97886)
@@ -0,0 +1,6 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {DIV} at (0,0) size 302x152 [border: (1px solid #000000)]
Modified: trunk/Source/WebCore/ChangeLog (97885 => 97886)
--- trunk/Source/WebCore/ChangeLog 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebCore/ChangeLog 2011-10-19 22:37:17 UTC (rev 97886)
@@ -1,3 +1,27 @@
+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-
+ <rdar://problem/10086876>
+
+ Reviewed by Dan Bernstein.
+
+ Rename wkSetPatternBaseCTM to wkSetBaseCTM
+ * WebCore.exp.in:
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
+ New CG-only function calls into wkSetBaseCTM.
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::setBaseCTM):
+
+ Call GraphicsContext::setBaseCTM() rather than calling into WebKitSystemInterface
+ directly.
+ * platform/graphics/cg/ImageCG.cpp:
+ (WebCore::Image::drawPattern):
+
2011-10-19 Anna Cavender <[email protected]>
Update WebVTTParser to require at least one space between timestamps and arrows, e.g.:
Modified: trunk/Source/WebCore/WebCore.exp.in (97885 => 97886)
--- trunk/Source/WebCore/WebCore.exp.in 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-10-19 22:37:17 UTC (rev 97886)
@@ -1218,9 +1218,11 @@
__ZNK7WebCore14SecurityOrigin18databaseIdentifierEv
__ZNK7WebCore14SecurityOrigin5equalEPKS0_
__ZNK7WebCore15FocusController18focusedOrMainFrameEv
+__ZN7WebCore15GraphicsContext10setBaseCTMERKNS_15AffineTransformE
__ZNK7WebCore15GraphicsContext15platformContextEv
__ZNK7WebCore15GraphicsContext16paintingDisabledEv
__ZNK7WebCore15GraphicsContext20updatingControlTintsEv
+__ZNK7WebCore15GraphicsContext6getCTMEv
__ZNK7WebCore15ProgressTracker17estimatedProgressEv
__ZNK7WebCore15ProtectionSpace10serverTypeEv
__ZNK7WebCore15ProtectionSpace26receivesCredentialSecurelyEv
@@ -1487,6 +1489,7 @@
_wkQTMovieSelectPreferredAlternates
_wkQTMovieSetShowClosedCaptions
_wkQTMovieViewSetDrawSynchronously
+_wkSetBaseCTM
_wkSetCFURLResponseMIMEType
_wkSetCGFontRenderingMode
_wkSetCONNECTProxyAuthorizationForStream
@@ -1500,7 +1503,6 @@
_wkSetHTTPPipeliningPriority
_wkSetNSURLConnectionDefersCallbacks
_wkSetNSURLRequestShouldContentSniff
-_wkSetPatternBaseCTM
_wkSetPatternPhaseInUserSpace
_wkSetUpFontCache
_wkSignalCFReadStreamEnd
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (97885 => 97886)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2011-10-19 22:37:17 UTC (rev 97886)
@@ -269,6 +269,8 @@
bool isCALayerContext() const;
void setIsAcceleratedContext(bool);
+
+ void setBaseCTM(const AffineTransform&);
#endif
bool isAcceleratedContext() const;
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (97885 => 97886)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2011-10-19 22:37:17 UTC (rev 97886)
@@ -1470,6 +1470,11 @@
return m_data->m_contextFlags & IsAcceleratedCGContext;
}
+void GraphicsContext::setBaseCTM(const AffineTransform& transform)
+{
+ wkSetBaseCTM(platformContext(), transform);
+}
+
void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags mode)
{
if (paintingDisabled())
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp (97885 => 97886)
--- trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2011-10-19 22:37:17 UTC (rev 97886)
@@ -284,7 +284,9 @@
CGContextSetFillColorSpace(context, patternSpace.get());
// FIXME: Really want a public API for this. It is just CGContextSetBaseCTM(context, CGAffineTransformIdentiy).
- wkSetPatternBaseCTM(context, CGAffineTransformIdentity);
+ AffineTransform identity;
+ identity.makeIdentity();
+ ctxt->setBaseCTM(identity);
CGContextSetPatternPhase(context, CGSizeZero);
CGContextSetFillColorWithColor(context, color.get());
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (97885 => 97886)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-10-19 22:37:17 UTC (rev 97886)
@@ -212,7 +212,7 @@
extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
extern void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
-extern void (*wkSetPatternBaseCTM)(CGContextRef, CGAffineTransform);
+extern void (*wkSetBaseCTM)(CGContextRef, CGAffineTransform);
extern void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint);
extern CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef);
extern void (*wkSetUpFontCache)();
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (97885 => 97886)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-10-19 22:37:17 UTC (rev 97886)
@@ -80,7 +80,7 @@
void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
void (*wkSetDragImage)(NSImage*, NSPoint offset);
-void (*wkSetPatternBaseCTM)(CGContextRef, CGAffineTransform);
+void (*wkSetBaseCTM)(CGContextRef, CGAffineTransform);
void (*wkSetPatternPhaseInUserSpace)(CGContextRef, CGPoint point);
CGAffineTransform (*wkGetUserToBaseCTM)(CGContextRef);
void (*wkSetUpFontCache)();
Modified: trunk/Source/WebKit/mac/ChangeLog (97885 => 97886)
--- trunk/Source/WebKit/mac/ChangeLog 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-10-19 22:37:17 UTC (rev 97886)
@@ -1,3 +1,22 @@
+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-
+ <rdar://problem/10086876>
+
+ Reviewed by Dan Bernstein.
+
+ Rename wkSetPatternBaseCTM to wkSetBaseCTM
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
+ To create a HiDPI context in DRT, we have to set the base CTM, which currently
+ requires CG SPI, so we have to do it through WebKitSystemInterface.
+ * WebView/WebView.mm:
+ (-[WebView _setBaseCTM:forContext:]):
+ * WebView/WebViewPrivate.h:
+
2011-10-18 Adam Barth <[email protected]>
Always enable ENABLE(XPATH)
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (97885 => 97886)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2011-10-19 22:37:17 UTC (rev 97886)
@@ -76,6 +76,7 @@
INIT(WindowSetScaledFrame);
INIT(MediaControllerThemeAvailable);
INIT(PopupMenu);
+ INIT(SetBaseCTM);
INIT(SetCGFontRenderingMode);
INIT(SetCONNECTProxyAuthorizationForStream);
INIT(SetCONNECTProxyForStream);
@@ -86,7 +87,6 @@
INIT(SetHTTPPipeliningMinimumFastLanePriority);
INIT(SetNSURLConnectionDefersCallbacks);
INIT(SetNSURLRequestShouldContentSniff);
- INIT(SetPatternBaseCTM);
INIT(SetPatternPhaseInUserSpace);
INIT(GetUserToBaseCTM);
INIT(SetUpFontCache);
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (97885 => 97886)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2011-10-19 22:37:17 UTC (rev 97886)
@@ -2369,6 +2369,11 @@
return NO;
}
+- (void)_setBaseCTM:(CGAffineTransform)transform forContext:(CGContextRef)context
+{
+ WKSetBaseCTM(context, transform);
+}
+
- (BOOL)interactiveFormValidationEnabled
{
return _private->interactiveFormValidationEnabled;
Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (97885 => 97886)
--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2011-10-19 22:37:17 UTC (rev 97886)
@@ -479,6 +479,7 @@
- (BOOL)_postsAcceleratedCompositingNotifications;
- (void)_setPostsAcceleratedCompositingNotifications:(BOOL)flag;
- (BOOL)_isUsingAcceleratedCompositing;
+- (void)_setBaseCTM:(CGAffineTransform)transform forContext:(CGContextRef)context;
// For DumpRenderTree
- (BOOL)interactiveFormValidationEnabled;
Modified: trunk/Source/WebKit2/ChangeLog (97885 => 97886)
--- trunk/Source/WebKit2/ChangeLog 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-19 22:37:17 UTC (rev 97886)
@@ -1,3 +1,23 @@
+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-
+ <rdar://problem/10086876>
+
+ Reviewed by Dan Bernstein.
+
+ Rename wkSetPatternBaseCTM to wkSetBaseCTM
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
+ When setting up a HiDPI context, we must also set the base CTM.
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::display):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::scaledSnapshotInDocumentCoordinates):
+ (WebKit::WebPage::snapshotInViewCoordinates):
+
2011-10-19 Sam Weinig <[email protected]>
Add skeleton of an Objective-C WebKit2 API
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (97885 => 97886)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2011-10-19 22:37:17 UTC (rev 97886)
@@ -85,6 +85,7 @@
INIT(QTGetSitesInMediaDownloadCache);
INIT(QTClearMediaDownloadCacheForSite);
INIT(QTClearMediaDownloadCache);
+ INIT(SetBaseCTM);
INIT(SetCGFontRenderingMode);
INIT(SetCONNECTProxyAuthorizationForStream);
INIT(SetCONNECTProxyForStream);
@@ -95,7 +96,6 @@
INIT(SetHTTPPipeliningMinimumFastLanePriority);
INIT(SetNSURLConnectionDefersCallbacks);
INIT(SetNSURLRequestShouldContentSniff);
- INIT(SetPatternBaseCTM);
INIT(SetPatternPhaseInUserSpace);
INIT(SetUpFontCache);
INIT(SignalCFReadStreamEnd);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (97885 => 97886)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2011-10-19 22:37:17 UTC (rev 97886)
@@ -658,7 +658,10 @@
OwnPtr<GraphicsContext> graphicsContext = createGraphicsContext(bitmap.get());
graphicsContext->scale(FloatSize(m_webPage->corePage()->deviceScaleFactor(), m_webPage->corePage()->deviceScaleFactor()));
-
+#if USE(CG)
+ graphicsContext->setBaseCTM(graphicsContext->getCTM());
+#endif
+
updateInfo.updateRectBounds = bounds;
graphicsContext->translate(-bounds.x(), -bounds.y());
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (97885 => 97886)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-10-19 22:37:17 UTC (rev 97886)
@@ -933,6 +933,9 @@
OwnPtr<WebCore::GraphicsContext> graphicsContext = snapshot->bitmap()->createGraphicsContext();
graphicsContext->scale(FloatSize(deviceScaleFactor, deviceScaleFactor));
+#if USE(CG)
+ graphicsContext->setBaseCTM(graphicsContext->getCTM());
+#endif
graphicsContext->translate(-rect.x(), -rect.y());
frameView->updateLayoutAndStyleIfNeededRecursive();
@@ -959,6 +962,9 @@
OwnPtr<WebCore::GraphicsContext> graphicsContext = snapshot->bitmap()->createGraphicsContext();
graphicsContext->scale(FloatSize(combinedScaleFactor, combinedScaleFactor));
+#if USE(CG)
+ graphicsContext->setBaseCTM(graphicsContext->getCTM());
+#endif
graphicsContext->translate(-rect.x(), -rect.y());
frameView->updateLayoutAndStyleIfNeededRecursive();
Modified: trunk/WebKitLibraries/ChangeLog (97885 => 97886)
--- trunk/WebKitLibraries/ChangeLog 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/WebKitLibraries/ChangeLog 2011-10-19 22:37:17 UTC (rev 97886)
@@ -1,3 +1,17 @@
+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-
+ <rdar://problem/10086876>
+
+ Reviewed by Dan Bernstein.
+
+ Renamed an existing WebKitSystemInterface function.
+ * WebKitSystemInterface.h:
+ * libWebKitSystemInterfaceLion.a:
+ * libWebKitSystemInterfaceSnowLeopard.a:
+
2011-10-18 Adam Barth <[email protected]>
Always enable ENABLE(XPATH)
Modified: trunk/WebKitLibraries/WebKitSystemInterface.h (97885 => 97886)
--- trunk/WebKitLibraries/WebKitSystemInterface.h 2011-10-19 22:33:39 UTC (rev 97885)
+++ trunk/WebKitLibraries/WebKitSystemInterface.h 2011-10-19 22:37:17 UTC (rev 97886)
@@ -42,10 +42,7 @@
NSDate *WKGetNSURLResponseLastModifiedDate(NSURLResponse *response);
NSTimeInterval WKGetNSURLResponseFreshnessLifetime(NSURLResponse *response);
NSString *WKCopyNSURLResponseStatusLine(NSURLResponse *response);
-
-#ifndef BUILDING_ON_LEOPARD
CFArrayRef WKCopyNSURLResponseCertificateChain(NSURLResponse *response);
-#endif
CFStringEncoding WKGetWebDefaultCFStringEncoding(void);
@@ -93,7 +90,6 @@
void WKUnregisterUniqueIdForElement(id element);
-#if !defined(BUILDING_ON_LEOPARD)
// Remote Accessibility API.
void WKAXRegisterRemoteApp(void);
void WKAXInitializeElementWithPresenterPid(id, pid_t);
@@ -102,7 +98,6 @@
void WKAXSetWindowForRemoteElement(id remoteWindow, id remoteElement);
void WKAXRegisterRemoteProcess(bool registerProcess, pid_t);
pid_t WKAXRemoteProcessIdentifier(id remoteElement);
-#endif
void WKSetUpFontCache(void);
@@ -148,7 +143,7 @@
BOOL WKCGContextGetShouldSmoothFonts(CGContextRef cgContext);
-void WKSetPatternBaseCTM(CGContextRef, CGAffineTransform);
+void WKSetBaseCTM(CGContextRef, CGAffineTransform);
void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint);
CGAffineTransform WKGetUserToBaseCTM(CGContextRef);
@@ -156,7 +151,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_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !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);
@@ -225,7 +220,7 @@
CFStringRef WKCopyFoundationCacheDirectory(void);
-#if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LEOPARD)
+#if defined(BUILDING_ON_SNOW_LEOPARD)
typedef struct __CFURLStorageSession* CFURLStorageSessionRef;
#else
typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
@@ -311,7 +306,6 @@
void WKQTClearMediaDownloadCacheForSite(NSString *site);
void WKQTClearMediaDownloadCache();
-#ifndef BUILDING_ON_LEOPARD
mach_port_t WKInitializeRenderServer(void);
@class CALayer;
@@ -350,7 +344,6 @@
NSUInteger WKGetInputPanelWindowStyle(void);
UInt8 WKGetNSEventKeyChar(NSEvent *);
-#endif // !defined(BUILDING_ON_LEOPARD)
@class CAPropertyAnimation;
void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function);
@@ -365,7 +358,7 @@
void WKSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
CFHTTPMessageRef WKCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL);
-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_SNOW_LEOPARD)
typedef enum {
WKEventPhaseNone = 0,
WKEventPhaseBegan = 1,
@@ -379,7 +372,6 @@
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);
@@ -394,9 +386,7 @@
ScriptCode WKGetScriptCodeFromCurrentKeyboardInputSource(void);
#endif
-#endif
-
-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+#if defined(BUILDING_ON_SNOW_LEOPARD)
CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index);
#endif
@@ -411,7 +401,7 @@
CIFormat WKCIGetRGBA8Format(void);
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_SNOW_LEOPARD)
typedef enum {
WKSandboxExtensionTypeReadOnly,
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
(Binary files differ)
