Diff
Modified: trunk/Source/WebCore/ChangeLog (184852 => 184853)
--- trunk/Source/WebCore/ChangeLog 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/ChangeLog 2015-05-26 02:26:34 UTC (rev 184853)
@@ -1,3 +1,42 @@
+2015-05-25 Dan Bernstein <[email protected]>
+
+ ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops
+ https://bugs.webkit.org/show_bug.cgi?id=145372
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/Base.xcconfig: Removed DISABLE_THREAD_CHECK from DEBUG_DEFINES.
+
+ * bindings/objc/DOMAbstractView.mm:
+ (-[DOMAbstractView dealloc]): Removed use of DOM_ASSERT_MAIN_THREAD.
+ (kit): Ditto.
+
+ * bindings/objc/ExceptionHandlers.h: Removed definition of DOM_ASSERT_MAIN_THREAD.
+
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ (GenerateImplementation): Don’t emit DOM_ASSERT_MAIN_THREAD.
+
+ Updated expected bindings test results:
+ * bindings/scripts/test/ObjC/DOMFloat64Array.mm:
+ * bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm:
+ * bindings/scripts/test/ObjC/DOMTestCallback.mm:
+ * bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm:
+ * bindings/scripts/test/ObjC/DOMTestEventConstructor.mm:
+ * bindings/scripts/test/ObjC/DOMTestEventTarget.mm:
+ * bindings/scripts/test/ObjC/DOMTestException.mm:
+ * bindings/scripts/test/ObjC/DOMTestGenerateIsReachable.mm:
+ * bindings/scripts/test/ObjC/DOMTestInterface.mm:
+ * bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm:
+ * bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm:
+ * bindings/scripts/test/ObjC/DOMTestNode.mm:
+ * bindings/scripts/test/ObjC/DOMTestNondeterministic.mm:
+ * bindings/scripts/test/ObjC/DOMTestObj.mm:
+ * bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm:
+ * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm:
+ * bindings/scripts/test/ObjC/DOMTestTypedefs.mm:
+ * bindings/scripts/test/ObjC/DOMattribute.mm:
+ * bindings/scripts/test/ObjC/DOMreadonly.mm:
+
2015-05-25 Hunseop Jeong <[email protected]>
Replaced 0 with nullptr in WebCore/svg.
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (184852 => 184853)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2015-05-26 02:26:34 UTC (rev 184853)
@@ -88,7 +88,7 @@
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
-DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;
+DEBUG_DEFINES_debug = ;
DEBUG_DEFINES_normal = NDEBUG;
DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
Modified: trunk/Source/WebCore/bindings/objc/DOMAbstractView.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/objc/DOMAbstractView.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/objc/DOMAbstractView.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -44,7 +44,7 @@
- (void)dealloc
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); }
+ WebCoreThreadViolationCheckRoundOne();
[super dealloc];
}
@@ -79,7 +79,7 @@
DOMAbstractView *kit(WebCore::DOMWindow* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
Modified: trunk/Source/WebCore/bindings/objc/ExceptionHandlers.h (184852 => 184853)
--- trunk/Source/WebCore/bindings/objc/ExceptionHandlers.h 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/objc/ExceptionHandlers.h 2015-05-26 02:26:34 UTC (rev 184853)
@@ -28,16 +28,6 @@
#include <wtf/Assertions.h>
-#if !defined(NDEBUG) && !defined(DISABLE_THREAD_CHECK)
-#define DOM_ASSERT_MAIN_THREAD() do \
- if (!pthread_main_np()) { \
- WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, "DOM access on non-main thread -- you will probably crash soon!"); \
- } \
-while (0)
-#else
-#define DOM_ASSERT_MAIN_THREAD() ((void)0)
-#endif
-
namespace WebCore {
typedef int ExceptionCode;
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -109,7 +109,7 @@
my $exceptionInit = "WebCore::ExceptionCode ec = 0;";
my $jsContextSetter = "WebCore::JSMainThreadNullState state;";
my $exceptionRaiseOnError = "WebCore::raiseOnDOMError(ec);";
-my $assertMainThread = "{ DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); }";
+my $threadViolationCheck = "WebCoreThreadViolationCheckRoundOne();";
my %conflictMethod = (
# FIXME: Add C language keywords?
@@ -1676,7 +1676,7 @@
if ($parentImplClassName eq "Object") {
push(@implContent, "$className *kit($implType* value)\n");
push(@implContent, "{\n");
- push(@implContent, " $assertMainThread;\n");
+ push(@implContent, " $threadViolationCheck\n");
push(@implContent, " if (!value)\n");
push(@implContent, " return nil;\n");
push(@implContent, " if ($className *wrapper = getDOMWrapper(value))\n");
@@ -1696,7 +1696,7 @@
} else {
push(@implContent, "$className *kit($implType* value)\n");
push(@implContent, "{\n");
- push(@implContent, " $assertMainThread;\n");
+ push(@implContent, " $threadViolationCheck;\n");
push(@implContent, " return static_cast<$className*>(kit(static_cast<WebCore::$baseClass*>(value)));\n");
push(@implContent, "}\n");
}
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMFloat64Array.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMFloat64Array.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMFloat64Array.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -63,6 +63,6 @@
DOMFloat64Array *kit(WebCore::Float64Array* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
return static_cast<DOMFloat64Array*>(kit(static_cast<WebCore::Node*>(value)));
}
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -89,7 +89,7 @@
DOMTestActiveDOMObject *kit(WebCore::TestActiveDOMObject* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestActiveDOMObject *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -131,7 +131,7 @@
DOMTestCallback *kit(WebCore::TestCallback* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestCallback *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -76,7 +76,7 @@
DOMTestCustomNamedGetter *kit(WebCore::TestCustomNamedGetter* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestCustomNamedGetter *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventConstructor.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventConstructor.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventConstructor.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -83,7 +83,7 @@
DOMTestEventConstructor *kit(WebCore::TestEventConstructor* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestEventConstructor *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventTarget.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventTarget.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventTarget.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -104,7 +104,7 @@
DOMTestEventTarget *kit(WebCore::TestEventTarget* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestEventTarget *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestException.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestException.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestException.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -76,7 +76,7 @@
DOMTestException *kit(WebCore::TestException* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestException *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestGenerateIsReachable.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestGenerateIsReachable.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestGenerateIsReachable.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -69,7 +69,7 @@
DOMTestGenerateIsReachable *kit(WebCore::TestGenerateIsReachable* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestGenerateIsReachable *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -267,7 +267,7 @@
DOMTestInterface *kit(WebCore::TestInterface* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestInterface *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -77,7 +77,7 @@
DOMTestMediaQueryListListener *kit(WebCore::TestMediaQueryListListener* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestMediaQueryListListener *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -69,7 +69,7 @@
DOMTestNamedConstructor *kit(WebCore::TestNamedConstructor* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestNamedConstructor *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNode.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNode.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNode.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -51,6 +51,6 @@
DOMTestNode *kit(WebCore::TestNode* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
return static_cast<DOMTestNode*>(kit(static_cast<WebCore::Node*>(value)));
}
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNondeterministic.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNondeterministic.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNondeterministic.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -135,7 +135,7 @@
DOMTestNondeterministic *kit(WebCore::TestNondeterministic* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestNondeterministic *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -1192,7 +1192,7 @@
DOMTestObj *kit(WebCore::TestObj* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestObj *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -69,7 +69,7 @@
DOMTestOverloadedConstructors *kit(WebCore::TestOverloadedConstructors* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestOverloadedConstructors *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -113,7 +113,7 @@
DOMTestSerializedScriptValueInterface *kit(WebCore::TestSerializedScriptValueInterface* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestSerializedScriptValueInterface *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -177,7 +177,7 @@
DOMTestTypedefs *kit(WebCore::TestTypedefs* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMTestTypedefs *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMattribute.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMattribute.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMattribute.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -76,7 +76,7 @@
DOMattribute *kit(WebCore::attribute* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMattribute *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMreadonly.mm (184852 => 184853)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMreadonly.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMreadonly.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -69,7 +69,7 @@
DOMreadonly *kit(WebCore::readonly* value)
{
- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
+ WebCoreThreadViolationCheckRoundOne();
if (!value)
return nil;
if (DOMreadonly *wrapper = getDOMWrapper(value))
Modified: trunk/Source/WebKit/ios/ChangeLog (184852 => 184853)
--- trunk/Source/WebKit/ios/ChangeLog 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/ios/ChangeLog 2015-05-26 02:26:34 UTC (rev 184853)
@@ -1,3 +1,18 @@
+2015-05-25 Dan Bernstein <[email protected]>
+
+ ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops
+ https://bugs.webkit.org/show_bug.cgi?id=145372
+
+ Reviewed by Sam Weinig.
+
+ * Misc/WebGeolocationCoreLocationProvider.mm:
+ (-[WebGeolocationCoreLocationProvider initWithListener:]): Removed use of ASSERT_MAIN_THREAD.
+ (-[WebGeolocationCoreLocationProvider dealloc]): Ditto.
+ (-[WebGeolocationCoreLocationProvider requestGeolocationAuthorization]): Ditto.
+ (-[WebGeolocationCoreLocationProvider start]): Ditto.
+ (-[WebGeolocationCoreLocationProvider stop]): Ditto.
+ (-[WebGeolocationCoreLocationProvider setEnableHighAccuracy:]): Ditto.
+
2015-04-28 Brady Eidson <[email protected]>
Consolidate most "frame load" arguments into FrameLoadRequest.
Modified: trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm (184852 => 184853)
--- trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -73,7 +73,6 @@
- (id)initWithListener:(id<WebGeolocationCoreLocationUpdateListener>)listener
{
- ASSERT_MAIN_THREAD();
self = [super init];
if (self) {
_positionListener = listener;
@@ -84,15 +83,12 @@
- (void)dealloc
{
- ASSERT_MAIN_THREAD();
[_locationManager setDelegate:nil];
[super dealloc];
}
- (void)requestGeolocationAuthorization
{
- ASSERT_MAIN_THREAD();
-
if (![getCLLocationManagerClass() locationServicesEnabled]) {
[_positionListener geolocationAuthorizationDenied];
return;
@@ -125,8 +121,6 @@
- (void)start
{
- ASSERT_MAIN_THREAD();
-
if (![getCLLocationManagerClass() locationServicesEnabled]
|| !isAuthorizationGranted([getCLLocationManagerClass() authorizationStatus])) {
[_locationManager stopUpdatingLocation];
@@ -139,7 +133,6 @@
- (void)stop
{
- ASSERT_MAIN_THREAD();
[_locationManager stopUpdatingLocation];
}
@@ -221,7 +214,6 @@
- (void)setEnableHighAccuracy:(BOOL)flag
{
- ASSERT_MAIN_THREAD();
[_locationManager setDesiredAccuracy:flag ? kCLLocationAccuracyBest : kCLLocationAccuracyHundredMeters];
}
Modified: trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -297,7 +297,6 @@
}
- (void)finalize {
- ASSERT_MAIN_THREAD();
if (_eventHandler) RemoveEventHandler(_eventHandler);
[super finalize];
}
Modified: trunk/Source/WebKit/mac/ChangeLog (184852 => 184853)
--- trunk/Source/WebKit/mac/ChangeLog 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-26 02:26:34 UTC (rev 184853)
@@ -1,3 +1,65 @@
+2015-05-25 Dan Bernstein <[email protected]>
+
+ ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops
+ https://bugs.webkit.org/show_bug.cgi?id=145372
+
+ Reviewed by Sam Weinig.
+
+ * Carbon/CarbonWindowAdapter.mm:
+ (-[CarbonWindowAdapter finalize]): Removed use of ASSERT_MAIN_THREAD.
+
+ * Configurations/Base.xcconfig: Removed DISABLE_THREAD_CHECK from DEBUG_DEFINES.
+
+ * History/WebHistoryItem.mm:
+ (-[WebHistoryItem URLString]): Removed use of ASSERT_MAIN_THREAD.
+ (-[WebHistoryItem originalURLString]): Ditto.
+ (-[WebHistoryItem title]): Ditto.
+ (-[WebHistoryItem lastVisitedTimeInterval]): Ditto.
+ (-[WebHistoryItem isEqual:]): Ditto.
+ (-[WebHistoryItem description]): Ditto.
+ (-[WebHistoryItem initFromDictionaryRepresentation:]): Ditto.
+ (-[WebHistoryItem scrollPoint]): Ditto.
+
+ * Misc/WebElementDictionary.mm:
+ (-[WebElementDictionary finalize]): Ditto.
+
+ * Misc/WebIconDatabase.mm:
+ (-[WebIconDatabase iconForURL:withSize:cache:]): Ditto.
+ (-[WebIconDatabase iconURLForURL:]): Ditto.
+ (-[WebIconDatabase defaultIconWithSize:]): Ditto.
+ (-[WebIconDatabase retainIconForURL:]): Ditto.
+ (-[WebIconDatabase releaseIconForURL:]): Ditto.
+ (+[WebIconDatabase delayDatabaseCleanup]): Ditto.
+ (+[WebIconDatabase allowDatabaseCleanup]): Ditto.
+ (-[WebIconDatabase removeAllIcons]): Ditto.
+ (-[WebIconDatabase _iconForFileURL:withSize:]): Ditto.
+ (webGetNSImage): Ditto.
+
+ * Misc/WebKitLogging.h: Removed definition of ASSERT_MAIN_THREAD.
+
+ * Plugins/WebBaseNetscapePluginView.mm:
+ (-[WebBaseNetscapePluginView finalize]): Removed use of ASSERT_MAIN_THREAD.
+
+ * Plugins/WebBasePluginPackage.mm:
+ (-[WebBasePluginPackage finalize]): Ditto.
+
+ * Plugins/WebNetscapePluginView.mm:
+ (-[WebNetscapePluginView finalize]): Ditto.
+
+ * WebCoreSupport/WebEditorClient.mm:
+ (-[WebUndoStep finalize]): Ditto.
+
+ * WebView/WebDataSource.mm:
+ (-[WebDataSource finalize]): Ditto.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLViewPrivate finalize]): Ditto.
+ (-[WebHTMLView finalize]): Ditto.
+ (-[WebHTMLView drawRect:]): Ditto.
+
+ * WebView/WebViewData.mm:
+ (-[WebViewPrivate finalize]): Ditto.
+
2015-05-23 Dan Bernstein <[email protected]>
Remove unused definitions of WEBKIT_VERSION_MIN_REQUIRED
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (184852 => 184853)
--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2015-05-26 02:26:34 UTC (rev 184853)
@@ -80,7 +80,7 @@
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
-DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;
+DEBUG_DEFINES_debug = ;
DEBUG_DEFINES_normal = NDEBUG;
DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -181,7 +181,6 @@
// FIXME: Need to decide if this class ever returns URLs and decide on the name of this method
- (NSString *)URLString
{
- ASSERT_MAIN_THREAD();
return nsStringNilIfEmpty(core(_private)->urlString());
}
@@ -189,13 +188,11 @@
// and server redirects.
- (NSString *)originalURLString
{
- ASSERT_MAIN_THREAD();
return nsStringNilIfEmpty(core(_private)->originalURLString());
}
- (NSString *)title
{
- ASSERT_MAIN_THREAD();
return nsStringNilIfEmpty(core(_private)->title());
}
@@ -218,7 +215,6 @@
- (NSTimeInterval)lastVisitedTimeInterval
{
- ASSERT_MAIN_THREAD();
return _private->_lastVisitedTime;
}
@@ -229,17 +225,14 @@
- (BOOL)isEqual:(id)anObject
{
- ASSERT_MAIN_THREAD();
- if (![anObject isMemberOfClass:[WebHistoryItem class]]) {
+ if (![anObject isMemberOfClass:[WebHistoryItem class]])
return NO;
- }
-
+
return core(_private)->urlString() == core(((WebHistoryItem*)anObject)->_private)->urlString();
}
- (NSString *)description
{
- ASSERT_MAIN_THREAD();
HistoryItem* coreItem = core(_private);
NSMutableString *result = [NSMutableString stringWithFormat:@"%@ %@", [super description], (NSString*)coreItem->urlString()];
if (!coreItem->target().isEmpty()) {
@@ -344,7 +337,6 @@
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict
{
- ASSERT_MAIN_THREAD();
NSString *URLString = [dict _webkit_stringForKey:@""];
NSString *title = [dict _webkit_stringForKey:titleKey];
@@ -413,7 +405,6 @@
- (NSPoint)scrollPoint
{
- ASSERT_MAIN_THREAD();
return core(_private)->scrollPoint();
}
@@ -444,7 +435,6 @@
- (NSDictionary *)dictionaryRepresentation
#endif
{
- ASSERT_MAIN_THREAD();
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:8];
HistoryItem* coreItem = core(_private);
@@ -511,7 +501,6 @@
- (NSString *)target
{
- ASSERT_MAIN_THREAD();
return nsStringNilIfEmpty(core(_private)->target());
}
@@ -532,7 +521,6 @@
- (NSArray *)children
{
- ASSERT_MAIN_THREAD();
const HistoryItemVector& children = core(_private)->children();
if (!children.size())
return nil;
@@ -548,7 +536,6 @@
- (NSURL *)URL
{
- ASSERT_MAIN_THREAD();
const URL& url = ""
if (url.isEmpty())
return nil;
@@ -557,7 +544,6 @@
- (WebHistoryItem *)targetItem
{
- ASSERT_MAIN_THREAD();
return kit(core(_private)->targetItem());
}
Modified: trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -125,7 +125,6 @@
- (void)finalize
{
- ASSERT_MAIN_THREAD();
delete _result;
[super finalize];
}
Modified: trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -128,7 +128,6 @@
- (NSImage *)iconForURL:(NSString *)URL withSize:(NSSize)size cache:(BOOL)cache
{
- ASSERT_MAIN_THREAD();
ASSERT(size.width);
ASSERT(size.height);
@@ -154,14 +153,12 @@
{
if (![self isEnabled])
return nil;
- ASSERT_MAIN_THREAD();
return iconDatabase().synchronousIconURLForPageURL(URL);
}
- (NSImage *)defaultIconWithSize:(NSSize)size
{
- ASSERT_MAIN_THREAD();
ASSERT(size.width);
ASSERT(size.height);
@@ -178,7 +175,6 @@
- (void)retainIconForURL:(NSString *)URL
{
- ASSERT_MAIN_THREAD();
ASSERT(URL);
if (![self isEnabled])
return;
@@ -188,7 +184,6 @@
- (void)releaseIconForURL:(NSString *)pageURL
{
- ASSERT_MAIN_THREAD();
ASSERT(pageURL);
if (![self isEnabled])
return;
@@ -198,15 +193,11 @@
+ (void)delayDatabaseCleanup
{
- ASSERT_MAIN_THREAD();
-
IconDatabase::delayDatabaseCleanup();
}
+ (void)allowDatabaseCleanup
{
- ASSERT_MAIN_THREAD();
-
IconDatabase::allowDatabaseCleanup();
}
@@ -245,7 +236,6 @@
- (void)removeAllIcons
{
- ASSERT_MAIN_THREAD();
if (![self isEnabled])
return;
@@ -334,7 +324,6 @@
- (NSImage *)_iconForFileURL:(NSString *)file withSize:(NSSize)size
{
- ASSERT_MAIN_THREAD();
ASSERT(size.width);
ASSERT(size.height);
@@ -473,7 +462,6 @@
NSImage *webGetNSImage(Image* image, NSSize size)
{
- ASSERT_MAIN_THREAD();
ASSERT(size.width);
ASSERT(size.height);
Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.h (184852 => 184853)
--- trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2015-05-26 02:26:34 UTC (rev 184853)
@@ -75,19 +75,6 @@
void WebKitInitializeLoggingChannelsIfNecessary(void);
#endif // !LOG_DISABLED
-// FIXME: Why is this in the "logging" header file?
-// Use WebCoreThreadViolationCheck instead for checks that throw an exception even in production builds.
-#if !defined(NDEBUG) && !defined(DISABLE_THREAD_CHECK)
-#define ASSERT_MAIN_THREAD() do \
- if (!pthread_main_np()) { \
- WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, "<not running on main thread>"); \
- CRASH(); \
- } \
-while (0)
-#else
-#define ASSERT_MAIN_THREAD() ((void)0)
-#endif
-
void ReportDiscardedDelegateException(SEL delegateSelector, id exception);
#ifdef __cplusplus
Modified: trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -130,7 +130,6 @@
- (void)finalize
{
- ASSERT_MAIN_THREAD();
ASSERT(!_isStarted);
[super finalize];
Modified: trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -276,7 +276,6 @@
- (void)finalize
{
- ASSERT_MAIN_THREAD();
ASSERT(!pluginDatabases || [pluginDatabases count] == 0);
[pluginDatabases release];
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -1381,7 +1381,6 @@
- (void)finalize
{
- ASSERT_MAIN_THREAD();
ASSERT(!_isStarted);
[self fini];
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -142,8 +142,6 @@
- (void)finalize
{
- ASSERT_MAIN_THREAD();
-
[super finalize];
}
Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -437,8 +437,6 @@
- (void)finalize
{
- ASSERT_MAIN_THREAD();
-
if (toPrivate(_private) && toPrivate(_private)->includedInWebKitStatistics)
--WebDataSourceCount;
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -713,8 +713,6 @@
- (void)finalize
{
- ASSERT_MAIN_THREAD();
-
#if !PLATFORM(IOS)
if (promisedDragTIFFDataSource)
promisedDragTIFFDataSource->removeClient(promisedDataClient());
@@ -2529,7 +2527,6 @@
- (void)finalize
{
- ASSERT_MAIN_THREAD();
// We can't assert that close has already been called because
// this view can be removed from it's superview, even though
// it could be needed later, so close if needed.
@@ -3538,7 +3535,6 @@
- (void)drawRect:(NSRect)rect
{
- ASSERT_MAIN_THREAD();
LOG(View, "%@ drawing", self);
#if !PLATFORM(IOS)
Modified: trunk/Source/WebKit/mac/WebView/WebViewData.mm (184852 => 184853)
--- trunk/Source/WebKit/mac/WebView/WebViewData.mm 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.mm 2015-05-26 02:26:34 UTC (rev 184853)
@@ -215,7 +215,6 @@
- (void)finalize
{
- ASSERT_MAIN_THREAD();
#if !PLATFORM(IOS)
ASSERT(!insertionPasteboard);
#endif
Modified: trunk/Source/WebKit2/ChangeLog (184852 => 184853)
--- trunk/Source/WebKit2/ChangeLog 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-26 02:26:34 UTC (rev 184853)
@@ -1,3 +1,12 @@
+2015-05-25 Dan Bernstein <[email protected]>
+
+ ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops
+ https://bugs.webkit.org/show_bug.cgi?id=145372
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/Base.xcconfig: Removed DISABLE_THREAD_CHECK from DEBUG_DEFINES.
+
2015-05-25 Carlos Garcia Campos <[email protected]>
[GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory
Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (184852 => 184853)
--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2015-05-26 01:46:15 UTC (rev 184852)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2015-05-26 02:26:34 UTC (rev 184853)
@@ -80,7 +80,7 @@
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
-DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;
+DEBUG_DEFINES_debug = ;
DEBUG_DEFINES_normal = NDEBUG;
DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
