<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184853] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184853">184853</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-05-25 19:26:34 -0700 (Mon, 25 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
Source/WebCore:
* 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:
Source/WebKit/ios:
* 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.
Source/WebKit/mac:
* 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.
Source/WebKit2:
* Configurations/Base.xcconfig: Removed DISABLE_THREAD_CHECK from DEBUG_DEFINES.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsBasexcconfig">trunk/Source/WebCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMAbstractViewmm">trunk/Source/WebCore/bindings/objc/DOMAbstractView.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcExceptionHandlersh">trunk/Source/WebCore/bindings/objc/ExceptionHandlers.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMFloat64Arraymm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMFloat64Array.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestActiveDOMObjectmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestCallbackmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestCustomNamedGettermm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestEventConstructormm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventConstructor.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestEventTargetmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventTarget.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestExceptionmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestException.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestGenerateIsReachablemm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestGenerateIsReachable.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestInterfacemm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestMediaQueryListListenermm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestNamedConstructormm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestNodemm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNode.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestNondeterministicmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNondeterministic.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestObjmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestOverloadedConstructorsmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestSerializedScriptValueInterfacemm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestTypedefsmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMattributemm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMattribute.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMreadonlymm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMreadonly.mm</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebGeolocationCoreLocationProvidermm">trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm</a></li>
<li><a href="#trunkSourceWebKitmacCarbonCarbonWindowAdaptermm">trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsBasexcconfig">trunk/Source/WebKit/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemmm">trunk/Source/WebKit/mac/History/WebHistoryItem.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebElementDictionarymm">trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebIconDatabasemm">trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitLoggingh">trunk/Source/WebKit/mac/Misc/WebKitLogging.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebBaseNetscapePluginViewmm">trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebBasePluginPackagemm">trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginViewmm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourcemm">trunk/Source/WebKit/mac/WebView/WebDataSource.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatamm">trunk/Source/WebKit/mac/WebView/WebViewData.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBasexcconfig">trunk/Source/WebKit2/Configurations/Base.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-05-25 Dan Bernstein <mitz@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2015-05-25 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> Replaced 0 with nullptr in WebCore/svg.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
</span><span class="cx"> // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
</span><del>-DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;
</del><ins>+DEBUG_DEFINES_debug = ;
</ins><span class="cx"> DEBUG_DEFINES_normal = NDEBUG;
</span><span class="cx"> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMAbstractViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMAbstractView.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); }
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> DOMAbstractView *kit(WebCore::DOMWindow* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx">
</span><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcExceptionHandlersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/ExceptionHandlers.h (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,16 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> typedef int ExceptionCode;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> my $exceptionInit = "WebCore::ExceptionCode ec = 0;";
</span><span class="cx"> my $jsContextSetter = "WebCore::JSMainThreadNullState state;";
</span><span class="cx"> my $exceptionRaiseOnError = "WebCore::raiseOnDOMError(ec);";
</span><del>-my $assertMainThread = "{ DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); }";
</del><ins>+my $threadViolationCheck = "WebCoreThreadViolationCheckRoundOne();";
</ins><span class="cx">
</span><span class="cx"> my %conflictMethod = (
</span><span class="cx"> # FIXME: Add C language keywords?
</span><span class="lines">@@ -1676,7 +1676,7 @@
</span><span class="cx"> if ($parentImplClassName eq "Object") {
</span><span class="cx"> push(@implContent, "$className *kit($implType* value)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " $assertMainThread;\n");
</del><ins>+ push(@implContent, " $threadViolationCheck\n");
</ins><span class="cx"> push(@implContent, " if (!value)\n");
</span><span class="cx"> push(@implContent, " return nil;\n");
</span><span class="cx"> push(@implContent, " if ($className *wrapper = getDOMWrapper(value))\n");
</span><span class="lines">@@ -1696,7 +1696,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> push(@implContent, "$className *kit($implType* value)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " $assertMainThread;\n");
</del><ins>+ push(@implContent, " $threadViolationCheck;\n");
</ins><span class="cx"> push(@implContent, " return static_cast<$className*>(kit(static_cast<WebCore::$baseClass*>(value)));\n");
</span><span class="cx"> push(@implContent, "}\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMFloat64Arraymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMFloat64Array.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -63,6 +63,6 @@
</span><span class="cx">
</span><span class="cx"> DOMFloat64Array *kit(WebCore::Float64Array* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> return static_cast<DOMFloat64Array*>(kit(static_cast<WebCore::Node*>(value)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestActiveDOMObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestActiveDOMObject *kit(WebCore::TestActiveDOMObject* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestActiveDOMObject *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestCallbackmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCallback.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestCallback *kit(WebCore::TestCallback* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestCallback *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestCustomNamedGettermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestCustomNamedGetter *kit(WebCore::TestCustomNamedGetter* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestCustomNamedGetter *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestEventConstructormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventConstructor.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestEventConstructor *kit(WebCore::TestEventConstructor* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestEventConstructor *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestEventTargetmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestEventTarget.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestEventTarget *kit(WebCore::TestEventTarget* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestEventTarget *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestExceptionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestException.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestException *kit(WebCore::TestException* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestException *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestGenerateIsReachablemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestGenerateIsReachable.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestGenerateIsReachable *kit(WebCore::TestGenerateIsReachable* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestGenerateIsReachable *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestInterface *kit(WebCore::TestInterface* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestInterface *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestMediaQueryListListenermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestMediaQueryListListener.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestMediaQueryListListener *kit(WebCore::TestMediaQueryListListener* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestMediaQueryListListener *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestNamedConstructormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNamedConstructor.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestNamedConstructor *kit(WebCore::TestNamedConstructor* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestNamedConstructor *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNode.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -51,6 +51,6 @@
</span><span class="cx">
</span><span class="cx"> DOMTestNode *kit(WebCore::TestNode* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> return static_cast<DOMTestNode*>(kit(static_cast<WebCore::Node*>(value)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestNondeterministicmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestNondeterministic.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestNondeterministic *kit(WebCore::TestNondeterministic* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestNondeterministic *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestObjmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1192,7 +1192,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestObj *kit(WebCore::TestObj* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestObj *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestOverloadedConstructorsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestOverloadedConstructors.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestOverloadedConstructors *kit(WebCore::TestOverloadedConstructors* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestOverloadedConstructors *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestSerializedScriptValueInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestSerializedScriptValueInterface.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestSerializedScriptValueInterface *kit(WebCore::TestSerializedScriptValueInterface* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestSerializedScriptValueInterface *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestTypedefsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestTypedefs.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTestTypedefs *kit(WebCore::TestTypedefs* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMTestTypedefs *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMattributemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMattribute.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> DOMattribute *kit(WebCore::attribute* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMattribute *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMreadonlymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMreadonly.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> DOMreadonly *kit(WebCore::readonly* value)
</span><span class="cx"> {
</span><del>- { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
</del><ins>+ WebCoreThreadViolationCheckRoundOne();
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nil;
</span><span class="cx"> if (DOMreadonly *wrapper = getDOMWrapper(value))
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-25 Dan Bernstein <mitz@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2015-04-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Consolidate most "frame load" arguments into FrameLoadRequest.
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebGeolocationCoreLocationProvidermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx">
</span><span class="cx"> - (id)initWithListener:(id<WebGeolocationCoreLocationUpdateListener>)listener
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> self = [super init];
</span><span class="cx"> if (self) {
</span><span class="cx"> _positionListener = listener;
</span><span class="lines">@@ -84,15 +83,12 @@
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> [_locationManager setDelegate:nil];
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)requestGeolocationAuthorization
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
-
</del><span class="cx"> if (![getCLLocationManagerClass() locationServicesEnabled]) {
</span><span class="cx"> [_positionListener geolocationAuthorizationDenied];
</span><span class="cx"> return;
</span><span class="lines">@@ -125,8 +121,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)start
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
-
</del><span class="cx"> if (![getCLLocationManagerClass() locationServicesEnabled]
</span><span class="cx"> || !isAuthorizationGranted([getCLLocationManagerClass() authorizationStatus])) {
</span><span class="cx"> [_locationManager stopUpdatingLocation];
</span><span class="lines">@@ -139,7 +133,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)stop
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> [_locationManager stopUpdatingLocation];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -221,7 +214,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)setEnableHighAccuracy:(BOOL)flag
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> [_locationManager setDesiredAccuracy:flag ? kCLLocationAccuracyBest : kCLLocationAccuracyHundredMeters];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacCarbonCarbonWindowAdaptermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -297,7 +297,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)finalize {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> if (_eventHandler) RemoveEventHandler(_eventHandler);
</span><span class="cx"> [super finalize];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2015-05-25 Dan Bernstein <mitz@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2015-05-23 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused definitions of WEBKIT_VERSION_MIN_REQUIRED
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
</span><span class="cx"> // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
</span><del>-DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;
</del><ins>+DEBUG_DEFINES_debug = ;
</ins><span class="cx"> DEBUG_DEFINES_normal = NDEBUG;
</span><span class="cx"> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -181,7 +181,6 @@
</span><span class="cx"> // FIXME: Need to decide if this class ever returns URLs and decide on the name of this method
</span><span class="cx"> - (NSString *)URLString
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> return nsStringNilIfEmpty(core(_private)->urlString());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -189,13 +188,11 @@
</span><span class="cx"> // and server redirects.
</span><span class="cx"> - (NSString *)originalURLString
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> return nsStringNilIfEmpty(core(_private)->originalURLString());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)title
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> return nsStringNilIfEmpty(core(_private)->title());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -218,7 +215,6 @@
</span><span class="cx">
</span><span class="cx"> - (NSTimeInterval)lastVisitedTimeInterval
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> return _private->_lastVisitedTime;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -229,17 +225,14 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)isEqual:(id)anObject
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
- if (![anObject isMemberOfClass:[WebHistoryItem class]]) {
</del><ins>+ if (![anObject isMemberOfClass:[WebHistoryItem class]])
</ins><span class="cx"> return NO;
</span><del>- }
-
</del><ins>+
</ins><span class="cx"> return core(_private)->urlString() == core(((WebHistoryItem*)anObject)->_private)->urlString();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> HistoryItem* coreItem = core(_private);
</span><span class="cx"> NSMutableString *result = [NSMutableString stringWithFormat:@"%@ %@", [super description], (NSString*)coreItem->urlString()];
</span><span class="cx"> if (!coreItem->target().isEmpty()) {
</span><span class="lines">@@ -344,7 +337,6 @@
</span><span class="cx">
</span><span class="cx"> - (id)initFromDictionaryRepresentation:(NSDictionary *)dict
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> NSString *URLString = [dict _webkit_stringForKey:@""];
</span><span class="cx"> NSString *title = [dict _webkit_stringForKey:titleKey];
</span><span class="cx">
</span><span class="lines">@@ -413,7 +405,6 @@
</span><span class="cx">
</span><span class="cx"> - (NSPoint)scrollPoint
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> return core(_private)->scrollPoint();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -444,7 +435,6 @@
</span><span class="cx"> - (NSDictionary *)dictionaryRepresentation
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:8];
</span><span class="cx">
</span><span class="cx"> HistoryItem* coreItem = core(_private);
</span><span class="lines">@@ -511,7 +501,6 @@
</span><span class="cx">
</span><span class="cx"> - (NSString *)target
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> return nsStringNilIfEmpty(core(_private)->target());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -532,7 +521,6 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)children
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> const HistoryItemVector& children = core(_private)->children();
</span><span class="cx"> if (!children.size())
</span><span class="cx"> return nil;
</span><span class="lines">@@ -548,7 +536,6 @@
</span><span class="cx">
</span><span class="cx"> - (NSURL *)URL
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> const URL& url = core(_private)->url();
</span><span class="cx"> if (url.isEmpty())
</span><span class="cx"> return nil;
</span><span class="lines">@@ -557,7 +544,6 @@
</span><span class="cx">
</span><span class="cx"> - (WebHistoryItem *)targetItem
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> return kit(core(_private)->targetItem());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebElementDictionarymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -125,7 +125,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)finalize
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> delete _result;
</span><span class="cx"> [super finalize];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebIconDatabasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -128,7 +128,6 @@
</span><span class="cx">
</span><span class="cx"> - (NSImage *)iconForURL:(NSString *)URL withSize:(NSSize)size cache:(BOOL)cache
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> ASSERT(size.width);
</span><span class="cx"> ASSERT(size.height);
</span><span class="cx">
</span><span class="lines">@@ -154,14 +153,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (![self isEnabled])
</span><span class="cx"> return nil;
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx">
</span><span class="cx"> return iconDatabase().synchronousIconURLForPageURL(URL);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSImage *)defaultIconWithSize:(NSSize)size
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> ASSERT(size.width);
</span><span class="cx"> ASSERT(size.height);
</span><span class="cx">
</span><span class="lines">@@ -178,7 +175,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)retainIconForURL:(NSString *)URL
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> ASSERT(URL);
</span><span class="cx"> if (![self isEnabled])
</span><span class="cx"> return;
</span><span class="lines">@@ -188,7 +184,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)releaseIconForURL:(NSString *)pageURL
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> ASSERT(pageURL);
</span><span class="cx"> if (![self isEnabled])
</span><span class="cx"> return;
</span><span class="lines">@@ -198,15 +193,11 @@
</span><span class="cx">
</span><span class="cx"> + (void)delayDatabaseCleanup
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
-
</del><span class="cx"> IconDatabase::delayDatabaseCleanup();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)allowDatabaseCleanup
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
-
</del><span class="cx"> IconDatabase::allowDatabaseCleanup();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,7 +236,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)removeAllIcons
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> if (![self isEnabled])
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -334,7 +324,6 @@
</span><span class="cx">
</span><span class="cx"> - (NSImage *)_iconForFileURL:(NSString *)file withSize:(NSSize)size
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> ASSERT(size.width);
</span><span class="cx"> ASSERT(size.height);
</span><span class="cx">
</span><span class="lines">@@ -473,7 +462,6 @@
</span><span class="cx">
</span><span class="cx"> NSImage *webGetNSImage(Image* image, NSSize size)
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> ASSERT(size.width);
</span><span class="cx"> ASSERT(size.height);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.h (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -75,19 +75,6 @@
</span><span class="cx"> void WebKitInitializeLoggingChannelsIfNecessary(void);
</span><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span><del>-// 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
-
</del><span class="cx"> void ReportDiscardedDelegateException(SEL delegateSelector, id exception);
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebBaseNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -130,7 +130,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)finalize
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> ASSERT(!_isStarted);
</span><span class="cx">
</span><span class="cx"> [super finalize];
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebBasePluginPackagemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -276,7 +276,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)finalize
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> ASSERT(!pluginDatabases || [pluginDatabases count] == 0);
</span><span class="cx"> [pluginDatabases release];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1381,7 +1381,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)finalize
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> ASSERT(!_isStarted);
</span><span class="cx">
</span><span class="cx"> [self fini];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -142,8 +142,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)finalize
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
-
</del><span class="cx"> [super finalize];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -437,8 +437,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)finalize
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
-
</del><span class="cx"> if (toPrivate(_private) && toPrivate(_private)->includedInWebKitStatistics)
</span><span class="cx"> --WebDataSourceCount;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -713,8 +713,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)finalize
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (promisedDragTIFFDataSource)
</span><span class="cx"> promisedDragTIFFDataSource->removeClient(promisedDataClient());
</span><span class="lines">@@ -2529,7 +2527,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)finalize
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> // We can't assert that close has already been called because
</span><span class="cx"> // this view can be removed from it's superview, even though
</span><span class="cx"> // it could be needed later, so close if needed.
</span><span class="lines">@@ -3538,7 +3535,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)drawRect:(NSRect)rect
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> LOG(View, "%@ drawing", self);
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.mm (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -215,7 +215,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)finalize
</span><span class="cx"> {
</span><del>- ASSERT_MAIN_THREAD();
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> ASSERT(!insertionPasteboard);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-05-25 Dan Bernstein <mitz@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2015-05-25 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (184852 => 184853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
</span><span class="cx"> // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
</span><del>-DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;
</del><ins>+DEBUG_DEFINES_debug = ;
</ins><span class="cx"> DEBUG_DEFINES_normal = NDEBUG;
</span><span class="cx"> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>