https://bugs.webkit.org/show_bug.cgi?id=70396
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Oct 2011 22:37:17 +0000 (22:37 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Oct 2011 22:37:17 +0000 (22:37 +0000)
Focus rings are too thin in HiDPI in WebKit2
-and corresponding-
<rdar://problem/10086876>

Reviewed by Dan Bernstein.

Source/WebCore:

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):

Source/WebKit/mac:

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:

Source/WebKit2:

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):

WebKitLibraries:

Renamed an existing WebKitSystemInterface function.
* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLion.a:
* libWebKitSystemInterfaceSnowLeopard.a:

LayoutTests:

* fast/hidpi/focus-rings.html: Added.
* platform/mac/fast/hidpi/focus-rings-expected.png: Added.
* platform/mac/fast/hidpi/focus-rings-expected.txt: Added.

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

23 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/hidpi/focus-rings.html [new file with mode: 0644]
LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.png [new file with mode: 0644]
LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.txt [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/platform/graphics/GraphicsContext.h
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/platform/graphics/cg/ImageCG.cpp
Source/WebCore/platform/mac/WebCoreSystemInterface.h
Source/WebCore/platform/mac/WebCoreSystemInterface.mm
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/mac/WebView/WebViewPrivate.h
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
WebKitLibraries/ChangeLog
WebKitLibraries/WebKitSystemInterface.h
WebKitLibraries/libWebKitSystemInterfaceLion.a
WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a

index 32c70cb..793cd2a 100644 (file)
@@ -1,3 +1,16 @@
+2011-10-19  Beth Dakin  <bdakin@apple.com>
+
+        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  <arv@chromium.org>
 
         JS Test Harness: Insert the stylesheet dynamically
diff --git a/LayoutTests/fast/hidpi/focus-rings.html b/LayoutTests/fast/hidpi/focus-rings.html
new file mode 100644 (file)
index 0000000..8afd3cb
--- /dev/null
@@ -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>
diff --git a/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.png b/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.png
new file mode 100644 (file)
index 0000000..c86f6f8
Binary files /dev/null and b/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.txt b/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.txt
new file mode 100644 (file)
index 0000000..99901e0
--- /dev/null
@@ -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)]
index ea19e65..7c48c29 100644 (file)
@@ -1,3 +1,27 @@
+2011-10-19  Beth Dakin  <bdakin@apple.com>
+
+        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  <annacc@chromium.org>
 
         Update WebVTTParser to require at least one space between timestamps and arrows, e.g.:
index 5be7e76..42d8d2a 100644 (file)
@@ -1218,9 +1218,11 @@ __ZNK7WebCore14SecurityOrigin10canDisplayERKNS_4KURLE
 __ZNK7WebCore14SecurityOrigin18databaseIdentifierEv
 __ZNK7WebCore14SecurityOrigin5equalEPKS0_
 __ZNK7WebCore15FocusController18focusedOrMainFrameEv
+__ZN7WebCore15GraphicsContext10setBaseCTMERKNS_15AffineTransformE
 __ZNK7WebCore15GraphicsContext15platformContextEv
 __ZNK7WebCore15GraphicsContext16paintingDisabledEv
 __ZNK7WebCore15GraphicsContext20updatingControlTintsEv
+__ZNK7WebCore15GraphicsContext6getCTMEv
 __ZNK7WebCore15ProgressTracker17estimatedProgressEv
 __ZNK7WebCore15ProtectionSpace10serverTypeEv
 __ZNK7WebCore15ProtectionSpace26receivesCredentialSecurelyEv
@@ -1487,6 +1489,7 @@ _wkQTMovieResolvedURL
 _wkQTMovieSelectPreferredAlternates
 _wkQTMovieSetShowClosedCaptions
 _wkQTMovieViewSetDrawSynchronously
+_wkSetBaseCTM
 _wkSetCFURLResponseMIMEType
 _wkSetCGFontRenderingMode
 _wkSetCONNECTProxyAuthorizationForStream
@@ -1500,7 +1503,6 @@ _wkSetHTTPPipeliningMinimumFastLanePriority
 _wkSetHTTPPipeliningPriority
 _wkSetNSURLConnectionDefersCallbacks
 _wkSetNSURLRequestShouldContentSniff
