Title: [225731] trunk/Source/WebCore
- Revision
- 225731
- Author
- [email protected]
- Date
- 2017-12-10 05:14:27 -0800 (Sun, 10 Dec 2017)
Log Message
Unreviewed, follow-up patch after r225470
https://bugs.webkit.org/show_bug.cgi?id=180308
* Modules/webdatabase/SQLTransaction.cpp:
(WebCore::SQLTransaction::checkAndHandleClosedDatabase):
Use consistent operands.
* bindings/js/JSCallbackData.h:
(WebCore::JSCallbackData::JSCallbackData):
Use class field initializer.
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::openFunc):
Use consistent operands.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (225730 => 225731)
--- trunk/Source/WebCore/ChangeLog 2017-12-10 13:00:24 UTC (rev 225730)
+++ trunk/Source/WebCore/ChangeLog 2017-12-10 13:14:27 UTC (rev 225731)
@@ -1,3 +1,20 @@
+2017-12-10 Yusuke Suzuki <[email protected]>
+
+ Unreviewed, follow-up patch after r225470
+ https://bugs.webkit.org/show_bug.cgi?id=180308
+
+ * Modules/webdatabase/SQLTransaction.cpp:
+ (WebCore::SQLTransaction::checkAndHandleClosedDatabase):
+ Use consistent operands.
+
+ * bindings/js/JSCallbackData.h:
+ (WebCore::JSCallbackData::JSCallbackData):
+ Use class field initializer.
+
+ * xml/parser/XMLDocumentParserLibxml2.cpp:
+ (WebCore::openFunc):
+ Use consistent operands.
+
2017-12-09 Ryosuke Niwa <[email protected]>
iOS: Crash in Document::updateLayout() via Document::processViewport
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (225730 => 225731)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2017-12-10 13:00:24 UTC (rev 225730)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2017-12-10 13:14:27 UTC (rev 225731)
@@ -184,7 +184,7 @@
m_errorCallbackWrapper.clear();
// The next steps should be executed only if we're on the DB thread.
- if (&Thread::current() != m_database->databaseThread().getThread())
+ if (m_database->databaseThread().getThread() != &Thread::current())
return;
// The current SQLite transaction should be stopped, as well
Modified: trunk/Source/WebCore/bindings/js/JSCallbackData.h (225730 => 225731)
--- trunk/Source/WebCore/bindings/js/JSCallbackData.h 2017-12-10 13:00:24 UTC (rev 225730)
+++ trunk/Source/WebCore/bindings/js/JSCallbackData.h 2017-12-10 13:14:27 UTC (rev 225731)
@@ -51,9 +51,6 @@
protected:
explicit JSCallbackData(JSDOMGlobalObject* globalObject)
: m_globalObject(globalObject)
-#ifndef NDEBUG
- , m_thread(Thread::current())
-#endif
{
}
@@ -69,7 +66,7 @@
private:
JSC::Weak<JSDOMGlobalObject> m_globalObject;
#ifndef NDEBUG
- Ref<Thread> m_thread;
+ Ref<Thread> m_thread { Thread::current() };
#endif
};
Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (225730 => 225731)
--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2017-12-10 13:00:24 UTC (rev 225730)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2017-12-10 13:14:27 UTC (rev 225731)
@@ -431,7 +431,7 @@
static void* openFunc(const char* uri)
{
ASSERT(XMLDocumentParserScope::currentCachedResourceLoader);
- ASSERT(&Thread::current() == libxmlLoaderThread);
+ ASSERT(libxmlLoaderThread == &Thread::current());
URL url(URL(), uri);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
