Oilpan: Prepare to move SQLError to oilpan heap.

Source/modules/webdatabase/SQLError.h

 /*
  * Copyright (C) 2007 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 17 matching lines @@
 
 #ifndef SQLError_h
 #define SQLError_h
 
 #include "bindings/v8/ScriptWrappable.h"
 #include "wtf/ThreadSafeRefCounted.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
-class SQLError : public ThreadSafeRefCounted<SQLError>, public ScriptWrappable {
+class SQLErrorData {
 public:
-    static PassRefPtr<SQLError> create(unsigned code, const String& message) { return adoptRef(new SQLError(code, message)); }
-    static PassRefPtr<SQLError> create(unsigned code, const char* message, int sqliteCode, const char* sqliteMessage)
+    static PassOwnPtr<SQLErrorData> create(unsigned code, const String& message)
+    {
+        return adoptPtr(new SQLErrorData(code, message));
+    }
+
+    static PassOwnPtr<SQLErrorData> create(unsigned code, const char* message, int sqliteCode, const char* sqliteMessage)
     {
         return create(code, String::format("%s (%d %s)", message, sqliteCode, sqliteMessage));
     }
 
+    static PassOwnPtr<SQLErrorData> create(const SQLErrorData& data)
+    {
+        return create(data.code(), data.message());
+    }
+
     unsigned code() const { return m_code; }
     String message() const { return m_message.isolatedCopy(); }
 
+private:
+    SQLErrorData(unsigned code, const String& message) : m_code(code), m_message(message.isolatedCopy()) { }
+
+    unsigned m_code;
+    String m_message;
+};
+
+class SQLError : public ThreadSafeRefCountedWillBeGarbageCollectedFinalized<SQLError>, public ScriptWrappable {
+public:
+    static PassRefPtrWillBeRawPtr<SQLError> create(const SQLErrorData& data) { return adoptRefWillBeNoop(new SQLError(data)); }
+    void trace(Visitor*) { }
+
+    unsigned code() const { return m_code; }
+    String message() const { return m_message; }
+
     enum SQLErrorCode {
         UNKNOWN_ERR = 0,
         DATABASE_ERR = 1,
         VERSION_ERR = 2,
         TOO_LARGE_ERR = 3,
         QUOTA_ERR = 4,
         SYNTAX_ERR = 5,
         CONSTRAINT_ERR = 6,
         TIMEOUT_ERR = 7
     };
 
     static const char quotaExceededErrorMessage[];
     static const char unknownErrorMessage[];
     static const char versionErrorMessage[];
 
 private:
-    SQLError(unsigned code, const String& message) : m_code(code), m_message(message.isolatedCopy())
+    SQLError(const SQLErrorData& data) : m_code(data.code()), m_message(data.message())

[haraken, 2014/03/25 11:50:05]

Add 'explicit'.

[tkent, 2014/03/25 22:07:13]

Done.

     {
         ScriptWrappable::init(this);
     }
 
     unsigned m_code;
     String m_message;

[haraken, 2014/03/25 11:50:05]

How about making SQLError hold an OwnPtr<SQLErrorData> ? In this CL, m_code and
m_message are duplicated in SQLError and SQLErrorData.

[tkent, 2014/03/25 22:07:13]

Done.

 };
 
 }
 
 #endif // SQLError_h