-_wkSetPatternBaseCTM
 _wkSetPatternPhaseInUserSpace
 _wkSetUpFontCache
 _wkSignalCFReadStreamEnd
index 910a19f..cfdeb70 100644 (file)
@@ -269,6 +269,8 @@ namespace WebCore {
         bool isCALayerContext() const;
 
         void setIsAcceleratedContext(bool);
+
+        void setBaseCTM(const AffineTransform&);
 #endif
         bool isAcceleratedContext() const;
 
index 4f06156..7e5eef9 100644 (file)
@@ -1470,6 +1470,11 @@ bool GraphicsContext::isAcceleratedContext() const
     return m_data->m_contextFlags & IsAcceleratedCGContext;
 }
 
+void GraphicsContext::setBaseCTM(const AffineTransform& transform)
+{
+    wkSetBaseCTM(platformContext(), transform);
+}
+
 void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags mode)
 {
     if (paintingDisabled())
index c790f68..591cd99 100644 (file)
@@ -284,7 +284,9 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const
     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());
index 4352464..feaf12a 100644 (file)
@@ -212,7 +212,7 @@ extern void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
 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)();
index c08b36e..0553c05 100644 (file)
@@ -80,7 +80,7 @@ void (*wkQTClearMediaDownloadCache)();
 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)();
index 5530b26..be53178 100644 (file)
@@ -1,3 +1,22 @@
+2011-10-19  Beth Dakin  <bdakin@apple.com>
+
+        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  <abarth@webkit.org>
 
         Always enable ENABLE(XPATH)
index dc903a6..4c1d4a2 100644 (file)
@@ -76,6 +76,7 @@ void InitWebCoreSystemInterface(void)
     INIT(WindowSetScaledFrame);
     INIT(MediaControllerThemeAvailable);
     INIT(PopupMenu);
+    INIT(SetBaseCTM);
     INIT(SetCGFontRenderingMode);
     INIT(SetCONNECTProxyAuthorizationForStream);
     INIT(SetCONNECTProxyForStream);
@@ -86,7 +87,6 @@ void InitWebCoreSystemInterface(void)
     INIT(SetHTTPPipeliningMinimumFastLanePriority);
     INIT(SetNSURLConnectionDefersCallbacks);
     INIT(SetNSURLRequestShouldContentSniff);
-    INIT(SetPatternBaseCTM);
     INIT(SetPatternPhaseInUserSpace);
     INIT(GetUserToBaseCTM);
     INIT(SetUpFontCache);
index 3649883..5ec8f10 100644 (file)
@@ -2369,6 +2369,11 @@ static inline IMP getMethod(id o, SEL s)
     return NO;
 }
 
+- (void)_setBaseCTM:(CGAffineTransform)transform forContext:(CGContextRef)context
+{
+    WKSetBaseCTM(context, transform);
+}
+
 - (BOOL)interactiveFormValidationEnabled
 {
     return _private->interactiveFormValidationEnabled;
index 1307032..d219fc0 100644 (file)
@@ -479,6 +479,7 @@ Could be worth adding to the API.
 - (BOOL)_postsAcceleratedCompositingNotifications;
 - (void)_setPostsAcceleratedCompositingNotifications:(BOOL)flag;
 - (BOOL)_isUsingAcceleratedCompositing;
+- (void)_setBaseCTM:(CGAffineTransform)transform forContext:(CGContextRef)context;
 
 // For DumpRenderTree
 - (BOOL)interactiveFormValidationEnabled;
index ac9c26c..8ab6757 100644 (file)
@@ -1,3 +1,23 @@
+2011-10-19  Beth Dakin  <bdakin@apple.com>
+
+        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  <sam@webkit.org>
 
         Add skeleton of an Objective-C WebKit2 API
index 2c2f308..509bbbe 100644 (file)
@@ -85,6 +85,7 @@ void InitWebCoreSystemInterface(void)
         INIT(QTGetSitesInMediaDownloadCache);
         INIT(QTClearMediaDownloadCacheForSite);
         INIT(QTClearMediaDownloadCache);
+        INIT(SetBaseCTM);
         INIT(SetCGFontRenderingMode);
         INIT(SetCONNECTProxyAuthorizationForStream);
         INIT(SetCONNECTProxyForStream);
@@ -95,7 +96,6 @@ void InitWebCoreSystemInterface(void)
         INIT(SetHTTPPipeliningMinimumFastLanePriority);
         INIT(SetNSURLConnectionDefersCallbacks);
         INIT(SetNSURLRequestShouldContentSniff);
-        INIT(SetPatternBaseCTM);
         INIT(SetPatternPhaseInUserSpace);
         INIT(SetUpFontCache);
         INIT(SignalCFReadStreamEnd);
index 2ddffba..87f1fa5 100644 (file)
@@ -658,7 +658,10 @@ void DrawingAreaImpl::display(UpdateInfo& updateInfo)
 
     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());
