Title: [173316] trunk/Source/WebKit/mac
- Revision
- 173316
- Author
- [email protected]
- Date
- 2014-09-05 11:25:32 -0700 (Fri, 05 Sep 2014)
Log Message
[iOS] Another attempt to fix the iOS build after <http://trac.webkit.org/changeset/173309>
(https://bugs.webkit.org/show_bug.cgi?id=136564)
Add !PLATFORM(IOS)-guard in -viewDidMoveToWindow around code that references WebHTMLViewPrivate.flagsChangedEventMonitor.
The instance variable WebHTMLViewPrivate.flagsChangedEventMonitor is guarded by !PLATFORM(IOS).
* WebView/WebHTMLView.mm:
(-[WebHTMLView viewDidMoveToWindow]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (173315 => 173316)
--- trunk/Source/WebKit/mac/ChangeLog 2014-09-05 18:16:16 UTC (rev 173315)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-05 18:25:32 UTC (rev 173316)
@@ -1,5 +1,16 @@
2014-09-05 Daniel Bates <[email protected]>
+ [iOS] Another attempt to fix the iOS build after <http://trac.webkit.org/changeset/173309>
+ (https://bugs.webkit.org/show_bug.cgi?id=136564)
+
+ Add !PLATFORM(IOS)-guard in -viewDidMoveToWindow around code that references WebHTMLViewPrivate.flagsChangedEventMonitor.
+ The instance variable WebHTMLViewPrivate.flagsChangedEventMonitor is guarded by !PLATFORM(IOS).
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView viewDidMoveToWindow]):
+
+2014-09-05 Daniel Bates <[email protected]>
+
[iOS] Fix the iOS build after <http://trac.webkit.org/changeset/173309>
(https://bugs.webkit.org/show_bug.cgi?id=136564)
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (173315 => 173316)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-09-05 18:16:16 UTC (rev 173315)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-09-05 18:25:32 UTC (rev 173316)
@@ -3145,6 +3145,7 @@
_private->lastScrollPosition = NSZeroPoint;
+#if !PLATFORM(IOS)
if (!_private->flagsChangedEventMonitor) {
_private->flagsChangedEventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSFlagsChangedMask handler:^(NSEvent *flagsChangedEvent) {
[self _postFakeMouseMovedEventForFlagsChangedEvent:flagsChangedEvent];
@@ -3155,6 +3156,7 @@
[NSEvent removeMonitor:_private->flagsChangedEventMonitor];
_private->flagsChangedEventMonitor = nil;
}
+#endif
}
- (void)_web_makePluginSubviewsPerformSelector:(SEL)selector withObject:(id)object
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
