Title: [211878] trunk/Source/WebCore
- Revision
- 211878
- Author
- aakash_j...@apple.com
- Date
- 2017-02-08 09:26:23 -0800 (Wed, 08 Feb 2017)
Log Message
Move WKMouseInRect to WAKView.mm
https://bugs.webkit.org/show_bug.cgi?id=167989
Reviewed by Alexey Proskuryakov.
* platform/ios/wak/WAKAppKitStubs.h: Removed WKMouseInRect.
* platform/ios/wak/WAKAppKitStubs.m:
(WKMouseInRect): Deleted.
* platform/ios/wak/WAKView.mm:
(-[WAKView mouse:inRect:]): Added the logic of WKMouseInRect here instead of separate function call.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (211877 => 211878)
--- trunk/Source/WebCore/ChangeLog 2017-02-08 17:22:28 UTC (rev 211877)
+++ trunk/Source/WebCore/ChangeLog 2017-02-08 17:26:23 UTC (rev 211878)
@@ -1,5 +1,18 @@
2017-02-08 Aakash Jain <aakash_j...@apple.com>
+ Move WKMouseInRect to WAKView.mm
+ https://bugs.webkit.org/show_bug.cgi?id=167989
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/ios/wak/WAKAppKitStubs.h: Removed WKMouseInRect.
+ * platform/ios/wak/WAKAppKitStubs.m:
+ (WKMouseInRect): Deleted.
+ * platform/ios/wak/WAKView.mm:
+ (-[WAKView mouse:inRect:]): Added the logic of WKMouseInRect here instead of separate function call.
+
+2017-02-08 Aakash Jain <aakash_j...@apple.com>
+
Remove unused method WebCore::PluginData::pluginNameForMimeType
https://bugs.webkit.org/show_bug.cgi?id=167986
Modified: trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h (211877 => 211878)
--- trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h 2017-02-08 17:22:28 UTC (rev 211877)
+++ trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h 2017-02-08 17:26:23 UTC (rev 211878)
@@ -209,16 +209,6 @@
+ (void)setHiddenUntilMouseMoves:(BOOL)flag;
@end
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-BOOL WKMouseInRect(CGPoint aPoint, CGRect aRect);
-
-#ifdef __cplusplus
-}
-#endif
-
#endif // TARGET_OS_IPHONE
#endif // WAKAppKitStubs_h
Modified: trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.m (211877 => 211878)
--- trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.m 2017-02-08 17:22:28 UTC (rev 211877)
+++ trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.m 2017-02-08 17:26:23 UTC (rev 211878)
@@ -30,13 +30,6 @@
id NSApp = nil;
-BOOL WKMouseInRect(CGPoint aPoint, CGRect aRect)
-{
- return aPoint.x >= aRect.origin.x &&
- aPoint.x < (aRect.origin.x + aRect.size.width) &&
- aPoint.y >= aRect.origin.y && aPoint.y < (aRect.origin.y + aRect.size.height);
-}
-
@implementation NSCursor
+ (void)setHiddenUntilMouseMoves:(BOOL)flag
{
Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.mm (211877 => 211878)
--- trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2017-02-08 17:22:28 UTC (rev 211877)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.mm 2017-02-08 17:26:23 UTC (rev 211878)
@@ -673,7 +673,9 @@
- (BOOL)mouse:(NSPoint)aPoint inRect:(NSRect)aRect
{
- return WKMouseInRect (aPoint, aRect);
+ return aPoint.x >= aRect.origin.x
+ && aPoint.x < (aRect.origin.x + aRect.size.width)
+ && aPoint.y >= aRect.origin.y && aPoint.y < (aRect.origin.y + aRect.size.height);
}
- (BOOL)needsPanelToBecomeKey
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
