Diff
Modified: trunk/Source/WebKit/ChangeLog (253662 => 253663)
--- trunk/Source/WebKit/ChangeLog 2019-12-18 01:36:02 UTC (rev 253662)
+++ trunk/Source/WebKit/ChangeLog 2019-12-18 01:54:54 UTC (rev 253663)
@@ -1,5 +1,11 @@
2019-12-17 Per Arne Vollan <pvol...@apple.com>
+ Unreviewed build fix after r253661.
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+
+2019-12-17 Per Arne Vollan <pvol...@apple.com>
+
[iOS] The WebContent process should not use API to get the user interface idiom
https://bugs.webkit.org/show_bug.cgi?id=205236
Deleted: trunk/Source/WebKit/Shared/UserInterfaceIdiom.h (253662 => 253663)
--- trunk/Source/WebKit/Shared/UserInterfaceIdiom.h 2019-12-18 01:36:02 UTC (rev 253662)
+++ trunk/Source/WebKit/Shared/UserInterfaceIdiom.h 2019-12-18 01:54:54 UTC (rev 253663)
@@ -1,37 +0,0 @@
-/*
-* Copyright (C) 2019 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.
-*/
-
-#pragma once
-
-#if PLATFORM(IOS_FAMILY)
-
-namespace WebKit {
-
-bool currentUserInterfaceIdiomIsPad();
-void setCurrentUserInterfaceIdiomIsPad(bool);
-
-}
-
-#endif
Added: trunk/Source/WebKit/Shared/UserInterfaceIdiom.h (0 => 253663)
--- trunk/Source/WebKit/Shared/UserInterfaceIdiom.h (rev 0)
+++ trunk/Source/WebKit/Shared/UserInterfaceIdiom.h 2019-12-18 01:54:54 UTC (rev 253663)
@@ -0,0 +1,37 @@
+/*
+* Copyright (C) 2019 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.
+*/
+
+#pragma once
+
+#if PLATFORM(IOS_FAMILY)
+
+namespace WebKit {
+
+bool currentUserInterfaceIdiomIsPad();
+void setCurrentUserInterfaceIdiomIsPad(bool);
+
+}
+
+#endif
Deleted: trunk/Source/WebKit/Shared/UserInterfaceIdiom.mm (253662 => 253663)
--- trunk/Source/WebKit/Shared/UserInterfaceIdiom.mm 2019-12-18 01:36:02 UTC (rev 253662)
+++ trunk/Source/WebKit/Shared/UserInterfaceIdiom.mm 2019-12-18 01:54:54 UTC (rev 253663)
@@ -1,76 +0,0 @@
-/*
-* Copyright (C) 2019 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.
-*/
-
-#include "config.h"
-#include "UserInterfaceIdiom.h"
-
-#if PLATFORM(IOS_FAMILY)
-
-#if USE(APPLE_INTERNAL_SDK)
-#import <UIKit/UIDevice_Private.h>
-#else
-#import <UIKit/UIDevice.h>
-#endif
-
-namespace WebKit {
-
-enum class UserInterfaceIdiomState : uint8_t {
- IsPad,
- IsNotPad,
- Unknown,
-};
-
-static UserInterfaceIdiomState userInterfaceIdiomIsPadState = UserInterfaceIdiomState::Unknown;
-
-#if PLATFORM(IOS_FAMILY)
-static inline bool userInterfaceIdiomIsPad()
-{
- // This inline function exists to thwart unreachable code
- // detection on platforms where UICurrentUserInterfaceIdiomIsPad
- // is defined directly to false.
-#if USE(APPLE_INTERNAL_SDK)
- return UICurrentUserInterfaceIdiomIsPad();
-#else
- return [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad;
-#endif
-}
-#endif
-
-bool currentUserInterfaceIdiomIsPad()
-{
- if (userInterfaceIdiomIsPadState == UserInterfaceIdiomState::Unknown)
- setCurrentUserInterfaceIdiomIsPad(userInterfaceIdiomIsPad());
-
- return userInterfaceIdiomIsPadState == UserInterfaceIdiomState::IsPad;
-}
-
-void setCurrentUserInterfaceIdiomIsPad(bool isPad)
-{
- userInterfaceIdiomIsPadState = isPad ? UserInterfaceIdiomState::IsPad : UserInterfaceIdiomState::IsNotPad;
-}
-
-}
-
-#endif
Added: trunk/Source/WebKit/Shared/UserInterfaceIdiom.mm (0 => 253663)
--- trunk/Source/WebKit/Shared/UserInterfaceIdiom.mm (rev 0)
+++ trunk/Source/WebKit/Shared/UserInterfaceIdiom.mm 2019-12-18 01:54:54 UTC (rev 253663)
@@ -0,0 +1,76 @@
+/*
+* Copyright (C) 2019 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.
+*/
+
+#include "config.h"
+#include "UserInterfaceIdiom.h"
+
+#if PLATFORM(IOS_FAMILY)
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <UIKit/UIDevice_Private.h>
+#else
+#import <UIKit/UIDevice.h>
+#endif
+
+namespace WebKit {
+
+enum class UserInterfaceIdiomState : uint8_t {
+ IsPad,
+ IsNotPad,
+ Unknown,
+};
+
+static UserInterfaceIdiomState userInterfaceIdiomIsPadState = UserInterfaceIdiomState::Unknown;
+
+#if PLATFORM(IOS_FAMILY)
+static inline bool userInterfaceIdiomIsPad()
+{
+ // This inline function exists to thwart unreachable code
+ // detection on platforms where UICurrentUserInterfaceIdiomIsPad
+ // is defined directly to false.
+#if USE(APPLE_INTERNAL_SDK)
+ return UICurrentUserInterfaceIdiomIsPad();
+#else
+ return [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad;
+#endif
+}
+#endif
+
+bool currentUserInterfaceIdiomIsPad()
+{
+ if (userInterfaceIdiomIsPadState == UserInterfaceIdiomState::Unknown)
+ setCurrentUserInterfaceIdiomIsPad(userInterfaceIdiomIsPad());
+
+ return userInterfaceIdiomIsPadState == UserInterfaceIdiomState::IsPad;
+}
+
+void setCurrentUserInterfaceIdiomIsPad(bool isPad)
+{
+ userInterfaceIdiomIsPadState = isPad ? UserInterfaceIdiomState::IsPad : UserInterfaceIdiomState::IsNotPad;
+}
+
+}
+
+#endif
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (253662 => 253663)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2019-12-18 01:36:02 UTC (rev 253662)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2019-12-18 01:54:54 UTC (rev 253663)
@@ -33,6 +33,7 @@
#import "APIOpenPanelParameters.h"
#import "APIString.h"
#import "UIKitSPI.h"
+#import "UserInterfaceIdiom.h"
#import "WKContentViewInteraction.h"
#import "WKData.h"
#import "WKStringCF.h"
