Title: [263755] branches/safari-610.1.19-branch/Source/WebKit
- Revision
- 263755
- Author
- alanc...@apple.com
- Date
- 2020-06-30 09:35:15 -0700 (Tue, 30 Jun 2020)
Log Message
Cherry-pick r263462. rdar://problem/64941936
Fix the build once RBSProcessLimitations.h is introduced
https://bugs.webkit.org/show_bug.cgi?id=213562
Reviewed by Wenson Hsieh.
* Platform/spi/ios/RunningBoardServicesSPI.h:
We can't forward-declare Objective-C SPI if it actually exists
without inspiring duplicate definition errors.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263462 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.19-branch/Source/WebKit/ChangeLog (263754 => 263755)
--- branches/safari-610.1.19-branch/Source/WebKit/ChangeLog 2020-06-30 16:34:27 UTC (rev 263754)
+++ branches/safari-610.1.19-branch/Source/WebKit/ChangeLog 2020-06-30 16:35:15 UTC (rev 263755)
@@ -1,3 +1,30 @@
+2020-06-30 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r263462. rdar://problem/64941936
+
+ Fix the build once RBSProcessLimitations.h is introduced
+ https://bugs.webkit.org/show_bug.cgi?id=213562
+
+ Reviewed by Wenson Hsieh.
+
+ * Platform/spi/ios/RunningBoardServicesSPI.h:
+ We can't forward-declare Objective-C SPI if it actually exists
+ without inspiring duplicate definition errors.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263462 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-06-24 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build once RBSProcessLimitations.h is introduced
+ https://bugs.webkit.org/show_bug.cgi?id=213562
+
+ Reviewed by Wenson Hsieh.
+
+ * Platform/spi/ios/RunningBoardServicesSPI.h:
+ We can't forward-declare Objective-C SPI if it actually exists
+ without inspiring duplicate definition errors.
+
2020-06-24 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r263488. rdar://problem/64735026
Modified: branches/safari-610.1.19-branch/Source/WebKit/Platform/spi/ios/RunningBoardServicesSPI.h (263754 => 263755)
--- branches/safari-610.1.19-branch/Source/WebKit/Platform/spi/ios/RunningBoardServicesSPI.h 2020-06-30 16:34:27 UTC (rev 263754)
+++ branches/safari-610.1.19-branch/Source/WebKit/Platform/spi/ios/RunningBoardServicesSPI.h 2020-06-30 16:35:15 UTC (rev 263755)
@@ -31,9 +31,13 @@
extern const NSTimeInterval RBSProcessTimeLimitationNone;
+#if __has_include(<RunningBoardServices/RBSProcessLimitations.h>)
+#import <RunningBoardServices/RBSProcessLimitations.h>
+#else
@interface RBSProcessLimitations : NSObject
@property (nonatomic, readwrite, assign) NSTimeInterval runTime;
@end
+#endif
#else
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
