Title: [184272] branches/safari-601.1.32-branch/Source/WebKit/mac
- Revision
- 184272
- Author
- [email protected]
- Date
- 2015-05-12 22:47:03 -0700 (Tue, 12 May 2015)
Log Message
Merged r183968. rdar://problem/20281886
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog (184271 => 184272)
--- branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog 2015-05-13 05:44:07 UTC (rev 184271)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog 2015-05-13 05:47:03 UTC (rev 184272)
@@ -1,3 +1,17 @@
+2015-05-12 Babak Shafiei <[email protected]>
+
+ Merge r183968.
+
+ 2015-05-07 Said Abou-Hallawa <[email protected]>
+
+ Fix iPhone 6 iOS simulator Build.
+ following http://trac.webkit.org/changeset/183954.
+
+ Reviewed by Daniel Bates.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView pressureChangeWithEvent:]):
+
2015-05-12 Dana Burkart <[email protected]>
Merge r183957. rdar://problem/20811128
Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (184271 => 184272)
--- branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-13 05:44:07 UTC (rev 184271)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-13 05:47:03 UTC (rev 184272)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
