Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Unified Diff: third_party/WebKit/Source/core/dom/Node.cpp

Issue 2624443003: Enable ThreadRestrictionVerifier for StringImpl (Closed)
Patch Set: simplify Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/Node.cpp
diff --git a/third_party/WebKit/Source/core/dom/Node.cpp b/third_party/WebKit/Source/core/dom/Node.cpp
index caf5618827c3424f3f6e8939958d3761287ee1f4..4652e51fb7e32e6d4dc2438d7e8d80b9adc4afc9 100644
--- a/third_party/WebKit/Source/core/dom/Node.cpp
+++ b/third_party/WebKit/Source/core/dom/Node.cpp
@@ -1493,7 +1493,17 @@ String Node::debugName() const {
const Element& thisElement = toElement(*this);
if (thisElement.hasID()) {
name.append(" id=\'");
- name.append(thisElement.getIdAttribute());
+ // Unsafe hack to avoid triggering the ThreadRestrictionVerifier on
+ // StringImpl. crbug.com/545926 should be fixed completely, and we should
+ // always avoid accessing these strings from the impl thread. Currently
+ // code that calls into this method from the impl thread tries to make
+ // sure that the main thread is not running at this time.
+ StringImpl* impl = thisElement.getIdAttribute().impl();
+ if (impl) {
+ name.append(impl->is8Bit()
+ ? StringView(impl->characters8(), impl->length())
+ : StringView(impl->characters16(), impl->length()));
esprehn 2017/01/11 22:34:02 Why do we need this but not below where we use Ato
Charlie Harrison 2017/01/12 16:42:30 I think we probably do and we're just not hitting
+ }
name.append('\'');
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698