Changeset 184853 in webkit
- Timestamp:
- May 25, 2015 7:26:34 PM (9 years ago)
- Location:
- trunk/Source
- Files:
-
- 42 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r184852 r184853 1 2015-05-25 Dan Bernstein <mitz@apple.com> 2 3 ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops 4 https://bugs.webkit.org/show_bug.cgi?id=145372 5 6 Reviewed by Sam Weinig. 7 8 * Configurations/Base.xcconfig: Removed DISABLE_THREAD_CHECK from DEBUG_DEFINES. 9 10 * bindings/objc/DOMAbstractView.mm: 11 (-[DOMAbstractView dealloc]): Removed use of DOM_ASSERT_MAIN_THREAD. 12 (kit): Ditto. 13 14 * bindings/objc/ExceptionHandlers.h: Removed definition of DOM_ASSERT_MAIN_THREAD. 15 16 * bindings/scripts/CodeGeneratorObjC.pm: 17 (GenerateImplementation): Don’t emit DOM_ASSERT_MAIN_THREAD. 18 19 Updated expected bindings test results: 20 * bindings/scripts/test/ObjC/DOMFloat64Array.mm: 21 * bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm: 22 * bindings/scripts/test/ObjC/DOMTestCallback.mm: 23 * bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm: 24 * bindings/scripts/test/ObjC/DOMTestEventConstructor.mm: 25 * bindings/scripts/test/ObjC/DOMTestEventTarget.mm: 26 * bindings/scripts/test/ObjC/DOMTestException.mm: 27 * bindings/scripts/test/ObjC/DOMTestGenerateIsReachable.mm: 28 * bindings/scripts/test/ObjC/DOMTestInterface.mm: 29 * bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm: 30 * bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm: 31 * bindings/scripts/test/ObjC/DOMTestNode.mm: 32 * bindings/scripts/test/ObjC/DOMTestNondeterministic.mm: 33 * bindings/scripts/test/ObjC/DOMTestObj.mm: 34 * bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm: 35 * bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm: 36 * bindings/scripts/test/ObjC/DOMTestTypedefs.mm: 37 * bindings/scripts/test/ObjC/DOMattribute.mm: 38 * bindings/scripts/test/ObjC/DOMreadonly.mm: 39 1 40 2015-05-25 Hunseop Jeong <hs85.jeong@samsung.com> 2 41 -
trunk/Source/WebCore/Configurations/Base.xcconfig
r183929 r184853 89 89 // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants. 90 90 // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant. 91 DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;91 DEBUG_DEFINES_debug = ; 92 92 DEBUG_DEFINES_normal = NDEBUG; 93 93 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT)); -
trunk/Source/WebCore/bindings/objc/DOMAbstractView.mm
r165676 r184853 45 45 - (void)dealloc 46 46 { 47 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); }47 WebCoreThreadViolationCheckRoundOne(); 48 48 [super dealloc]; 49 49 } … … 80 80 DOMAbstractView *kit(WebCore::DOMWindow* value) 81 81 { 82 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };82 WebCoreThreadViolationCheckRoundOne(); 83 83 84 84 if (!value) -
trunk/Source/WebCore/bindings/objc/ExceptionHandlers.h
r165676 r184853 29 29 #include <wtf/Assertions.h> 30 30 31 #if !defined(NDEBUG) && !defined(DISABLE_THREAD_CHECK)32 #define DOM_ASSERT_MAIN_THREAD() do \33 if (!pthread_main_np()) { \34 WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, "DOM access on non-main thread -- you will probably crash soon!"); \35 } \36 while (0)37 #else38 #define DOM_ASSERT_MAIN_THREAD() ((void)0)39 #endif40 41 31 namespace WebCore { 42 32 -
trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm
r183343 r184853 110 110 my $jsContextSetter = "WebCore::JSMainThreadNullState state;"; 111 111 my $exceptionRaiseOnError = "WebCore::raiseOnDOMError(ec);"; 112 my $ assertMainThread = "{ DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); }";112 my $threadViolationCheck = "WebCoreThreadViolationCheckRoundOne();"; 113 113 114 114 my %conflictMethod = ( … … 1677 1677 push(@implContent, "$className *kit($implType* value)\n"); 1678 1678 push(@implContent, "{\n"); 1679 push(@implContent, " $ assertMainThread;\n");1679 push(@implContent, " $threadViolationCheck\n"); 1680 1680 push(@implContent, " if (!value)\n"); 1681 1681 push(@implContent, " return nil;\n"); … … 1697 1697 push(@implContent, "$className *kit($implType* value)\n"); 1698 1698 push(@implContent, "{\n"); 1699 push(@implContent, " $ assertMainThread;\n");1699 push(@implContent, " $threadViolationCheck;\n"); 1700 1700 push(@implContent, " return static_cast<$className*>(kit(static_cast<WebCore::$baseClass*>(value)));\n"); 1701 1701 push(@implContent, "}\n"); -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMFloat64Array.mm
r165676 r184853 64 64 DOMFloat64Array *kit(WebCore::Float64Array* value) 65 65 { 66 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };66 WebCoreThreadViolationCheckRoundOne(); 67 67 return static_cast<DOMFloat64Array*>(kit(static_cast<WebCore::Node*>(value))); 68 68 } -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm
r165676 r184853 90 90 DOMTestActiveDOMObject *kit(WebCore::TestActiveDOMObject* value) 91 91 { 92 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };92 WebCoreThreadViolationCheckRoundOne(); 93 93 if (!value) 94 94 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm
r178575 r184853 132 132 DOMTestCallback *kit(WebCore::TestCallback* value) 133 133 { 134 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };134 WebCoreThreadViolationCheckRoundOne(); 135 135 if (!value) 136 136 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm
r165676 r184853 77 77 DOMTestCustomNamedGetter *kit(WebCore::TestCustomNamedGetter* value) 78 78 { 79 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };79 WebCoreThreadViolationCheckRoundOne(); 80 80 if (!value) 81 81 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventConstructor.mm
r165676 r184853 84 84 DOMTestEventConstructor *kit(WebCore::TestEventConstructor* value) 85 85 { 86 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };86 WebCoreThreadViolationCheckRoundOne(); 87 87 if (!value) 88 88 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventTarget.mm
r165676 r184853 105 105 DOMTestEventTarget *kit(WebCore::TestEventTarget* value) 106 106 { 107 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };107 WebCoreThreadViolationCheckRoundOne(); 108 108 if (!value) 109 109 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestException.mm
r165676 r184853 77 77 DOMTestException *kit(WebCore::TestException* value) 78 78 { 79 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };79 WebCoreThreadViolationCheckRoundOne(); 80 80 if (!value) 81 81 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestGenerateIsReachable.mm
r165676 r184853 70 70 DOMTestGenerateIsReachable *kit(WebCore::TestGenerateIsReachable* value) 71 71 { 72 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };72 WebCoreThreadViolationCheckRoundOne(); 73 73 if (!value) 74 74 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm
r165676 r184853 268 268 DOMTestInterface *kit(WebCore::TestInterface* value) 269 269 { 270 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };270 WebCoreThreadViolationCheckRoundOne(); 271 271 if (!value) 272 272 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm
r165676 r184853 78 78 DOMTestMediaQueryListListener *kit(WebCore::TestMediaQueryListListener* value) 79 79 { 80 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };80 WebCoreThreadViolationCheckRoundOne(); 81 81 if (!value) 82 82 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm
r165676 r184853 70 70 DOMTestNamedConstructor *kit(WebCore::TestNamedConstructor* value) 71 71 { 72 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };72 WebCoreThreadViolationCheckRoundOne(); 73 73 if (!value) 74 74 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNode.mm
r165676 r184853 52 52 DOMTestNode *kit(WebCore::TestNode* value) 53 53 { 54 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };54 WebCoreThreadViolationCheckRoundOne(); 55 55 return static_cast<DOMTestNode*>(kit(static_cast<WebCore::Node*>(value))); 56 56 } -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNondeterministic.mm
r167140 r184853 136 136 DOMTestNondeterministic *kit(WebCore::TestNondeterministic* value) 137 137 { 138 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };138 WebCoreThreadViolationCheckRoundOne(); 139 139 if (!value) 140 140 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm
r184643 r184853 1193 1193 DOMTestObj *kit(WebCore::TestObj* value) 1194 1194 { 1195 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };1195 WebCoreThreadViolationCheckRoundOne(); 1196 1196 if (!value) 1197 1197 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm
r165676 r184853 70 70 DOMTestOverloadedConstructors *kit(WebCore::TestOverloadedConstructors* value) 71 71 { 72 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };72 WebCoreThreadViolationCheckRoundOne(); 73 73 if (!value) 74 74 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm
r165676 r184853 114 114 DOMTestSerializedScriptValueInterface *kit(WebCore::TestSerializedScriptValueInterface* value) 115 115 { 116 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };116 WebCoreThreadViolationCheckRoundOne(); 117 117 if (!value) 118 118 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm
r165676 r184853 178 178 DOMTestTypedefs *kit(WebCore::TestTypedefs* value) 179 179 { 180 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };180 WebCoreThreadViolationCheckRoundOne(); 181 181 if (!value) 182 182 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMattribute.mm
r165676 r184853 77 77 DOMattribute *kit(WebCore::attribute* value) 78 78 { 79 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };79 WebCoreThreadViolationCheckRoundOne(); 80 80 if (!value) 81 81 return nil; -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMreadonly.mm
r165676 r184853 70 70 DOMreadonly *kit(WebCore::readonly* value) 71 71 { 72 { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };72 WebCoreThreadViolationCheckRoundOne(); 73 73 if (!value) 74 74 return nil; -
trunk/Source/WebKit/ios/ChangeLog
r183498 r184853 1 2015-05-25 Dan Bernstein <mitz@apple.com> 2 3 ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops 4 https://bugs.webkit.org/show_bug.cgi?id=145372 5 6 Reviewed by Sam Weinig. 7 8 * Misc/WebGeolocationCoreLocationProvider.mm: 9 (-[WebGeolocationCoreLocationProvider initWithListener:]): Removed use of ASSERT_MAIN_THREAD. 10 (-[WebGeolocationCoreLocationProvider dealloc]): Ditto. 11 (-[WebGeolocationCoreLocationProvider requestGeolocationAuthorization]): Ditto. 12 (-[WebGeolocationCoreLocationProvider start]): Ditto. 13 (-[WebGeolocationCoreLocationProvider stop]): Ditto. 14 (-[WebGeolocationCoreLocationProvider setEnableHighAccuracy:]): Ditto. 15 1 16 2015-04-28 Brady Eidson <beidson@apple.com> 2 17 -
trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm
r176924 r184853 74 74 - (id)initWithListener:(id<WebGeolocationCoreLocationUpdateListener>)listener 75 75 { 76 ASSERT_MAIN_THREAD();77 76 self = [super init]; 78 77 if (self) { … … 85 84 - (void)dealloc 86 85 { 87 ASSERT_MAIN_THREAD();88 86 [_locationManager setDelegate:nil]; 89 87 [super dealloc]; … … 92 90 - (void)requestGeolocationAuthorization 93 91 { 94 ASSERT_MAIN_THREAD();95 96 92 if (![getCLLocationManagerClass() locationServicesEnabled]) { 97 93 [_positionListener geolocationAuthorizationDenied]; … … 126 122 - (void)start 127 123 { 128 ASSERT_MAIN_THREAD();129 130 124 if (![getCLLocationManagerClass() locationServicesEnabled] 131 125 || !isAuthorizationGranted([getCLLocationManagerClass() authorizationStatus])) { … … 140 134 - (void)stop 141 135 { 142 ASSERT_MAIN_THREAD();143 136 [_locationManager stopUpdatingLocation]; 144 137 } … … 222 215 - (void)setEnableHighAccuracy:(BOOL)flag 223 216 { 224 ASSERT_MAIN_THREAD();225 217 [_locationManager setDesiredAccuracy:flag ? kCLLocationAccuracyBest : kCLLocationAccuracyHundredMeters]; 226 218 } -
trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm
r166378 r184853 298 298 299 299 - (void)finalize { 300 ASSERT_MAIN_THREAD();301 300 if (_eventHandler) RemoveEventHandler(_eventHandler); 302 301 [super finalize]; -
trunk/Source/WebKit/mac/ChangeLog
r184845 r184853 1 2015-05-25 Dan Bernstein <mitz@apple.com> 2 3 ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops 4 https://bugs.webkit.org/show_bug.cgi?id=145372 5 6 Reviewed by Sam Weinig. 7 8 * Carbon/CarbonWindowAdapter.mm: 9 (-[CarbonWindowAdapter finalize]): Removed use of ASSERT_MAIN_THREAD. 10 11 * Configurations/Base.xcconfig: Removed DISABLE_THREAD_CHECK from DEBUG_DEFINES. 12 13 * History/WebHistoryItem.mm: 14 (-[WebHistoryItem URLString]): Removed use of ASSERT_MAIN_THREAD. 15 (-[WebHistoryItem originalURLString]): Ditto. 16 (-[WebHistoryItem title]): Ditto. 17 (-[WebHistoryItem lastVisitedTimeInterval]): Ditto. 18 (-[WebHistoryItem isEqual:]): Ditto. 19 (-[WebHistoryItem description]): Ditto. 20 (-[WebHistoryItem initFromDictionaryRepresentation:]): Ditto. 21 (-[WebHistoryItem scrollPoint]): Ditto. 22 23 * Misc/WebElementDictionary.mm: 24 (-[WebElementDictionary finalize]): Ditto. 25 26 * Misc/WebIconDatabase.mm: 27 (-[WebIconDatabase iconForURL:withSize:cache:]): Ditto. 28 (-[WebIconDatabase iconURLForURL:]): Ditto. 29 (-[WebIconDatabase defaultIconWithSize:]): Ditto. 30 (-[WebIconDatabase retainIconForURL:]): Ditto. 31 (-[WebIconDatabase releaseIconForURL:]): Ditto. 32 (+[WebIconDatabase delayDatabaseCleanup]): Ditto. 33 (+[WebIconDatabase allowDatabaseCleanup]): Ditto. 34 (-[WebIconDatabase removeAllIcons]): Ditto. 35 (-[WebIconDatabase _iconForFileURL:withSize:]): Ditto. 36 (webGetNSImage): Ditto. 37 38 * Misc/WebKitLogging.h: Removed definition of ASSERT_MAIN_THREAD. 39 40 * Plugins/WebBaseNetscapePluginView.mm: 41 (-[WebBaseNetscapePluginView finalize]): Removed use of ASSERT_MAIN_THREAD. 42 43 * Plugins/WebBasePluginPackage.mm: 44 (-[WebBasePluginPackage finalize]): Ditto. 45 46 * Plugins/WebNetscapePluginView.mm: 47 (-[WebNetscapePluginView finalize]): Ditto. 48 49 * WebCoreSupport/WebEditorClient.mm: 50 (-[WebUndoStep finalize]): Ditto. 51 52 * WebView/WebDataSource.mm: 53 (-[WebDataSource finalize]): Ditto. 54 55 * WebView/WebHTMLView.mm: 56 (-[WebHTMLViewPrivate finalize]): Ditto. 57 (-[WebHTMLView finalize]): Ditto. 58 (-[WebHTMLView drawRect:]): Ditto. 59 60 * WebView/WebViewData.mm: 61 (-[WebViewPrivate finalize]): Ditto. 62 1 63 2015-05-23 Dan Bernstein <mitz@apple.com> 2 64 -
trunk/Source/WebKit/mac/Configurations/Base.xcconfig
r183929 r184853 81 81 // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants. 82 82 // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant. 83 DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;83 DEBUG_DEFINES_debug = ; 84 84 DEBUG_DEFINES_normal = NDEBUG; 85 85 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT)); -
trunk/Source/WebKit/mac/History/WebHistoryItem.mm
r179472 r184853 182 182 - (NSString *)URLString 183 183 { 184 ASSERT_MAIN_THREAD();185 184 return nsStringNilIfEmpty(core(_private)->urlString()); 186 185 } … … 190 189 - (NSString *)originalURLString 191 190 { 192 ASSERT_MAIN_THREAD();193 191 return nsStringNilIfEmpty(core(_private)->originalURLString()); 194 192 } … … 196 194 - (NSString *)title 197 195 { 198 ASSERT_MAIN_THREAD();199 196 return nsStringNilIfEmpty(core(_private)->title()); 200 197 } … … 219 216 - (NSTimeInterval)lastVisitedTimeInterval 220 217 { 221 ASSERT_MAIN_THREAD();222 218 return _private->_lastVisitedTime; 223 219 } … … 230 226 - (BOOL)isEqual:(id)anObject 231 227 { 232 ASSERT_MAIN_THREAD(); 233 if (![anObject isMemberOfClass:[WebHistoryItem class]]) { 228 if (![anObject isMemberOfClass:[WebHistoryItem class]]) 234 229 return NO; 235 } 236 230 237 231 return core(_private)->urlString() == core(((WebHistoryItem*)anObject)->_private)->urlString(); 238 232 } … … 240 234 - (NSString *)description 241 235 { 242 ASSERT_MAIN_THREAD();243 236 HistoryItem* coreItem = core(_private); 244 237 NSMutableString *result = [NSMutableString stringWithFormat:@"%@ %@", [super description], (NSString*)coreItem->urlString()]; … … 345 338 - (id)initFromDictionaryRepresentation:(NSDictionary *)dict 346 339 { 347 ASSERT_MAIN_THREAD();348 340 NSString *URLString = [dict _webkit_stringForKey:@""]; 349 341 NSString *title = [dict _webkit_stringForKey:titleKey]; … … 414 406 - (NSPoint)scrollPoint 415 407 { 416 ASSERT_MAIN_THREAD();417 408 return core(_private)->scrollPoint(); 418 409 } … … 445 436 #endif 446 437 { 447 ASSERT_MAIN_THREAD();448 438 NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:8]; 449 439 … … 512 502 - (NSString *)target 513 503 { 514 ASSERT_MAIN_THREAD();515 504 return nsStringNilIfEmpty(core(_private)->target()); 516 505 } … … 533 522 - (NSArray *)children 534 523 { 535 ASSERT_MAIN_THREAD();536 524 const HistoryItemVector& children = core(_private)->children(); 537 525 if (!children.size()) … … 549 537 - (NSURL *)URL 550 538 { 551 ASSERT_MAIN_THREAD();552 539 const URL& url = core(_private)->url(); 553 540 if (url.isEmpty()) … … 558 545 - (WebHistoryItem *)targetItem 559 546 { 560 ASSERT_MAIN_THREAD();561 547 return kit(core(_private)->targetItem()); 562 548 } -
trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm
r182957 r184853 126 126 - (void)finalize 127 127 { 128 ASSERT_MAIN_THREAD();129 128 delete _result; 130 129 [super finalize]; -
trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm
r166378 r184853 129 129 - (NSImage *)iconForURL:(NSString *)URL withSize:(NSSize)size cache:(BOOL)cache 130 130 { 131 ASSERT_MAIN_THREAD();132 131 ASSERT(size.width); 133 132 ASSERT(size.height); … … 155 154 if (![self isEnabled]) 156 155 return nil; 157 ASSERT_MAIN_THREAD();158 156 159 157 return iconDatabase().synchronousIconURLForPageURL(URL); … … 162 160 - (NSImage *)defaultIconWithSize:(NSSize)size 163 161 { 164 ASSERT_MAIN_THREAD();165 162 ASSERT(size.width); 166 163 ASSERT(size.height); … … 179 176 - (void)retainIconForURL:(NSString *)URL 180 177 { 181 ASSERT_MAIN_THREAD();182 178 ASSERT(URL); 183 179 if (![self isEnabled]) … … 189 185 - (void)releaseIconForURL:(NSString *)pageURL 190 186 { 191 ASSERT_MAIN_THREAD();192 187 ASSERT(pageURL); 193 188 if (![self isEnabled]) … … 199 194 + (void)delayDatabaseCleanup 200 195 { 201 ASSERT_MAIN_THREAD();202 203 196 IconDatabase::delayDatabaseCleanup(); 204 197 } … … 206 199 + (void)allowDatabaseCleanup 207 200 { 208 ASSERT_MAIN_THREAD();209 210 201 IconDatabase::allowDatabaseCleanup(); 211 202 } … … 246 237 - (void)removeAllIcons 247 238 { 248 ASSERT_MAIN_THREAD();249 239 if (![self isEnabled]) 250 240 return; … … 335 325 - (NSImage *)_iconForFileURL:(NSString *)file withSize:(NSSize)size 336 326 { 337 ASSERT_MAIN_THREAD();338 327 ASSERT(size.width); 339 328 ASSERT(size.height); … … 474 463 NSImage *webGetNSImage(Image* image, NSSize size) 475 464 { 476 ASSERT_MAIN_THREAD();477 465 ASSERT(size.width); 478 466 ASSERT(size.height); -
trunk/Source/WebKit/mac/Misc/WebKitLogging.h
r165676 r184853 76 76 #endif // !LOG_DISABLED 77 77 78 // FIXME: Why is this in the "logging" header file?79 // Use WebCoreThreadViolationCheck instead for checks that throw an exception even in production builds.80 #if !defined(NDEBUG) && !defined(DISABLE_THREAD_CHECK)81 #define ASSERT_MAIN_THREAD() do \82 if (!pthread_main_np()) { \83 WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, "<not running on main thread>"); \84 CRASH(); \85 } \86 while (0)87 #else88 #define ASSERT_MAIN_THREAD() ((void)0)89 #endif90 91 78 void ReportDiscardedDelegateException(SEL delegateSelector, id exception); 92 79 -
trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
r174875 r184853 131 131 - (void)finalize 132 132 { 133 ASSERT_MAIN_THREAD();134 133 ASSERT(!_isStarted); 135 134 -
trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm
r181562 r184853 277 277 - (void)finalize 278 278 { 279 ASSERT_MAIN_THREAD();280 279 ASSERT(!pluginDatabases || [pluginDatabases count] == 0); 281 280 [pluginDatabases release]; -
trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm
r183506 r184853 1382 1382 - (void)finalize 1383 1383 { 1384 ASSERT_MAIN_THREAD();1385 1384 ASSERT(!_isStarted); 1386 1385 -
trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
r183368 r184853 143 143 - (void)finalize 144 144 { 145 ASSERT_MAIN_THREAD();146 147 145 [super finalize]; 148 146 } -
trunk/Source/WebKit/mac/WebView/WebDataSource.mm
r184843 r184853 438 438 - (void)finalize 439 439 { 440 ASSERT_MAIN_THREAD();441 442 440 if (toPrivate(_private) && toPrivate(_private)->includedInWebKitStatistics) 443 441 --WebDataSourceCount; -
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
r184843 r184853 714 714 - (void)finalize 715 715 { 716 ASSERT_MAIN_THREAD();717 718 716 #if !PLATFORM(IOS) 719 717 if (promisedDragTIFFDataSource) … … 2530 2528 - (void)finalize 2531 2529 { 2532 ASSERT_MAIN_THREAD();2533 2530 // We can't assert that close has already been called because 2534 2531 // this view can be removed from it's superview, even though … … 3539 3536 - (void)drawRect:(NSRect)rect 3540 3537 { 3541 ASSERT_MAIN_THREAD();3542 3538 LOG(View, "%@ drawing", self); 3543 3539 -
trunk/Source/WebKit/mac/WebView/WebViewData.mm
r184780 r184853 216 216 - (void)finalize 217 217 { 218 ASSERT_MAIN_THREAD();219 218 #if !PLATFORM(IOS) 220 219 ASSERT(!insertionPasteboard); -
trunk/Source/WebKit2/ChangeLog
r184851 r184853 1 2015-05-25 Dan Bernstein <mitz@apple.com> 2 3 ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops 4 https://bugs.webkit.org/show_bug.cgi?id=145372 5 6 Reviewed by Sam Weinig. 7 8 * Configurations/Base.xcconfig: Removed DISABLE_THREAD_CHECK from DEBUG_DEFINES. 9 1 10 2015-05-25 Carlos Garcia Campos <cgarcia@igalia.com> 2 11 -
trunk/Source/WebKit2/Configurations/Base.xcconfig
r183929 r184853 81 81 // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants. 82 82 // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant. 83 DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;83 DEBUG_DEFINES_debug = ; 84 84 DEBUG_DEFINES_normal = NDEBUG; 85 85 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
Note: See TracChangeset
for help on using the changeset viewer.