[Extra zoom mode] Adopt list view controller UI for select menus

https://bugs.webkit.org/show_bug.cgi?id=183944
<rdar://problem/38799062>

Reviewed by Tim Horton.

Move UIProcess/WKSelectMenuListViewController.* to UIProcess/ios/forms, where it was intended to go.

* UIProcess/ios/forms/WKSelectMenuListViewController.h: Renamed from Source/WebKit/UIProcess/WKSelectMenuListViewController.h.
* UIProcess/ios/forms/WKSelectMenuListViewController.mm: Renamed from Source/WebKit/UIProcess/WKSelectMenuListViewController.mm.
* WebKit.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229928 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 9f96408..ac06ec7 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2018-03-23  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Extra zoom mode] Adopt list view controller UI for select menus
+        https://bugs.webkit.org/show_bug.cgi?id=183944
+        <rdar://problem/38799062>
+
+        Reviewed by Tim Horton.
+
+        Move UIProcess/WKSelectMenuListViewController.* to UIProcess/ios/forms, where it was intended to go.
+
+        * UIProcess/ios/forms/WKSelectMenuListViewController.h: Renamed from Source/WebKit/UIProcess/WKSelectMenuListViewController.h.
+        * UIProcess/ios/forms/WKSelectMenuListViewController.mm: Renamed from Source/WebKit/UIProcess/WKSelectMenuListViewController.mm.
+        * WebKit.xcodeproj/project.pbxproj:
+
 2018-03-23  Chris Dumez  <cdumez@apple.com>
 
         Promptly terminate service worker processes when they are no longer needed

diff --git a/Source/WebKit/UIProcess/WKSelectMenuListViewController.h b/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.h
similarity index 100%
rename from Source/WebKit/UIProcess/WKSelectMenuListViewController.h
rename to Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.h

diff --git a/Source/WebKit/UIProcess/WKSelectMenuListViewController.mm b/Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.mm
similarity index 100%
rename from Source/WebKit/UIProcess/WKSelectMenuListViewController.mm
rename to Source/WebKit/UIProcess/ios/forms/WKSelectMenuListViewController.mm

diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
index bdb83c0..c1af53b 100644 (file)
--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -2155,14 +2155,13 @@
                F44291961FA5942A002CC93E /* _WKAttachmentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = F44291951FA5942A002CC93E /* _WKAttachmentInternal.h */; };
                F44DFEB21E9E752F0038D196 /* WebIconUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = F44DFEB01E9E752F0038D196 /* WebIconUtilities.h */; };
                F44DFEB31E9E752F0038D196 /* WebIconUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = F44DFEB11E9E752F0038D196 /* WebIconUtilities.mm */; };
-               F478E92920644EE900EE03E8 /* WKSelectMenuListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = F478E92720644EE900EE03E8 /* WKSelectMenuListViewController.h */; };
-               F478E92A20644EE900EE03E8 /* WKSelectMenuListViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F478E92820644EE900EE03E8 /* WKSelectMenuListViewController.mm */; };
                F496A4311F58A272004C1757 /* DragDropInteractionState.h in Headers */ = {isa = PBXBuildFile; fileRef = F496A42F1F58A272004C1757 /* DragDropInteractionState.h */; };
                F496A4321F58A272004C1757 /* DragDropInteractionState.mm in Sources */ = {isa = PBXBuildFile; fileRef = F496A4301F58A272004C1757 /* DragDropInteractionState.mm */; };
                F4D5F51D206087A10038BBA8 /* WKTextInputListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = F4D5F519206087A00038BBA8 /* WKTextInputListViewController.h */; };
                F4D5F51E206087A10038BBA8 /* WKTextInputListViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4D5F51A206087A10038BBA8 /* WKTextInputListViewController.mm */; };
                F4D5F51F206087A10038BBA8 /* WKFormControlListViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = F4D5F51B206087A10038BBA8 /* WKFormControlListViewController.h */; };
                F4D5F520206087A10038BBA8 /* WKFormControlListViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4D5F51C206087A10038BBA8 /* WKFormControlListViewController.mm */; };
