Title: [238721] tags/Safari-607.1.15.1/Source/WebKit
- Revision
- 238721
- Author
- kocsen_ch...@apple.com
- Date
- 2018-11-29 17:45:49 -0800 (Thu, 29 Nov 2018)
Log Message
Cherry-pick r238712. rdar://problem/46360649
Try to fix the build.
* Platform/spi/ios/PencilKitSPI.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238712 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-607.1.15.1/Source/WebKit/ChangeLog (238720 => 238721)
--- tags/Safari-607.1.15.1/Source/WebKit/ChangeLog 2018-11-30 01:32:17 UTC (rev 238720)
+++ tags/Safari-607.1.15.1/Source/WebKit/ChangeLog 2018-11-30 01:45:49 UTC (rev 238721)
@@ -1,3 +1,19 @@
+2018-11-29 Kocsen Chung <kocsen_ch...@apple.com>
+
+ Cherry-pick r238712. rdar://problem/46360649
+
+ Try to fix the build.
+
+ * Platform/spi/ios/PencilKitSPI.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238712 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-29 Tim Horton <timothy_hor...@apple.com>
+
+ Try to fix the build.
+
+ * Platform/spi/ios/PencilKitSPI.h:
+
2018-11-28 Alan Coon <alanc...@apple.com>
Revert r238597. rdar://problem/46321159
Modified: tags/Safari-607.1.15.1/Source/WebKit/Platform/spi/ios/PencilKitSPI.h (238720 => 238721)
--- tags/Safari-607.1.15.1/Source/WebKit/Platform/spi/ios/PencilKitSPI.h 2018-11-30 01:32:17 UTC (rev 238720)
+++ tags/Safari-607.1.15.1/Source/WebKit/Platform/spi/ios/PencilKitSPI.h 2018-11-30 01:45:49 UTC (rev 238721)
@@ -28,22 +28,69 @@
#if USE(APPLE_INTERNAL_SDK)
#import <PencilKit/PencilKit.h>
+#import <PencilKit/PKCanvasView_Private.h>
#import <PencilKit/PKDrawing_Private.h>
+#import <PencilKit/PKImageRenderer.h>
+#import <PencilKit/PKInlineInkPicker.h>
+#import <PencilKit/PKInlineInkPicker_Private.h>
+#import <PencilKit/PKStroke.h>
#else
+#import <UIKit/UIKit.h>
+
+@class PKCanvasView;
+@class PKDrawing;
+@class PKInk;
+@class PKInlineInkPicker;
+
+typedef NSString * PKInkIdentifier;
+
+@protocol PKCanvasViewDelegate
+@optional
+- (void)drawingDidChange:(PKCanvasView *)canvasView;
+@end
+
+@protocol PKInlineInkPickerDelegate <NSObject>
+@optional
+- (void)inlineInkPicker:(PKInlineInkPicker *)inlineInkPicker didSelectTool:(PKInkIdentifier)identifer;
+- (void)inlineInkPickerDidToggleRuler:(PKInlineInkPicker *)inlineInkPicker;
+- (void)inlineInkPicker:(PKInlineInkPicker *)inlineInkPicker didSelectColor:(UIColor *)color;
+- (UIViewController *)viewControllerForPopoverPresentationFromInlineInkPicker:(PKInlineInkPicker *)inlineInkPicker;
+@end
+
@interface PKCanvasView : UIView
@property (nonatomic, getter=isFingerDrawingEnabled) BOOL fingerDrawingEnabled;
+@property (nonatomic) BOOL rulerEnabled;
+@property (nonatomic, copy) PKDrawing *drawing;
+@property (nonatomic, strong) PKInk *ink;
+@property (nonatomic, weak) NSObject<PKCanvasViewDelegate> *drawingDelegate;
@end
+@interface PKInlineInkPicker : UIControl
+
+@property (nonatomic, copy) PKInk *selectedInk;
+- (void)setSelectedInk:(PKInk *)selectedInk animated:(BOOL)animated;
+@property (nonatomic, weak) id<PKInlineInkPickerDelegate> delegate;
+
+@end
+
@interface PKDrawing : NSObject
+- (instancetype)initWithData:(NSData *)data error:(NSError **)error;
- (NSData *)serialize;
@end
+@interface PKImageRenderer : NSObject
+
+- (instancetype)initWithSize:(CGSize)size scale:(CGFloat)scale renderQueue:(dispatch_queue_t)renderQueue;
+- (void)renderDrawing:(PKDrawing *)drawing completion:(void(^)(UIImage *image))completionBlock;
+
+@end
+
#endif
#endif // HAVE(PENCILKIT)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
