Title: [170239] trunk/Source/WebCore
- Revision
- 170239
- Author
- commit-qu...@webkit.org
- Date
- 2014-06-21 07:52:31 -0700 (Sat, 21 Jun 2014)
Log Message
Implement ios -[WAKWindow convertBaseToScreen:]
https://bugs.webkit.org/show_bug.cgi?id=134053
Patch by Jeremy Jones <jere...@apple.com> on 2014-06-21
Reviewed by Eric Carlson.
* platform/ios/wak/WAKWindow.mm:
(-[WAKWindow convertBaseToScreen:]):
Traverse layer hierarchy and convert point.
(-[WAKWindow convertScreenToBase:]):
Traverse layer hierarchy and convert point.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170238 => 170239)
--- trunk/Source/WebCore/ChangeLog 2014-06-21 14:51:12 UTC (rev 170238)
+++ trunk/Source/WebCore/ChangeLog 2014-06-21 14:52:31 UTC (rev 170239)
@@ -1,3 +1,17 @@
+2014-06-21 Jeremy Jones <jere...@apple.com>
+
+ Implement ios -[WAKWindow convertBaseToScreen:]
+ https://bugs.webkit.org/show_bug.cgi?id=134053
+
+ Reviewed by Eric Carlson.
+
+ * platform/ios/wak/WAKWindow.mm:
+ (-[WAKWindow convertBaseToScreen:]):
+ Traverse layer hierarchy and convert point.
+
+ (-[WAKWindow convertScreenToBase:]):
+ Traverse layer hierarchy and convert point.
+
2014-06-21 Eva Balazsfalvi <evab.u-sze...@partner.samsung.com>
Removing PAGE_VISIBILITY_API compile guard.
Modified: trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm (170238 => 170239)
--- trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2014-06-21 14:51:12 UTC (rev 170238)
+++ trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm 2014-06-21 14:52:31 UTC (rev 170239)
@@ -146,16 +146,20 @@
- (NSPoint)convertBaseToScreen:(NSPoint)aPoint
{
- UNUSED_PARAM(aPoint);
- NSPoint p = { 0, 0 };
- return p;
+ CALayer* rootLayer = _hostLayer;
+ while (rootLayer.superlayer)
+ rootLayer = rootLayer.superlayer;
+
+ return [_hostLayer convertPoint:aPoint toLayer:rootLayer];
}
- (NSPoint)convertScreenToBase:(NSPoint)aPoint
{
- UNUSED_PARAM(aPoint);
- NSPoint p = { 0, 0 };
- return p;
+ CALayer* rootLayer = _hostLayer;
+ while (rootLayer.superlayer)
+ rootLayer = rootLayer.superlayer;
+
+ return [_hostLayer convertPoint:aPoint fromLayer:rootLayer];
}
- (BOOL)isKeyWindow
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
