Changeset 258564 in webkit

Timestamp:

Mar 17, 2020, 11:31:22 AM (5 years ago)

Author:

achristensen@apple.com

Message:

REGRESSION(r254856) Add exception for window.openDatabase to not masquerade as undefined in currently shipping Jesus Calling Devotional app
​https://bugs.webkit.org/show_bug.cgi?id=209160
<rdar://problem/60297073>

Reviewed by Geoff Garen.

Source/WebCore:

Manually verified this fixes the app, which compares typeof openDatabase with 'undefined'
Going forward, we intend to completely remove WebSQL, so this is a temporary exception to our removal strategy.

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::openDatabase const):

• platform/RuntimeApplicationChecks.h:
• platform/cocoa/RuntimeApplicationChecksCocoa.mm:

(WebCore::IOSApplication::isJesusCalling):

Source/WTF:

• wtf/spi/darwin/dyldSPI.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/spi/darwin/dyldSPI.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (2 diffs)
• WebCore/platform/RuntimeApplicationChecks.h (modified) (1 diff)
• WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-03-17  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION(r254856) Add exception for window.openDatabase to not masquerade as undefined in currently shipping Jesus Calling Devotional app
+        https://bugs.webkit.org/show_bug.cgi?id=209160
+        <rdar://problem/60297073>
+
+        Reviewed by Geoff Garen.
+
+        * wtf/spi/darwin/dyldSPI.h:
+
 2020-03-17  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h

@@ -86 +86 @@
 #define DYLD_IOS_VERSION_11_3 0x000B0300
 #define DYLD_IOS_VERSION_12_0 0x000C0000
+#define DYLD_IOS_VERSION_12_2 0x000C0200
 #define DYLD_IOS_VERSION_13_0 0x000D0000
 #define DYLD_IOS_VERSION_13_2 0x000D0200

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-17  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION(r254856) Add exception for window.openDatabase to not masquerade as undefined in currently shipping Jesus Calling Devotional app
+        https://bugs.webkit.org/show_bug.cgi?id=209160
+        <rdar://problem/60297073>
+
+        Reviewed by Geoff Garen.
+
+        Manually verified this fixes the app, which compares typeof openDatabase with 'undefined'
+        Going forward, we intend to completely remove WebSQL, so this is a temporary exception to our removal strategy.
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::openDatabase const):
+        * platform/RuntimeApplicationChecks.h:
+        * platform/cocoa/RuntimeApplicationChecksCocoa.mm:
+        (WebCore::IOSApplication::isJesusCalling):
+
 2020-03-17  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -60 +60 @@
 #endif
 
+#if PLATFORM(IOS)
+#include "RuntimeApplicationChecks.h"
+#include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
+#endif
 
 namespace WebCore {
@@ -633 +637 @@
 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())
+    if (RuntimeEnabledFeatures::sharedFeatures().webSQLEnabled() || openDatabaseShouldBeDefinedEvenWhenDisabled)
         return JSFunction::create(vm, &lexicalGlobalObject, 4, name, jsDOMWindowInstanceFunctionOpenDatabase, NoIntrinsic);
 

trunk/Source/WebCore/platform/RuntimeApplicationChecks.h

@@ -87 +87 @@
 WEBCORE_EXPORT bool isMiniBrowser();
 bool isMobileStore();
+bool isJesusCalling();
 bool isSpringBoard();
 WEBCORE_EXPORT bool isWebProcess();

trunk/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm

@@ -250 +250 @@
 }
 
+bool IOSApplication::isJesusCalling()
+{
+    static bool isJesusCalling = applicationBundleIsEqualTo("com.thomasnelson.jesuscalling"_s);
+    return isJesusCalling;
+}
+
 bool IOSApplication::isMobileStore()
 {