Changeset 234447 in webkit

Timestamp:

Jul 31, 2018 8:57:07 PM (6 years ago)

Author:

achristensen@apple.com

Message:

REGRESSION (r231107): MoviStar+ launches to a blank black screen
​https://bugs.webkit.org/show_bug.cgi?id=188139

Reviewed by Brent Fulgham.

Source/WebCore:

For this app, revert behavior to how it was before r231107 with a linked-on-or-before check.
r231107 increased our fetch spec conformance, which we intend to keep. This makes a low-risk
targeted fix that will fix the affected app until they update.

I manually verified this fixes the app.

• loader/DocumentThreadableLoader.cpp:

(WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequest):

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

(WebCore::applicationSDKVersionOverride):
(WebCore::setApplicationSDKVersion):
(WebCore::applicationSDKVersion):
(WebCore::IOSApplication::isMoviStarPlus):

Source/WebKit:

Add infrastructure to check UIProcess SDK from the WebProcess and NetworkProcess for linked-on-or-after checks.

• NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

• NetworkProcess/NetworkProcessCreationParameters.h:
• NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:
• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/DocumentThreadableLoader.cpp (modified) (4 diffs)
• WebCore/platform/RuntimeApplicationChecks.h (modified) (2 diffs)
• WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm (modified) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit/NetworkProcess/NetworkProcessCreationParameters.h (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (1 diff)
• WebKit/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (3 diffs)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-31  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION (r231107): MoviStar+ launches to a blank black screen
+        https://bugs.webkit.org/show_bug.cgi?id=188139
+
+        Reviewed by Brent Fulgham.
+
+        For this app, revert behavior to how it was before r231107 with a linked-on-or-before check.
+        r231107 increased our fetch spec conformance, which we intend to keep.  This makes a low-risk
+        targeted fix that will fix the affected app until they update.  
+
+        I manually verified this fixes the app.
+
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequest):
+        * platform/RuntimeApplicationChecks.h:
+        * platform/cocoa/RuntimeApplicationChecksCocoa.mm:
+        (WebCore::applicationSDKVersionOverride):
+        (WebCore::setApplicationSDKVersion):
+        (WebCore::applicationSDKVersion):
+        (WebCore::IOSApplication::isMoviStarPlus):
+
 2018-07-31  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -51 +51 @@
 #include "ResourceRequest.h"
 #include "ResourceTiming.h"
+#include "RuntimeApplicationChecks.h"
 #include "RuntimeEnabledFeatures.h"
 #include "SchemeRegistry.h"
@@ -60 +61 @@
 #include <wtf/Assertions.h>
 #include <wtf/Ref.h>
+
+#if PLATFORM(IOS)
+#include <wtf/spi/darwin/dyldSPI.h>
+#endif
 
 namespace WebCore {
@@ -180 +185 @@
     ASSERT(m_options.mode == FetchOptions::Mode::Cors);
 
-    if ((m_options.preflightPolicy == PreflightPolicy::Consider && isSimpleCrossOriginAccessRequest(request.httpMethod(), request.httpHeaderFields())) || m_options.preflightPolicy == PreflightPolicy::Prevent || shouldPerformSecurityChecks()) {
+#if PLATFORM(IOS)
+    bool needsPreflightQuirk = IOSApplication::isMoviStarPlus() && applicationSDKVersion() < DYLD_IOS_VERSION_12_0 && (m_options.preflightPolicy == PreflightPolicy::Consider || m_options.preflightPolicy == PreflightPolicy::Force);
+#else
+    bool needsPreflightQuirk = false;
+#endif
+
+    if ((m_options.preflightPolicy == PreflightPolicy::Consider && isSimpleCrossOriginAccessRequest(request.httpMethod(), request.httpHeaderFields())) || m_options.preflightPolicy == PreflightPolicy::Prevent || (shouldPerformSecurityChecks() && !needsPreflightQuirk)) {
         if (checkURLSchemeAsCORSEnabled(request.url()))
             makeSimpleCrossOriginAccessRequest(WTFMove(request));
@@ -195 +206 @@
         }
 #endif
-        if (!checkURLSchemeAsCORSEnabled(request.url()))
+        if (!needsPreflightQuirk && !checkURLSchemeAsCORSEnabled(request.url()))
             return;
 

trunk/Source/WebCore/platform/RuntimeApplicationChecks.h

@@ -42 +42 @@
 
 bool isInWebProcess();
+
+WEBCORE_EXPORT void setApplicationSDKVersion(uint32_t);
+uint32_t applicationSDKVersion();
 
 WEBCORE_EXPORT void setApplicationBundleIdentifier(const String&);
@@ -87 +90 @@
 WEBCORE_EXPORT bool isCardiogram();
 WEBCORE_EXPORT bool isNike();
+bool isMoviStarPlus();
 
 } // IOSApplication

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

@@ -32 +32 @@
 #import <wtf/NeverDestroyed.h>
 #import <wtf/RunLoop.h>
+#import <wtf/spi/darwin/dyldSPI.h>
 #import <wtf/text/WTFString.h>
 
@@ -66 +67 @@
 }
 
