Title: [183968] trunk/Source/WebKit/mac
- Revision
- 183968
- Author
- s...@apple.com
- Date
- 2015-05-07 18:08:54 -0700 (Thu, 07 May 2015)
Log Message
Fix iPhone 6 iOS simulator Build.
following http://trac.webkit.org/changeset/183954.
Reviewed by Daniel Bates.
* WebView/WebHTMLView.mm:
(-[WebHTMLView pressureChangeWithEvent:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (183967 => 183968)
--- trunk/Source/WebKit/mac/ChangeLog 2015-05-08 00:59:01 UTC (rev 183967)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-08 01:08:54 UTC (rev 183968)
@@ -1,3 +1,13 @@
+2015-05-07 Said Abou-Hallawa <sabouhall...@apple.com>
+
+ Fix iPhone 6 iOS simulator Build.
+ following http://trac.webkit.org/changeset/183954.
+
+ Reviewed by Daniel Bates.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView pressureChangeWithEvent:]):
+
2015-05-07 Timothy Horton <timothy_hor...@apple.com>
Occasional null deref in WebImmediateActionController
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (183967 => 183968)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-08 00:59:01 UTC (rev 183967)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-08 01:08:54 UTC (rev 183968)
@@ -4087,7 +4087,7 @@
- (void)pressureChangeWithEvent:(NSEvent *)event
{
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if PLATFORM(MAC) && defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
NSEvent *lastPressureEvent = [[self _webView] _pressureEvent];
if (event.phase != NSEventPhaseChanged && event.phase != NSEventPhaseBegan && event.phase != NSEventPhaseEnded)
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
