Diff
Modified: trunk/Source/WebCore/ChangeLog (219279 => 219280)
--- trunk/Source/WebCore/ChangeLog 2017-07-09 02:58:36 UTC (rev 219279)
+++ trunk/Source/WebCore/ChangeLog 2017-07-09 05:05:41 UTC (rev 219280)
@@ -1,3 +1,27 @@
+2017-07-08 Brady Eidson <beid...@apple.com>
+
+ Remove some obsolete RuntimeApplicationChecks.
+ https://bugs.webkit.org/show_bug.cgi?id=174293
+
+ Reviewed by Dan Bernstein.
+
+ No new tests (No change to testable behavior)
+
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::parametersForPlugin):
+ (WebCore::shouldNotPerformURLAdjustment): Deleted.
+
+ * platform/RuntimeApplicationChecks.h:
+ * platform/cocoa/RuntimeApplicationChecksCocoa.mm:
+ (WebCore::IOSApplication::isDaijisenDictionary): Deleted.
+ (WebCore::IOSApplication::isNASAHD): Deleted.
+ (WebCore::IOSApplication::isTheEconomistOnIphone): Deleted.
+
+ * platform/ios/wak/WebCoreThread.h:
+ * platform/ios/wak/WebCoreThread.mm:
+ (StartWebThread):
+ (WebThreadSetDelegateSourceRunLoopMode): Deleted.
+
2017-07-08 Basuke Suzuki <basuke.suz...@sony.com>
[Curl] Safe access and life cycle management of bare Curl handle
Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (219279 => 219280)
--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2017-07-09 02:58:36 UTC (rev 219279)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2017-07-09 05:05:41 UTC (rev 219280)
@@ -152,14 +152,6 @@
}
}
-#if PLATFORM(IOS)
-static bool shouldNotPerformURLAdjustment()
-{
- static bool shouldNotPerformURLAdjustment = IOSApplication::isNASAHD() && dyld_get_program_sdk_version() < DYLD_IOS_VERSION_5_0;
- return shouldNotPerformURLAdjustment;
-}
-#endif
-
// FIXME: This function should not deal with url or serviceType!
void HTMLObjectElement::parametersForPlugin(Vector<String>& paramNames, Vector<String>& paramValues, String& url, String& serviceType)
{
@@ -217,10 +209,6 @@
// attribute, not by a param element. However, for compatibility, allow the
// resource's URL to be given by a param named "src", "movie", "code" or "url"
// if we know that resource points to a plug-in.
-#if PLATFORM(IOS)
- if (shouldNotPerformURLAdjustment())
- return;
-#endif
if (url.isEmpty() && !urlParameter.isEmpty()) {
SubframeLoader& loader = document().frame()->loader().subframeLoader();
Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (219279 => 219280)
--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2017-07-09 02:58:36 UTC (rev 219279)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2017-07-09 05:05:41 UTC (rev 219280)
@@ -73,9 +73,6 @@
WEBCORE_EXPORT bool isWebApp();
WEBCORE_EXPORT bool isOkCupid();
WEBCORE_EXPORT bool isFacebook();
-WEBCORE_EXPORT bool isDaijisenDictionary();
-bool isNASAHD();
-WEBCORE_EXPORT bool isTheEconomistOnIphone();
WEBCORE_EXPORT bool isWebProcess();
bool isIBooks();
WEBCORE_EXPORT bool isTheSecretSocietyHiddenMystery();
Modified: trunk/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm (219279 => 219280)
--- trunk/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm 2017-07-09 02:58:36 UTC (rev 219279)
+++ trunk/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm 2017-07-09 05:05:41 UTC (rev 219280)
@@ -216,24 +216,6 @@
return isFacebook;
}
-bool IOSApplication::isDaijisenDictionary()
-{
- static bool isDaijisenDictionary = applicationBundleIsEqualTo("jp.co.shogakukan.daijisen2009i");
- return isDaijisenDictionary;
-}
-
-bool IOSApplication::isNASAHD()
-{
- static bool isNASAHD = applicationBundleIsEqualTo("gov.nasa.NASAHD");
- return isNASAHD;
-}
-
-bool IOSApplication::isTheEconomistOnIphone()
-{
- static bool isTheEconomistOnIphone = applicationBundleIsEqualTo("com.economist.iphone");
- return isTheEconomistOnIphone;
-}
-
// FIXME: this needs to be changed when the WebProcess is changed to an XPC service.
bool IOSApplication::isWebProcess()
{
Modified: trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h (219279 => 219280)
--- trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h 2017-07-09 02:58:36 UTC (rev 219279)
+++ trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h 2017-07-09 05:05:41 UTC (rev 219280)
@@ -87,8 +87,6 @@
WEBCORE_EXPORT NSRunLoop* WebThreadNSRunLoop(void);
-WEBCORE_EXPORT void WebThreadSetDelegateSourceRunLoopMode(CFStringRef mode);
-
#if defined(__cplusplus)
}
#endif
Modified: trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm (219279 => 219280)
--- trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm 2017-07-09 02:58:36 UTC (rev 219279)
+++ trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm 2017-07-09 05:05:41 UTC (rev 219280)
@@ -145,8 +145,6 @@
static NSMutableArray *sAsyncDelegates = nil;
-static CFStringRef delegateSourceRunLoopMode;
-
static inline void SendMessage(NSInvocation *invocation)
{
[invocation invoke];
@@ -736,12 +734,11 @@
CFRunLoopRef runLoop = CFRunLoopGetCurrent();
CFRunLoopSourceContext delegateSourceContext = {0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, HandleDelegateSource};
delegateSource = CFRunLoopSourceCreate(NULL, 0, &delegateSourceContext);
+
// We shouldn't get delegate callbacks while scrolling, but there might be
// one outstanding when we start. Add the source for all common run loop
// modes so we don't block the web thread while scrolling.
- if (!delegateSourceRunLoopMode)
- delegateSourceRunLoopMode = kCFRunLoopCommonModes;
- CFRunLoopAddSource(runLoop, delegateSource, delegateSourceRunLoopMode);
+ CFRunLoopAddSource(runLoop, delegateSource, kCFRunLoopCommonModes);
sAsyncDelegates = [[NSMutableArray alloc] init];
@@ -995,12 +992,6 @@
return CurrentThreadContext();
}
-void WebThreadSetDelegateSourceRunLoopMode(CFStringRef mode)
-{
- ASSERT(!webThreadStarted);
- delegateSourceRunLoopMode = mode;
-}
-
void WebThreadEnable(void)
{
RELEASE_ASSERT_WITH_MESSAGE(!WebCore::IOSApplication::isWebProcess(), "The WebProcess should never run a Web Thread");
Modified: trunk/Source/WebKit/mac/ChangeLog (219279 => 219280)
--- trunk/Source/WebKit/mac/ChangeLog 2017-07-09 02:58:36 UTC (rev 219279)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-07-09 05:05:41 UTC (rev 219280)
@@ -1,3 +1,15 @@
+2017-07-08 Brady Eidson <beid...@apple.com>
+
+ Remove some obsolete RuntimeApplicationChecks.
+ https://bugs.webkit.org/show_bug.cgi?id=174293
+
+ Reviewed by Dan Bernstein.
+
+ * Misc/WebKitVersionChecks.h:
+ * WebView/WebView.mm:
+ (+[WebView enableWebThread]):
+ (-[WebView _needsPreHTML5ParserQuirks]):
+
2017-07-08 Yusuke Suzuki <utatane....@gmail.com>
Drop NOSNIFF compile flag
Modified: trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h (219279 => 219280)
--- trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2017-07-09 02:58:36 UTC (rev 219279)
+++ trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2017-07-09 05:05:41 UTC (rev 219280)
@@ -69,9 +69,7 @@
#define WEBKIT_FIRST_VERSION_WITH_FLIPPED_SHADOWS 1100 // iOS 3.2
#define WEBKIT_FIRST_VERSION_WITHOUT_MULTIPLE_IFRAME_TOUCH_EVENT_DISPATCH 1400 // iOS 4.2
#define WEBKIT_FIRST_VERSION_WITH_CSS_TRANSFORMS_AFFECTING_OVERFLOW 1600 // iOS 5.0
-#define WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER 1600 // iOS 5.0
#define WEBKIT_FIRST_VERSION_WITH_WINDOW_ON_ERROR 1600 // iOS 5.0
-#define WEBKIT_FIRST_VERSION_WITH_DELEGATE_CALLS_IN_COMMON_RUNLOOP_MODES 1600 // iOS 5.0
#define WEBKIT_FIRST_VERSION_WITH_CSS_ATTRIBUTE_SETTERS_IGNORING_PRIORITY 2239 // iOS 6.0
#define WEBKIT_FIRST_VERSION_WITH_YOUTUBE_EMBED_IFRAME_TRANSFORM 2239 // iOS 6.0
#define WEBKIT_FIRST_VERSION_WITHOUT_LEGACY_BACKGROUNDSIZE_SHORTHAND_BEHAVIOR 2665 // iOS 7.0
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (219279 => 219280)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2017-07-09 02:58:36 UTC (rev 219279)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2017-07-09 05:05:41 UTC (rev 219280)
@@ -1653,8 +1653,6 @@
WebCoreObjCDeallocOnWebThread([WebPolicyDecisionListener class]);
WebCoreObjCDeallocOnWebThread([WebView class]);
WebCoreObjCDeallocOnWebThread([WebVisiblePosition class]);
- if (IOSApplication::isTheEconomistOnIphone() && !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_DELEGATE_CALLS_IN_COMMON_RUNLOOP_MODES))
- WebThreadSetDelegateSourceRunLoopMode(kCFRunLoopDefaultMode);
WebThreadEnable();
isWebThreadEnabled = YES;
}
@@ -2690,8 +2688,7 @@
#endif
|| [[self preferences] usePreHTML5ParserQuirks];
#else
- static bool isApplicationNeedingParserQuirks = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_HTML5_PARSER) && IOSApplication::isDaijisenDictionary();
- return isApplicationNeedingParserQuirks || [[self preferences] usePreHTML5ParserQuirks];
+ return [[self preferences] usePreHTML5ParserQuirks];
#endif
}
