Title: [173317] trunk/Source/WebKit/mac
- Revision
- 173317
- Author
- [email protected]
- Date
- 2014-09-05 11:33:29 -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)
Move #endif inside -viewDidMoveToWindow up one line such that the closing brace ('}') is after it.
* WebView/WebHTMLView.mm:
(-[WebHTMLView viewDidMoveToWindow]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (173316 => 173317)
--- trunk/Source/WebKit/mac/ChangeLog 2014-09-05 18:25:32 UTC (rev 173316)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-05 18:33:29 UTC (rev 173317)
@@ -3,6 +3,16 @@
[iOS] Another attempt to fix the iOS build after <http://trac.webkit.org/changeset/173309>
(https://bugs.webkit.org/show_bug.cgi?id=136564)
+ Move #endif inside -viewDidMoveToWindow up one line such that the closing brace ('}') is after it.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView viewDidMoveToWindow]):
+
+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).
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (173316 => 173317)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-09-05 18:25:32 UTC (rev 173316)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-09-05 18:33:29 UTC (rev 173317)
@@ -3155,8 +3155,8 @@
} else {
[NSEvent removeMonitor:_private->flagsChangedEventMonitor];
_private->flagsChangedEventMonitor = nil;
+#endif
}
-#endif
}
- (void)_web_makePluginSubviewsPerformSelector:(SEL)selector withObject:(id)object
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
