Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects.

third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/editing/markers/DocumentMarker.h"
 
+#include "wtf/StdLibExtras.h"
+
 namespace blink {
 
 DocumentMarkerDetails::~DocumentMarkerDetails()
 {
 }
 
 class DocumentMarkerDescription final : public DocumentMarkerDetails {
 public:
     static RawPtr<DocumentMarkerDescription> create(const String&);
 
@@ skipping 33 matching lines @@
     explicit DocumentMarkerTextMatch(bool match)
         : m_match(match)
     {
     }
 
     bool m_match;
 };
 
 RawPtr<DocumentMarkerTextMatch> DocumentMarkerTextMatch::create(bool match)
 {
-    DEFINE_STATIC_REF_WILL_BE_PERSISTENT(DocumentMarkerTextMatch, trueInstance, (new DocumentMarkerTextMatch(true)));
-    DEFINE_STATIC_REF_WILL_BE_PERSISTENT(DocumentMarkerTextMatch, falseInstance, (new DocumentMarkerTextMatch(false)));
-    return match ? trueInstance : falseInstance;
+    DEFINE_STATIC_LOCAL(DocumentMarkerTextMatch, trueInstance, (new DocumentMarkerTextMatch(true)));
+    DEFINE_STATIC_LOCAL(DocumentMarkerTextMatch, falseInstance, (new DocumentMarkerTextMatch(false)));
+    return match ? &trueInstance : &falseInstance;
 }
 
 inline DocumentMarkerTextMatch* toDocumentMarkerTextMatch(DocumentMarkerDetails* details)
 {
     if (details && details->isTextMatch())
         return static_cast<DocumentMarkerTextMatch*>(details);
     return 0;
 }
 
 class TextCompositionMarkerDetails final : public DocumentMarkerDetails {
@@ skipping 112 matching lines @@
         return details->backgroundColor();
     return Color::transparent;
 }
 
 DEFINE_TRACE(DocumentMarker)
 {
     visitor->trace(m_details);
 }
 
 } // namespace blink