Changeset 236491 in webkit

Timestamp:

Sep 25, 2018, 6:18:53 PM (8 years ago)

Author:

Conrad Shultz

Message:

Enable customization of the file upload panel
​https://bugs.webkit.org/show_bug.cgi?id=189970

Reviewed by Wenson Hsieh.

With this change, platform implementations can override, or implement in a category,
+[WKContentView _fileUploadPanelClass] as needed.

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _showRunOpenPanel:resultListener:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-25  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Enable customization of the file upload panel
+        https://bugs.webkit.org/show_bug.cgi?id=189970
+
+        Reviewed by Wenson Hsieh.
+
+        With this change, platform implementations can override, or implement in a category,
+        +[WKContentView _fileUploadPanelClass] as needed.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _showRunOpenPanel:resultListener:]):
+
 2018-09-25  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

@@ -405 +405 @@
 #endif
 
+@interface WKContentView (WKFileUploadPanel)
++ (Class)_fileUploadPanelClass;
+@end
+
 #endif // PLATFORM(IOS)

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -116 +116 @@
 #if ENABLE(INPUT_TYPE_COLOR)
 #import "WKFormColorControl.h"
+#endif
+
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKPlatformFileUploadPanel.mm>)
+#import <WebKitAdditions/WKPlatformFileUploadPanel.mm>
 #endif
 
@@ -4732 +4736 @@
         return;
 
-    _fileUploadPanel = adoptNS([[WKFileUploadPanel alloc] initWithView:self]);
+    Class ownClass = self.class;
+    Class panelClass = nil;
+    if ([ownClass respondsToSelector:@selector(_fileUploadPanelClass)])
+        panelClass = [ownClass _fileUploadPanelClass];
+    if (!panelClass)
+        panelClass = [WKFileUploadPanel class];
+
+    _fileUploadPanel = adoptNS([[panelClass alloc] initWithView:self]);
     [_fileUploadPanel setDelegate:self];
     [_fileUploadPanel presentWithParameters:parameters resultListener:listener];