Changeset 233461 in webkit

Timestamp:

Jul 3, 2018 3:41:37 AM (6 years ago)

Author:

ddkilzer@apple.com

Message:

[iOS] Add assert to catch improper use of WebCore::Timer in UI Process
<​https://webkit.org/b/185330>
<rdar://problem/32816079>

Reviewed by Darin Adler.

Source/WebCore:

• platform/RuntimeApplicationChecks.cpp:

(WebCore::s_webKitProcessType): Add. Global to track process
type.
(WebCore::setWebKitProcessType): Implement new function that is
called when initializing Web, Network, and Storage processes.
(WebCore::isInNetworkProcess): Add.
(WebCore::isInStorageProcess): Add.
(WebCore::isInWebProcess): Add.

• Check value in s_webKitProcessType to determine which process is currently running.
• platform/RuntimeApplicationChecks.h:

(WebCore::isInNetworkProcess): Add.
(WebCore::isInStorageProcess): Add.
(WebCore::isInWebProcess):

• Make available for all platforms.

• platform/Timer.cpp:

(WebCore::TimerBase::TimerBase): Add assert and os_log_fault.
This catches the unwanted behavior on iOS using isAllowed().
(WebCore::TimerBase::isAllowed): Add implementation.

• platform/Timer.h:

(WebCore::TimerBase::isAllowed): Add declaration.

• platform/cocoa/RuntimeApplicationChecksCocoa.mm:

(WebCore::isInWebProcess): Delete. Replace with method in
RuntimeApplicationChecks.cpp.

Source/WebKit:

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::NetworkProcess):

• StorageProcess/StorageProcess.cpp:

(WebKit::StorageProcess::StorageProcess):

• WebProcess/WebProcess.cpp:

(WebKit::m_nonVisibleProcessCleanupTimer):

• Call setWebKitProcessType() to se the global for the current process.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/RuntimeApplicationChecks.cpp (modified) (1 diff)
• WebCore/platform/RuntimeApplicationChecks.h (modified) (1 diff)
• WebCore/platform/Timer.cpp (modified) (4 diffs)
• WebCore/platform/Timer.h (modified) (1 diff)
• WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• WebKit/StorageProcess/StorageProcess.cpp (modified) (2 diffs)
• WebKit/WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-03  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Add assert to catch improper use of WebCore::Timer in UI Process
+        <https://webkit.org/b/185330>
+        <rdar://problem/32816079>
+
+        Reviewed by Darin Adler.
+
+        * platform/RuntimeApplicationChecks.cpp:
+        (WebCore::s_webKitProcessType): Add. Global to track process
+        type.
+        (WebCore::setWebKitProcessType): Implement new function that is
+        called when initializing Web, Network, and Storage processes.
+        (WebCore::isInNetworkProcess): Add.
+        (WebCore::isInStorageProcess): Add.
+        (WebCore::isInWebProcess): Add.
+        - Check value in s_webKitProcessType to determine which process
+          is currently running.
+        * platform/RuntimeApplicationChecks.h:
+        (WebCore::isInNetworkProcess): Add.
+        (WebCore::isInStorageProcess): Add.
+        (WebCore::isInWebProcess):
+        - Make available for all platforms.
+
+        * platform/Timer.cpp:
+        (WebCore::TimerBase::TimerBase): Add assert and os_log_fault.
+        This catches the unwanted behavior on iOS using isAllowed().
+        (WebCore::TimerBase::isAllowed): Add implementation.
+        * platform/Timer.h:
+        (WebCore::TimerBase::isAllowed): Add declaration.
+
+        * platform/cocoa/RuntimeApplicationChecksCocoa.mm:
+        (WebCore::isInWebProcess): Delete.  Replace with method in
+        RuntimeApplicationChecks.cpp.
+
 2018-07-02  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp

@@ -47 +47 @@
 }
 
