Diff
Modified: trunk/Source/WebKit/ChangeLog (278690 => 278691)
--- trunk/Source/WebKit/ChangeLog 2021-06-10 03:23:49 UTC (rev 278690)
+++ trunk/Source/WebKit/ChangeLog 2021-06-10 04:41:45 UTC (rev 278691)
@@ -1,3 +1,14 @@
+2021-06-09 Megan Gardner <[email protected]>
+
+ Create SPI file for Synapse so external builds will work.
+ https://bugs.webkit.org/show_bug.cgi?id=226844
+
+ Reviewed by Tim Horton.
+
+ * Platform/spi/Cocoa/SynapseSPI.h: Added.
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ * WebKit.xcodeproj/project.pbxproj:
+
2021-06-09 Michael Catanzaro <[email protected]>
[GTK] Duplicate WebKitWebView::show-option-menu confuses introspection, should use --warn-error when building gir
Added: trunk/Source/WebKit/Platform/spi/Cocoa/SynapseSPI.h (0 => 278691)
--- trunk/Source/WebKit/Platform/spi/Cocoa/SynapseSPI.h (rev 0)
+++ trunk/Source/WebKit/Platform/spi/Cocoa/SynapseSPI.h 2021-06-10 04:41:45 UTC (rev 278691)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2021 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 ENABLE(APP_HIGHLIGHTS)
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <Synapse/SYNotesActivationObserver.h>
+#else
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void(^SYNotesActivationObserverHandler)(BOOL isVisible);
+
+@interface SYNotesActivationObserver : NSObject
+
+@property (nonatomic, readonly, getter=isVisible) BOOL visible;
+
+- (instancetype)initWithHandler:(nullable SYNotesActivationObserverHandler)handler;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#endif // ENABLE(APP_HIGHLIGHTS)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm (278690 => 278691)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2021-06-10 03:23:49 UTC (rev 278690)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2021-06-10 04:41:45 UTC (rev 278691)
@@ -39,6 +39,7 @@
#import "SafeBrowsingWarning.h"
#import "SharedBufferCopy.h"
#import "SharedBufferDataReference.h"
+#import "SynapseSPI.h"
#import "WebContextMenuProxy.h"
#import "WebPage.h"
#import "WebPageMessages.h"
@@ -67,11 +68,9 @@
#endif
#if ENABLE(APP_HIGHLIGHTS)
-#import <Synapse/SYNotesActivationObserver.h>
-
SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Synapse)
SOFT_LINK_CLASS_OPTIONAL(Synapse, SYNotesActivationObserver)
-#endif // ENABLE(APP_HIGHLIGHTS)
+#endif
#if USE(APPKIT)
#import <AppKit/NSImage.h>
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (278690 => 278691)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-06-10 03:23:49 UTC (rev 278690)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-06-10 04:41:45 UTC (rev 278691)
@@ -955,6 +955,7 @@
446DC64C24A2D8E50061F390 /* PlaybackSessionContextIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 446DC64B24A2D8AD0061F390 /* PlaybackSessionContextIdentifier.h */; };
4476EF0925BFC8B7004A0587 /* _WKAppHighlightDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4476EF0825BFC8B7004A0587 /* _WKAppHighlightDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
4482734724528F6000A95493 /* CocoaImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4482734624528F6000A95493 /* CocoaImage.h */; };
+ 448AC24E267135A700B28921 /* SynapseSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 448AC24D267135A600B28921 /* SynapseSPI.h */; };
449316A325DC7DC400AA66DE /* _WKAppHighlight.h in Headers */ = {isa = PBXBuildFile; fileRef = 449316A125DC7DC300AA66DE /* _WKAppHighlight.h */; settings = {ATTRIBUTES = (Private, ); }; };
449316A625DC9D0000AA66DE /* _WKAppHighlightInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 449316A525DC9D0000AA66DE /* _WKAppHighlightInternal.h */; };
449D90DA21FDC30B00F677C0 /* LocalAuthenticationSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 449D90D821FD63FE00F677C0 /* LocalAuthenticationSoftLink.mm */; };
@@ -3876,6 +3877,7 @@
446DC64B24A2D8AD0061F390 /* PlaybackSessionContextIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionContextIdentifier.h; sourceTree = "<group>"; };
4476EF0825BFC8B7004A0587 /* _WKAppHighlightDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAppHighlightDelegate.h; sourceTree = "<group>"; };
4482734624528F6000A95493 /* CocoaImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoaImage.h; sourceTree = "<group>"; };
+ 448AC24D267135A600B28921 /* SynapseSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SynapseSPI.h; sourceTree = "<group>"; };
449316A125DC7DC300AA66DE /* _WKAppHighlight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAppHighlight.h; sourceTree = "<group>"; };
449316A225DC7DC300AA66DE /* _WKAppHighlight.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKAppHighlight.mm; sourceTree = "<group>"; };
449316A525DC9D0000AA66DE /* _WKAppHighlightInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAppHighlightInternal.h; sourceTree = "<group>"; };
@@ -7914,6 +7916,7 @@
3754D5441B3A29FD003A4C7F /* NSInvocationSPI.h */,
5CB6AE432609799C00B6ED5A /* ReasonSPI.h */,
0E97D74C200E8FF300BF6643 /* SafeBrowsingSPI.h */,
+ 448AC24D267135A600B28921 /* SynapseSPI.h */,
);
path = Cocoa;
sourceTree = "<group>";
@@ -12325,6 +12328,7 @@
1AE00D6C18327C1200087DD7 /* StringReference.h in Headers */,
296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
57FD318622B3516C008D0E8B /* SubFrameSOAuthorizationSession.h in Headers */,
+ 448AC24E267135A700B28921 /* SynapseSPI.h in Headers */,
4459984222833E8700E61373 /* SyntheticEditingCommandType.h in Headers */,
3157135F2040A9B20084F9CF /* SystemPreviewController.h in Headers */,
44C51844266BE8C4006DD522 /* TCCSoftLink.h in Headers */,