+               F4F59AD62065AEB1006CAA46 /* WKSelectMenuListViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4F59AD32065A5C9006CAA46 /* WKSelectMenuListViewController.mm */; };
                F6113E25126CE1820057D0A7 /* APIUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */; };
                F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */; };
                F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -4695,14 +4694,14 @@
                F44291951FA5942A002CC93E /* _WKAttachmentInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _WKAttachmentInternal.h; sourceTree = "<group>"; };
                F44DFEB01E9E752F0038D196 /* WebIconUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebIconUtilities.h; path = ios/WebIconUtilities.h; sourceTree = "<group>"; };
                F44DFEB11E9E752F0038D196 /* WebIconUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebIconUtilities.mm; path = ios/WebIconUtilities.mm; sourceTree = "<group>"; };
-               F478E92720644EE900EE03E8 /* WKSelectMenuListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKSelectMenuListViewController.h; sourceTree = "<group>"; };
-               F478E92820644EE900EE03E8 /* WKSelectMenuListViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKSelectMenuListViewController.mm; sourceTree = "<group>"; };
                F496A42F1F58A272004C1757 /* DragDropInteractionState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DragDropInteractionState.h; path = ios/DragDropInteractionState.h; sourceTree = "<group>"; };
                F496A4301F58A272004C1757 /* DragDropInteractionState.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = DragDropInteractionState.mm; path = ios/DragDropInteractionState.mm; sourceTree = "<group>"; };
                F4D5F519206087A00038BBA8 /* WKTextInputListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKTextInputListViewController.h; path = ios/forms/WKTextInputListViewController.h; sourceTree = "<group>"; };
                F4D5F51A206087A10038BBA8 /* WKTextInputListViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKTextInputListViewController.mm; path = ios/forms/WKTextInputListViewController.mm; sourceTree = "<group>"; };
                F4D5F51B206087A10038BBA8 /* WKFormControlListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKFormControlListViewController.h; path = ios/forms/WKFormControlListViewController.h; sourceTree = "<group>"; };
                F4D5F51C206087A10038BBA8 /* WKFormControlListViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFormControlListViewController.mm; path = ios/forms/WKFormControlListViewController.mm; sourceTree = "<group>"; };
+               F4F59AD32065A5C9006CAA46 /* WKSelectMenuListViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKSelectMenuListViewController.mm; path = ios/forms/WKSelectMenuListViewController.mm; sourceTree = "<group>"; };
+               F4F59AD42065A5CA006CAA46 /* WKSelectMenuListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKSelectMenuListViewController.h; path = ios/forms/WKSelectMenuListViewController.h; sourceTree = "<group>"; };
                F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserContentURLPattern.h; sourceTree = "<group>"; };
                F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserContentURLPattern.cpp; sourceTree = "<group>"; };
                F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentURLPattern.h; sourceTree = "<group>"; };
@@ -8465,8 +8464,8 @@
                                2EA7B3D42026CF23009CE5AC /* WKNumberPadView.mm */,
                                2EA7B3CF2026CEF8009CE5AC /* WKNumberPadViewController.h */,
                                2EA7B3D02026CEF8009CE5AC /* WKNumberPadViewController.mm */,
-                               F478E92720644EE900EE03E8 /* WKSelectMenuListViewController.h */,
-                               F478E92820644EE900EE03E8 /* WKSelectMenuListViewController.mm */,
+                               F4F59AD42065A5CA006CAA46 /* WKSelectMenuListViewController.h */,
+                               F4F59AD32065A5C9006CAA46 /* WKSelectMenuListViewController.mm */,
                                2E16B69F2016E680008996D6 /* WKTextFormControlViewController.h */,
                                2E16B6A02016E680008996D6 /* WKTextFormControlViewController.mm */,
                                F4D5F519206087A00038BBA8 /* WKTextInputListViewController.h */,
@@ -9668,7 +9667,6 @@
                                51CD1C651B34B9D400142CA5 /* WKSecurityOrigin.h in Headers */,
                                51CD1C671B34B9DF00142CA5 /* WKSecurityOriginInternal.h in Headers */,
                                51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */,
-                               F478E92920644EE900EE03E8 /* WKSelectMenuListViewController.h in Headers */,
                                BC407604124FF0270068F20A /* WKSerializedScriptValue.h in Headers */,
                                1ADE46B31954EC61000F7985 /* WKSessionStateRef.h in Headers */,
                                BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */,
@@ -11316,7 +11314,7 @@
                                0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */,
                                51CD1C661B34B9DC00142CA5 /* WKSecurityOrigin.mm in Sources */,
                                51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */,
-                               F478E92A20644EE900EE03E8 /* WKSelectMenuListViewController.mm in Sources */,
+                               F4F59AD62065AEB1006CAA46 /* WKSelectMenuListViewController.mm in Sources */,
                                BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
                                1ADE46B21954EC61000F7985 /* WKSessionStateRef.cpp in Sources */,
                                513E462E1AD837560016234A /* WKSharingServicePickerDelegate.mm in Sources */,