Skip to content

Commit 69a5561

Browse files
Fix build.
* WebKitTestRunner/mac/EventSenderProxy.mm: (WTR::EventSenderProxy::mouseForceDown): (WTR::EventSenderProxy::mouseForceUp): (WTR::EventSenderProxy::mouseForceChanged): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@184861 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent cbe0967 commit 69a5561

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

Tools/ChangeLog

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2015-05-26 Anders Carlsson <[email protected]>
2+
3+
Fix build.
4+
5+
* WebKitTestRunner/mac/EventSenderProxy.mm:
6+
(WTR::EventSenderProxy::mouseForceDown):
7+
(WTR::EventSenderProxy::mouseForceUp):
8+
(WTR::EventSenderProxy::mouseForceChanged):
9+
110
2015-05-26 Alexey Proskuryakov <[email protected]>
211

312
build.webkit.org/dashboard: Don't list test steps in BuildbotIteration twice

Tools/WebKitTestRunner/mac/EventSenderProxy.mm

+11-1
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,11 @@ static NSTimeInterval absoluteTimeForEventTime(double currentEventTime)
309309
[targetView pressureChangeWithEvent:secondEvent];
310310

311311
[NSApp _setCurrentEvent:nil];
312+
#pragma clang diagnostic push
313+
#pragma clang diagnostic ignored "-Wnonnull"
312314
// WKView caches the most recent pressure event, so send it a nil event to clear the cache.
313315
[targetView pressureChangeWithEvent:nil];
316+
#pragma clang diagnostic pop
314317

315318
[firstEvent release];
316319
[secondEvent release];
@@ -345,8 +348,12 @@ static NSTimeInterval absoluteTimeForEventTime(double currentEventTime)
345348
[targetView pressureChangeWithEvent:secondEvent];
346349

347350
[NSApp _setCurrentEvent:nil];
348-
// WKView caches the most recent pressure event, so send it a nil event to clear the cache.
351+
352+
#pragma clang diagnostic push
353+
#pragma clang diagnostic ignored "-Wnonnull"
354+
// WKView caches the most recent pressure event, so send it a nil event to clear the cache.
349355
[targetView pressureChangeWithEvent:nil];
356+
#pragma clang diagnostic pop
350357

351358
[firstEvent release];
352359
[secondEvent release];
@@ -369,8 +376,11 @@ static NSTimeInterval absoluteTimeForEventTime(double currentEventTime)
369376
[targetView pressureChangeWithEvent:event];
370377
[NSApp _setCurrentEvent:nil];
371378

379+
#pragma clang diagnostic push
380+
#pragma clang diagnostic ignored "-Wnonnull"
372381
// WKView caches the most recent pressure event, so send it a nil event to clear the cache.
373382
[targetView pressureChangeWithEvent:nil];
383+
#pragma clang diagnostic pop
374384

375385
[event release];
376386
}

0 commit comments

Comments
 (0)