+static std::optional<uint32_t>& applicationSDKVersionOverride()
+{
+    static NeverDestroyed<std::optional<uint32_t>> version;
+    return version;
+}
+
+void setApplicationSDKVersion(uint32_t version)
+{
+    applicationSDKVersionOverride() = version;
+}
+
+uint32_t applicationSDKVersion()
+{
+    if (applicationSDKVersionOverride())
+        return *applicationSDKVersionOverride();
+    return dyld_get_program_sdk_version();
+}
+
 bool isInWebProcess()
 {
@@ -255 +274 @@
 }
 
+bool IOSApplication::isMoviStarPlus()
+{
+    static bool isMoviStarPlus = applicationBundleIsEqualTo("com.prisatv.yomvi"_s);
+    return isMoviStarPlus;
+}
+    
 #endif
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-07-31  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION (r231107): MoviStar+ launches to a blank black screen
+        https://bugs.webkit.org/show_bug.cgi?id=188139
+
+        Reviewed by Brent Fulgham.
+
+        Add infrastructure to check UIProcess SDK from the WebProcess and NetworkProcess for linked-on-or-after checks.
+
+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode const):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2018-07-31  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

@@ -70 +70 @@
     encoder << parentProcessName;
     encoder << uiProcessBundleIdentifier;
+    encoder << uiProcessSDKVersion;
     encoder << sourceApplicationBundleIdentifier;
     encoder << sourceApplicationSecondaryIdentifier;
@@ -184 +185 @@
     if (!decoder.decode(result.uiProcessBundleIdentifier))
         return false;
+    if (!decoder.decode(result.uiProcessSDKVersion))
+        return false;
     if (!decoder.decode(result.sourceApplicationBundleIdentifier))
         return false;

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

@@ -83 +83 @@
     String parentProcessName;
     String uiProcessBundleIdentifier;
+    uint32_t uiProcessSDKVersion { 0 };
     String sourceApplicationBundleIdentifier;
     String sourceApplicationSecondaryIdentifier;

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

@@ -75 +75 @@
 {
     WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
+    WebCore::setApplicationSDKVersion(parameters.uiProcessSDKVersion);
 
 #if PLATFORM(IOS)

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -104 +104 @@
 #if PLATFORM(COCOA)
     encoder << uiProcessBundleIdentifier;
+    encoder << uiProcessSDKVersion;
 #endif
     encoder << presentingApplicationPID;
@@ -320 +321 @@
     if (!decoder.decode(parameters.uiProcessBundleIdentifier))
         return false;
+    if (!decoder.decode(parameters.uiProcessSDKVersion))
+        return false;
 #endif
     if (!decoder.decode(parameters.presentingApplicationPID))

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -147 +147 @@
 #if PLATFORM(COCOA)
     String uiProcessBundleIdentifier;
+    uint32_t uiProcessSDKVersion { 0 };
 #endif
 

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -53 +53 @@
 #import <sys/param.h>
 #import <wtf/ProcessPrivilege.h>
+#import <wtf/spi/darwin/dyldSPI.h>
 
 #if PLATFORM(IOS)
@@ -206 +207 @@
 
     parameters.uiProcessBundleIdentifier = String([[NSBundle mainBundle] bundleIdentifier]);
+    parameters.uiProcessSDKVersion = dyld_get_program_sdk_version();
 
 #if PLATFORM(IOS)
@@ -292 +294 @@
     parameters.parentProcessName = [[NSProcessInfo processInfo] processName];
     parameters.uiProcessBundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
+    parameters.uiProcessSDKVersion = dyld_get_program_sdk_version();
 
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -125 +125 @@
 
     WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
+    WebCore::setApplicationSDKVersion(parameters.uiProcessSDKVersion);
+
     SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);