+#if !PLATFORM(WIN)
+static WebKitProcessType s_webKitProcessType { WebKitProcessType::UIProcess };
+
+void setWebKitProcessType(WebKitProcessType type)
+{
+    s_webKitProcessType = type;
+}
+
+bool isInNetworkProcess()
+{
+    return s_webKitProcessType == WebKitProcessType::NetworkProcess;
+}
+
+bool isInStorageProcess()
+{
+    return s_webKitProcessType == WebKitProcessType::StorageProcess;
+}
+
+bool isInWebProcess()
+{
+    return s_webKitProcessType == WebKitProcessType::WebProcess;
+}
+#endif
+
 int presentingApplicationPID()
 {

trunk/Source/WebCore/platform/RuntimeApplicationChecks.h

@@ -34 +34 @@
 
 #if PLATFORM(WIN)
+inline bool isInNetworkProcess() { return false; }
+inline bool isInStorageProcess() { return false; }
 inline bool isInWebProcess() { return false; }
-#elif !PLATFORM(COCOA)
-inline bool isInWebProcess() { return true; }
+#else
+enum class WebKitProcessType { UIProcess = 0, NetworkProcess, StorageProcess, WebProcess };
+WEBCORE_EXPORT void setWebKitProcessType(WebKitProcessType);
+bool isInNetworkProcess();
+bool isInStorageProcess();
+bool isInWebProcess();
 #endif
 
 #if PLATFORM(COCOA)
-
-bool isInWebProcess();
 
 WEBCORE_EXPORT void setApplicationBundleIdentifier(const String&);

trunk/Source/WebCore/platform/Timer.cpp

@@ -28 +28 @@
 #include "Timer.h"
 
+#include "Logging.h"
+#include "RuntimeApplicationChecks.h"
 #include "SharedTimer.h"
 #include "ThreadGlobalData.h"
@@ -34 +36 @@
 #include <limits>
 #include <math.h>
+#include <wtf/Compiler.h>
 #include <wtf/MainThread.h>
 #include <wtf/Vector.h>
+
+#if USE(WEB_THREAD)
+#include "WebCoreThread.h"
+#endif
 
 namespace WebCore {
@@ -187 +194 @@
 TimerBase::TimerBase()
 {
+#if PLATFORM(IOS)
+    if (UNLIKELY(!isAllowed())) {
+#define WEBCORE_TIMERBASE_ASSERTION_MESSAGE "WebCore::Timer should not be used in UI Process."
+        ASSERT_WITH_MESSAGE(false, WEBCORE_TIMERBASE_ASSERTION_MESSAGE);
+        RELEASE_LOG_FAULT(Threading, WEBCORE_TIMERBASE_ASSERTION_MESSAGE);
+#undef WEBCORE_TIMERBASE_ASSERTION_MESSAGE
+    }
+#endif
 }
 
@@ -241 +256 @@
     if (inHeap())
         checkHeapIndex();
+}
+
+bool TimerBase::isAllowed()
+{
+#if PLATFORM(IOS)
+    if (isInWebProcess() || isInNetworkProcess() || isInStorageProcess())
+        return true;
+
+#if USE(WEB_THREAD)
+    if (WebThreadIsEnabled() && (WebThreadIsCurrent() || WebThreadIsLocked()))
+        return true;
+#endif
+
+    return false;
+#else
+    return true;
+#endif
 }
 

trunk/Source/WebCore/platform/Timer.h

@@ -79 +79 @@
     void checkHeapIndex() const;
 
+    static bool isAllowed();
+
     void setNextFireTime(MonotonicTime);
 

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

@@ -66 +66 @@
 }
 
-bool isInWebProcess()
-{
-    static bool mainBundleIsWebProcess = [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.WebKit.WebContent.Development"]
-        || [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.WebKit.WebContent"]
-        || [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.WebProcess"];
-    return mainBundleIsWebProcess;
-}
-
 static bool applicationBundleIsEqualTo(const String& bundleIdentifierString)
 {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-07-03  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Add assert to catch improper use of WebCore::Timer in UI Process
+        <https://webkit.org/b/185330>
+        <rdar://problem/32816079>
+
+        Reviewed by Darin Adler.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::NetworkProcess):
+        * StorageProcess/StorageProcess.cpp:
+        (WebKit::StorageProcess::StorageProcess):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::m_nonVisibleProcessCleanupTimer):
+        - Call setWebKitProcessType() to se the global for the current
+          process.
+
 2018-07-03  Frederic Wang  <fred.wang@free.fr>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -129 +129 @@
             webProcessConnection->setOnLineState(isOnLine);
     });
+
+    WebCore::setWebKitProcessType(WebKitProcessType::NetworkProcess);
 }
 

trunk/Source/WebKit/StorageProcess/StorageProcess.cpp

@@ -41 +41 @@
 #include <WebCore/IDBKeyData.h>
 #include <WebCore/NotImplemented.h>
+#include <WebCore/RuntimeApplicationChecks.h>
 #include <WebCore/SWServerWorker.h>
 #include <WebCore/SecurityOrigin.h>
@@ -73 +74 @@
     // FIXME: https://bugs.webkit.org/show_bug.cgi?id=135365 - Need a more explicit way of doing this besides accessing the UTF8Encoding.
     UTF8Encoding();
+
+    WebCore::setWebKitProcessType(WebKitProcessType::StorageProcess);
 }
 

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -210 +210 @@
     
     Gigacage::disableDisablingPrimitiveGigacageIfShouldBeEnabled();
+
+    WebCore::setWebKitProcessType(WebKitProcessType::WebProcess);
 }