Skip to content
Permalink
Browse files
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.

Canonical link: https://commits.webkit.org/196547@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225731 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Constellation committed Dec 10, 2017
1 parent 77cf20e commit d4a2fd6851e88a6e42eab7508d7939dd46365101
@@ -1,3 +1,20 @@
2017-12-10 Yusuke Suzuki <utatane.tea@gmail.com>

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 <rniwa@webkit.org>

iOS: Crash in Document::updateLayout() via Document::processViewport
@@ -184,7 +184,7 @@ void SQLTransaction::checkAndHandleClosedDatabase()
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
@@ -51,9 +51,6 @@ class JSCallbackData {
protected:
explicit JSCallbackData(JSDOMGlobalObject* globalObject)
: m_globalObject(globalObject)
#ifndef NDEBUG
, m_thread(Thread::current())
#endif
{
}

@@ -69,7 +66,7 @@ class JSCallbackData {
private:
JSC::Weak<JSDOMGlobalObject> m_globalObject;
#ifndef NDEBUG
Ref<Thread> m_thread;
Ref<Thread> m_thread { Thread::current() };
#endif
};

@@ -431,7 +431,7 @@ static bool shouldAllowExternalLoad(const URL& url)
static void* openFunc(const char* uri)
{
ASSERT(XMLDocumentParserScope::currentCachedResourceLoader);
ASSERT(&Thread::current() == libxmlLoaderThread);
ASSERT(libxmlLoaderThread == &Thread::current());

URL url(URL(), uri);

0 comments on commit d4a2fd6

Please sign in to comment.