Diff
Modified: trunk/Source/WebCore/ChangeLog (260596 => 260597)
--- trunk/Source/WebCore/ChangeLog 2020-04-23 20:37:54 UTC (rev 260596)
+++ trunk/Source/WebCore/ChangeLog 2020-04-23 20:59:51 UTC (rev 260597)
@@ -1,3 +1,16 @@
+2020-04-23 Alex Christensen <[email protected]>
+
+ Jesus Calling app needs more WebSQL
+ https://bugs.webkit.org/show_bug.cgi?id=210889
+ <rdar://problem/61795507>
+
+ Reviewed by Chris Dumez.
+
+ Manually verified this fixes the issue in the radar.
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::jsDOMWindowInstanceFunctionOpenDatabaseBody):
+
2020-04-23 Rob Buis <[email protected]>
Move applyUserAgentIfNeeded calls to a more central place
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (260596 => 260597)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2020-04-23 20:37:54 UTC (rev 260596)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2020-04-23 20:59:51 UTC (rev 260597)
@@ -59,11 +59,6 @@
#include "JSWebKitNamespace.h"
#endif
-#if PLATFORM(IOS)
-#include "RuntimeApplicationChecks.h"
-#include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
-#endif
-
namespace WebCore {
using namespace JSC;
@@ -636,15 +631,9 @@
JSValue JSDOMWindow::openDatabase(JSC::JSGlobalObject& lexicalGlobalObject) const
{
-#if PLATFORM(IOS)
- static const bool openDatabaseShouldBeDefinedEvenWhenDisabled = IOSApplication::isJesusCalling() && applicationSDKVersion() <= DYLD_IOS_VERSION_12_2;
-#else
- constexpr bool openDatabaseShouldBeDefinedEvenWhenDisabled = false;
-#endif
-
VM& vm = lexicalGlobalObject.vm();
StringImpl* name = PropertyName(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().openDatabasePublicName()).publicName();
- if (RuntimeEnabledFeatures::sharedFeatures().webSQLEnabled() || openDatabaseShouldBeDefinedEvenWhenDisabled)
+ if (RuntimeEnabledFeatures::sharedFeatures().webSQLEnabled())
return JSFunction::create(vm, &lexicalGlobalObject, 4, name, jsDOMWindowInstanceFunctionOpenDatabase, NoIntrinsic);
return JSFunction::createFunctionThatMasqueradesAsUndefined(vm, &lexicalGlobalObject, 4, name, jsDOMWindowInstanceFunctionOpenDatabase, NoIntrinsic);
Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (260596 => 260597)
--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2020-04-23 20:37:54 UTC (rev 260596)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2020-04-23 20:59:51 UTC (rev 260597)
@@ -86,7 +86,7 @@
WEBCORE_EXPORT bool isDumpRenderTree();
WEBCORE_EXPORT bool isMiniBrowser();
bool isMobileStore();
-bool isJesusCalling();
+WEBCORE_EXPORT bool isJesusCalling();
bool isSpringBoard();
WEBCORE_EXPORT bool isWebProcess();
WEBCORE_EXPORT bool isIBooks();
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (260596 => 260597)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-04-23 20:37:54 UTC (rev 260596)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-04-23 20:59:51 UTC (rev 260597)
@@ -1,3 +1,14 @@
+2020-04-23 Alex Christensen <[email protected]>
+
+ Jesus Calling app needs more WebSQL
+ https://bugs.webkit.org/show_bug.cgi?id=210889
+ <rdar://problem/61795507>
+
+ Reviewed by Chris Dumez.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+
2020-04-22 Darin Adler <[email protected]>
[Cocoa] Build with UChar as char16_t even in builds that use Apple's internal SDK
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (260596 => 260597)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2020-04-23 20:37:54 UTC (rev 260596)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2020-04-23 20:59:51 UTC (rev 260597)
@@ -50,6 +50,7 @@
#import <wtf/MainThread.h>
#import <wtf/RetainPtr.h>
#import <wtf/RunLoop.h>
+#import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
using namespace WebCore;
@@ -389,11 +390,13 @@
JSC::initializeThreading();
RunLoop::initializeMainRunLoop();
bool attachmentElementEnabled = MacApplication::isAppleMail();
+ bool webSQLEnabled = false;
#else
bool allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
bool allowsInlineMediaPlaybackAfterFullscreen = WebCore::deviceClass() != MGDeviceClassiPad;
bool requiresPlaysInlineAttribute = !allowsInlineMediaPlayback;
bool attachmentElementEnabled = IOSApplication::isMobileMail();
+ bool webSQLEnabled = IOSApplication::isJesusCalling() && applicationSDKVersion() <= DYLD_IOS_VERSION_12_2;
#endif
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -711,7 +714,7 @@
@YES, WebKitCSSShadowPartsEnabledPreferenceKey,
@NO, WebKitDebugInAppBrowserPrivacyEnabledPreferenceKey,
@NO, WebKitAspectRatioOfImgFromWidthAndHeightEnabledPreferenceKey,
- @NO, WebKitWebSQLEnabledPreferenceKey,
+ @(webSQLEnabled), WebKitWebSQLEnabledPreferenceKey,
@YES, WebKitDebugNeedsInAppBrowserPrivacyQuirksPreferenceKey,
nil];
