Diff
Modified: trunk/LayoutTests/ChangeLog (233465 => 233466)
--- trunk/LayoutTests/ChangeLog 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/LayoutTests/ChangeLog 2018-07-03 16:50:57 UTC (rev 233466)
@@ -1,3 +1,16 @@
+2018-07-03 Jonathan Bedard <[email protected]>
+
+ Unreviewed, rolling out r233461.
+
+ Assertions triggered during iOS 11 debug layout and API tests
+
+ Reverted changeset:
+
+ "[iOS] Add assert to catch improper use of WebCore::Timer in
+ UI Process"
+ https://bugs.webkit.org/show_bug.cgi?id=185330
+ https://trac.webkit.org/changeset/233461
+
2018-07-03 Frederic Wang <[email protected]>
Import WPT infrastructure tests
Modified: trunk/Source/WebCore/ChangeLog (233465 => 233466)
--- trunk/Source/WebCore/ChangeLog 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebCore/ChangeLog 2018-07-03 16:50:57 UTC (rev 233466)
@@ -1,3 +1,16 @@
+2018-07-03 Jonathan Bedard <[email protected]>
+
+ Unreviewed, rolling out r233461.
+
+ Assertions triggered during iOS 11 debug layout and API tests
+
+ Reverted changeset:
+
+ "[iOS] Add assert to catch improper use of WebCore::Timer in
+ UI Process"
+ https://bugs.webkit.org/show_bug.cgi?id=185330
+ https://trac.webkit.org/changeset/233461
+
2018-07-03 Jer Noble <[email protected]>
Update Fullscreen anti-phishing alert text
Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp (233465 => 233466)
--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2018-07-03 16:50:57 UTC (rev 233466)
@@ -46,30 +46,6 @@
return pid;
}
-#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()
{
const auto& pid = presentingApplicationPIDOverride();
Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (233465 => 233466)
--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2018-07-03 16:50:57 UTC (rev 233466)
@@ -33,19 +33,15 @@
WEBCORE_EXPORT int presentingApplicationPID();
#if PLATFORM(WIN)
-inline bool isInNetworkProcess() { return false; }
-inline bool isInStorageProcess() { return false; }
inline bool isInWebProcess() { return false; }
-#else
-enum class WebKitProcessType { UIProcess = 0, NetworkProcess, StorageProcess, WebProcess };
-WEBCORE_EXPORT void setWebKitProcessType(WebKitProcessType);
-bool isInNetworkProcess();
-bool isInStorageProcess();
-bool isInWebProcess();
+#elif !PLATFORM(COCOA)
+inline bool isInWebProcess() { return true; }
#endif
#if PLATFORM(COCOA)
+bool isInWebProcess();
+
WEBCORE_EXPORT void setApplicationBundleIdentifier(const String&);
String applicationBundleIdentifier();
Modified: trunk/Source/WebCore/platform/Timer.cpp (233465 => 233466)
--- trunk/Source/WebCore/platform/Timer.cpp 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebCore/platform/Timer.cpp 2018-07-03 16:50:57 UTC (rev 233466)
@@ -27,8 +27,6 @@
#include "config.h"
#include "Timer.h"
-#include "Logging.h"
-#include "RuntimeApplicationChecks.h"
#include "SharedTimer.h"
#include "ThreadGlobalData.h"
#include "ThreadTimers.h"
@@ -35,14 +33,9 @@
#include <limits.h>
#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 {
class TimerHeapReference;
@@ -193,14 +186,6 @@
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
}
TimerBase::~TimerBase()
@@ -257,23 +242,6 @@
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
-}
-
void TimerBase::heapDecreaseKey()
{
ASSERT(static_cast<bool>(m_nextFireTime));
Modified: trunk/Source/WebCore/platform/Timer.h (233465 => 233466)
--- trunk/Source/WebCore/platform/Timer.h 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebCore/platform/Timer.h 2018-07-03 16:50:57 UTC (rev 233466)
@@ -78,8 +78,6 @@
void checkConsistency() const;
void checkHeapIndex() const;
- static bool isAllowed();
-
void setNextFireTime(MonotonicTime);
bool inHeap() const { return m_heapIndex != -1; }
Modified: trunk/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm (233465 => 233466)
--- trunk/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm 2018-07-03 16:50:57 UTC (rev 233466)
@@ -65,6 +65,14 @@
applicationBundleIdentifierOverride() = bundleIdentifier;
}
+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)
{
return applicationBundleIdentifier() == bundleIdentifierString;
Modified: trunk/Source/WebKit/ChangeLog (233465 => 233466)
--- trunk/Source/WebKit/ChangeLog 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebKit/ChangeLog 2018-07-03 16:50:57 UTC (rev 233466)
@@ -1,3 +1,16 @@
+2018-07-03 Jonathan Bedard <[email protected]>
+
+ Unreviewed, rolling out r233461.
+
+ Assertions triggered during iOS 11 debug layout and API tests
+
+ Reverted changeset:
+
+ "[iOS] Add assert to catch improper use of WebCore::Timer in
+ UI Process"
+ https://bugs.webkit.org/show_bug.cgi?id=185330
+ https://trac.webkit.org/changeset/233461
+
2018-07-03 Youenn Fablet <[email protected]>
Update com.cmbchina.CMBSecurity.sb to make it functional
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (233465 => 233466)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-07-03 16:50:57 UTC (rev 233466)
@@ -128,8 +128,6 @@
for (auto& webProcessConnection : webProcessConnections)
webProcessConnection->setOnLineState(isOnLine);
});
-
- WebCore::setWebKitProcessType(WebKitProcessType::NetworkProcess);
}
NetworkProcess::~NetworkProcess()
Modified: trunk/Source/WebKit/StorageProcess/StorageProcess.cpp (233465 => 233466)
--- trunk/Source/WebKit/StorageProcess/StorageProcess.cpp 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebKit/StorageProcess/StorageProcess.cpp 2018-07-03 16:50:57 UTC (rev 233466)
@@ -40,7 +40,6 @@
#include <WebCore/FileSystem.h>
#include <WebCore/IDBKeyData.h>
#include <WebCore/NotImplemented.h>
-#include <WebCore/RuntimeApplicationChecks.h>
#include <WebCore/SWServerWorker.h>
#include <WebCore/SecurityOrigin.h>
#include <WebCore/ServiceWorkerClientIdentifier.h>
@@ -73,8 +72,6 @@
// Make sure the UTF8Encoding encoding and the text encoding maps have been built on the main thread before a background thread needs it.
// 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);
}
StorageProcess::~StorageProcess()
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (233465 => 233466)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-07-03 16:20:00 UTC (rev 233465)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-07-03 16:50:57 UTC (rev 233466)
@@ -209,8 +209,6 @@
});
Gigacage::disableDisablingPrimitiveGigacageIfShouldBeEnabled();
-
- WebCore::setWebKitProcessType(WebKitProcessType::WebProcess);
}
WebProcess::~WebProcess()
