Modified: trunk/Source/WebKit/ChangeLog (262861 => 262862)
--- trunk/Source/WebKit/ChangeLog 2020-06-10 21:44:04 UTC (rev 262861)
+++ trunk/Source/WebKit/ChangeLog 2020-06-10 21:47:23 UTC (rev 262862)
@@ -1,3 +1,18 @@
+2020-06-10 Jonathan Bedard <jbed...@apple.com>
+
+ WebKit: Add ClockKitSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=212994
+ <rdar://problem/64181092>
+
+ Reviewed by Wenson Hsieh.
+
+ No new tests, behavior unchanged.
+
+ * Platform/spi/watchos: Added.
+ * Platform/spi/watchos/ClockKitSPI.h: Added.
+ * UIProcess/ios/forms/WKTimePickerViewController.mm: Import ClockKitSPI.h and UIKitSPI.h.
+ * WebKit.xcodeproj/project.pbxproj: Include ClockKitSPI.
+
2020-06-10 Brian Burg <bb...@apple.com>
WebDriver on non-iOS ports cannot perform ActionChain which has scrolling down to the element and click it
Added: trunk/Source/WebKit/Platform/spi/watchos/ClockKitSPI.h (0 => 262862)
--- trunk/Source/WebKit/Platform/spi/watchos/ClockKitSPI.h (rev 0)
+++ trunk/Source/WebKit/Platform/spi/watchos/ClockKitSPI.h 2020-06-10 21:47:23 UTC (rev 262862)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if PLATFORM(WATCHOS)
+
+#import <UIKit/UIKit.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <ClockKitUI/CLKUIWheelsOfTimeView.h>
+
+#else // USE(APPLE_INTERNAL_SDK)
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSUInteger, CLKUIWheelsOfTimeStyle) {
+ CLKUIWheelsOfTimeStyleTimer,
+ CLKUIWheelsOfTimeStyleAlarm12,
+ CLKUIWheelsOfTimeStyleOffset,
+ CLKUIWheelsOfTimeStyleAlarm24,
+ CLKUIWheelsOfTimeStyleDuration,
+};
+
+@protocol CLKUIWheelsOfTimeDelegate <NSObject>
+@end
+
+@interface CLKUIWheelsOfTimeView : UIView
+@property (nonatomic, weak) id <CLKUIWheelsOfTimeDelegate> delegate;
+@property (assign, readonly, nonatomic) NSInteger hour;
+@property (assign, readonly, nonatomic) NSInteger minute;
+- (instancetype)initWithFrame:(CGRect)frame style:(CLKUIWheelsOfTimeStyle)style;
+- (void)setHour:(NSInteger)hour andMinute:(NSInteger)minute;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#endif // PLATFORM(WATCHOS)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKTimePickerViewController.mm (262861 => 262862)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKTimePickerViewController.mm 2020-06-10 21:44:04 UTC (rev 262861)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKTimePickerViewController.mm 2020-06-10 21:47:23 UTC (rev 262862)
@@ -28,10 +28,9 @@
#if PLATFORM(WATCHOS)
-#import <ClockKitUI/CLKUIWheelsOfTimeView.h>
-#import <PepperUICore/PUICQuickboardViewController.h>
-#import <PepperUICore/PUICQuickboardViewController_Private.h>
-#import <UIKit/UIResponder_Private.h>
+#import "ClockKitSPI.h"
+#import "UIKitSPI.h"
+
#import <WebCore/LocalizedStrings.h>
#import <wtf/SoftLinking.h>
#import <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (262861 => 262862)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-06-10 21:44:04 UTC (rev 262861)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-06-10 21:47:23 UTC (rev 262862)
@@ -4616,6 +4616,7 @@
AAFA634E234F7C6300FFA864 /* AsyncRevalidation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncRevalidation.h; sourceTree = "<group>"; };
AAFA6350234F7C7300FFA864 /* AsyncRevalidation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncRevalidation.cpp; sourceTree = "<group>"; };
AB2750C024859B1A00F1C9D8 /* PepperUICoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PepperUICoreSPI.h; sourceTree = "<group>"; };
+ ABB6C809249180DB00C50D9A /* ClockKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClockKitSPI.h; sourceTree = "<group>"; };
B396EA5512E0ED2D00F4FEB7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
B62E730F143047A60069EC35 /* WKHitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKHitTestResult.cpp; sourceTree = "<group>"; };
B62E7311143047B00069EC35 /* WKHitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHitTestResult.h; sourceTree = "<group>"; };
@@ -8720,6 +8721,7 @@
AB2750BD2485809100F1C9D8 /* watchos */ = {
isa = PBXGroup;
children = (
+ ABB6C809249180DB00C50D9A /* ClockKitSPI.h */,
AB2750C024859B1A00F1C9D8 /* PepperUICoreSPI.h */,
);
path = watchos;
