[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 14:29:00 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 05a099fb794d3778b0596b7a8e343ea66850cb03
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 11 17:13:42 2010 +0000
Try to fix the Mac release build.
* UIProcess/API/mac/WKView.mm:
(-[WKView _transformToDeviceSpace:]):
(-[WKView _transformToUserSpace:]):
* UIProcess/API/mac/WKViewInternal.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69504 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6f4164b..9a93407 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-11 Sam Weinig <sam at webkit.org>
+
+ Try to fix the Mac release build.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _transformToDeviceSpace:]):
+ (-[WKView _transformToUserSpace:]):
+ * UIProcess/API/mac/WKViewInternal.h:
+
2010-10-11 Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index ec31273..63d858d 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -534,12 +534,12 @@ static bool isViewVisible(NSView *view)
_data->_menuList.clear();
}
-- (CGRect)_transformToDeviceSpace:(CGRect)rect
+- (NSRect)_transformToDeviceSpace:(NSRect)rect
{
return toDeviceSpace(rect, [self window]);
}
-- (CGRect)_transformToUserSpace:(CGRect)rect
+- (NSRect)_transformToUserSpace:(NSRect)rect
{
return toUserSpace(rect, [self window]);
}
diff --git a/WebKit2/UIProcess/API/mac/WKViewInternal.h b/WebKit2/UIProcess/API/mac/WKViewInternal.h
index 4f909cb..e0c7049 100644
--- a/WebKit2/UIProcess/API/mac/WKViewInternal.h
+++ b/WebKit2/UIProcess/API/mac/WKViewInternal.h
@@ -33,8 +33,8 @@
- (void)_setCursor:(NSCursor *)cursor;
- (void)_setUserInterfaceItemState:(NSString *)commandName enabled:(BOOL)isEnabled state:(int)newState;
-- (CGRect)_transformToDeviceSpace:(CGRect)rect;
-- (CGRect)_transformToUserSpace:(CGRect)rect;
+- (NSRect)_transformToDeviceSpace:(NSRect)rect;
+- (NSRect)_transformToUserSpace:(NSRect)rect;
#if USE(ACCELERATED_COMPOSITING)
- (void)_startAcceleratedCompositing:(CALayer *)rootLayer;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list