index f2204d9..28e744a 100644 (file)
@@ -933,6 +933,9 @@ PassRefPtr<WebImage> WebPage::snapshotInViewCoordinates(const IntRect& rect, Ima
     
     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 @@ PassRefPtr<WebImage> WebPage::scaledSnapshotInDocumentCoordinates(const IntRect&
 
     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();
index e66588b..d321c15 100644 (file)
@@ -1,3 +1,17 @@
+2011-10-19  Beth Dakin  <bdakin@apple.com>
+
+        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  <abarth@webkit.org>
 
         Always enable ENABLE(XPATH)
index 7a6fe7c..e6b346d 100644 (file)
@@ -42,10 +42,7 @@ NSString *WKGetMIMETypeForExtension(NSString *extension);
 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 @@ AXUIElementRef WKCreateAXUIElementRef(id element);
 void WKUnregisterUniqueIdForElement(id element);
 
 
-#if !defined(BUILDING_ON_LEOPARD)
 // Remote Accessibility API.
 void WKAXRegisterRemoteApp(void);
 void WKAXInitializeElementWithPresenterPid(id, pid_t);
@@ -102,7 +98,6 @@ id WKAXRemoteElementForToken(NSData *);
 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 @@ void WKSetCGFontRenderingMode(CGContextRef cgContext, NSFont *font);
 BOOL WKCGContextGetShouldSmoothFonts(CGContextRef cgContext);
 
 
-void WKSetPatternBaseCTM(CGContextRef, CGAffineTransform);
+void WKSetBaseCTM(CGContextRef, CGAffineTransform);
 void WKSetPatternPhaseInUserSpace(CGContextRef, CGPoint);
 CGAffineTransform WKGetUserToBaseCTM(CGContextRef);
 
@@ -156,7 +151,7 @@ void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t);
 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 @@ NSURL *WKQTMovieResolvedURL(QTMovie* movie);
 
 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 @@ NSArray *WKQTGetSitesInMediaDownloadCache();
 void WKQTClearMediaDownloadCacheForSite(NSString *site);
 void WKQTClearMediaDownloadCache();
     
-#ifndef BUILDING_ON_LEOPARD
 mach_port_t WKInitializeRenderServer(void);
     
 @class CALayer;
@@ -350,7 +344,6 @@ CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_
 
 NSUInteger WKGetInputPanelWindowStyle(void);
 UInt8 WKGetNSEventKeyChar(NSEvent *);
-#endif // !defined(BUILDING_ON_LEOPARD)
 
 @class CAPropertyAnimation;
 void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function);
@@ -365,7 +358,7 @@ void WKSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumber
 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 @@ int WKGetNSEventMomentumPhase(NSEvent *);
 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 @@ NSURLResponse *WKNSURLResponseFromSerializableRepresentation(CFDictionaryRef rep
 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 @@ void WKSetCFURLResponseMIMEType(CFURLResponseRef, CFStringRef mimeType);
 
 CIFormat WKCIGetRGBA8Format(void);
 
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_SNOW_LEOPARD)
 
 typedef enum {
     WKSandboxExtensionTypeReadOnly,
index 341ffa0..6cba341 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLion.a and b/WebKitLibraries/libWebKitSystemInterfaceLion.a differ
index c43b379..61a2a16 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