Enable ThreadRestrictionVerifier for StringImpl

third_party/WebKit/Source/core/dom/Node.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
@@ skipping 91 matching lines @@
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/instrumentation/tracing/TracedValue.h"
 #include "wtf/HashSet.h"
 #include "wtf/Vector.h"
 #include "wtf/allocator/Partitions.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
+namespace {
+
+// TODO(crbug.com/545926): Unsafe hack to avoid triggering the
+// ThreadRestrictionVerifier on StringImpl. This 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.
+void appendUnsafe(StringBuilder& builder, const String& offThreadString) {
+  StringImpl* impl = offThreadString.impl();
+  if (impl) {
+    builder.append(impl->is8Bit()
+                       ? StringView(impl->characters8(), impl->length())
+                       : StringView(impl->characters16(), impl->length()));
+  }
+}
+
+}  // namespace
+
 using namespace HTMLNames;
 
 struct SameSizeAsNode : EventTarget {
   uint32_t m_nodeFlags;
   Member<void*> m_willbeMember[4];
   void* m_pointer;
 };
 
 static_assert(sizeof(Node) <= sizeof(SameSizeAsNode), "Node should stay small");
 
@@ skipping 1359 matching lines @@
   // subset of the other.  The shorter chain is the ancestor.
   return index1 < index2
              ? kDocumentPositionFollowing | kDocumentPositionContainedBy |
                    connection
              : kDocumentPositionPreceding | kDocumentPositionContains |
                    connection;
 }
 
 String Node::debugName() const {
   StringBuilder name;
-  name.append(debugNodeName());
+  appendUnsafe(name, debugNodeName());
   if (isElementNode()) {
     const Element& thisElement = toElement(*this);
     if (thisElement.hasID()) {
       name.append(" id=\'");
-      name.append(thisElement.getIdAttribute());
+      appendUnsafe(name, thisElement.getIdAttribute());
       name.append('\'');
     }
 
     if (thisElement.hasClass()) {
       name.append(" class=\'");
       for (size_t i = 0; i < thisElement.classNames().size(); ++i) {
         if (i > 0)
           name.append(' ');
-        name.append(thisElement.classNames()[i]);
+        appendUnsafe(name, thisElement.classNames()[i]);
       }
       name.append('\'');
     }
   }
   return name.toString();
 }
 
 String Node::debugNodeName() const {
   return nodeName();
 }
@@ skipping 1026 matching lines @@
   if (node) {
     std::stringstream stream;
     node->printNodePathTo(stream);
     LOG(INFO) << stream.str();
   } else {
     LOG(INFO) << "Cannot showNodePath for <null>";
   }
 }
 
 #endif