Merge 94986 - Make the ThreadSafeRefCounted support in CrossThreadCopier work for T*.

Source/WebCore/platform/CrossThreadCopier.cpp

 /*
  * Copyright (C) 2009 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 21 matching lines @@
 
 #include "CrossThreadCopier.h"
 
 #include "KURL.h"
 #include "PlatformString.h"
 #include "ResourceError.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "SerializedScriptValue.h"
 
+#include <wtf/Assertions.h>
+
 namespace WebCore {
 
 CrossThreadCopierBase<false, false, KURL>::Type CrossThreadCopierBase<false, false, KURL>::copy(const KURL& url)
 {
     return url.copy();
 }
 
 CrossThreadCopierBase<false, false, String>::Type CrossThreadCopierBase<false, false, String>::copy(const String& str)
 {
     return str.crossThreadString();
 }
 
 CrossThreadCopierBase<false, false, ResourceError>::Type CrossThreadCopierBase<false, false, ResourceError>::copy(const ResourceError& error)
 {
     return error.copy();
 }
 
 CrossThreadCopierBase<false, false, ResourceRequest>::Type CrossThreadCopierBase<false, false, ResourceRequest>::copy(const ResourceRequest& request)
 {
     return request.copyData();
 }
 
 CrossThreadCopierBase<false, false, ResourceResponse>::Type CrossThreadCopierBase<false, false, ResourceResponse>::copy(const ResourceResponse& response)
 {
     return response.copyData();
 }
 
+// Test CrossThreadCopier using COMPILE_ASSERT.
+
+// Verify that ThreadSafeRefCounted objects get handled correctly.
+class CopierThreadSafeRefCountedTest : public ThreadSafeRefCounted<CopierThreadSafeRefCountedTest> {
+};
+
+COMPILE_ASSERT((WTF::IsSameType<
+                  PassRefPtr<CopierThreadSafeRefCountedTest>,
+                  CrossThreadCopier<PassRefPtr<CopierThreadSafeRefCountedTest> >::Type
+                  >::value),
+               PassRefPtrTest);
+COMPILE_ASSERT((WTF::IsSameType<
+                  PassRefPtr<CopierThreadSafeRefCountedTest>,
+                  CrossThreadCopier<RefPtr<CopierThreadSafeRefCountedTest> >::Type
+                  >::value),
+               RefPtrTest);
+COMPILE_ASSERT((WTF::IsSameType<
+                  PassRefPtr<CopierThreadSafeRefCountedTest>,
+                  CrossThreadCopier<CopierThreadSafeRefCountedTest*>::Type
+                  >::value),
+               RawPointerTest);
+
+
+// Add a generic specialization which will let's us verify that no other template matches.
+template<typename T> struct CrossThreadCopierBase<false, false, T> {
+    typedef int Type;
+};
+
+// Verify that RefCounted objects only match our generic template which exposes Type as int.
+class CopierRefCountedTest : public RefCounted<CopierRefCountedTest> {
+};
+
+COMPILE_ASSERT((WTF::IsSameType<
+                  int,
+                  CrossThreadCopier<PassRefPtr<CopierRefCountedTest> >::Type
+                  >::value),
+               PassRefPtrRefCountedTest);
+
+COMPILE_ASSERT((WTF::IsSameType<
+                  int,
+                  CrossThreadCopier<RefPtr<CopierRefCountedTest> >::Type
+                  >::value),
+               RefPtrRefCountedTest);
+
+COMPILE_ASSERT((WTF::IsSameType<
+                  int,
+                  CrossThreadCopier<CopierRefCountedTest*>::Type
+                  >::value),
+               RawPointerRefCountedTest);
+
+// Verify that PassOwnPtr gets passed through.
+COMPILE_ASSERT((WTF::IsSameType<
+                  PassOwnPtr<float>,
+                  CrossThreadCopier<PassOwnPtr<float> >::Type
+                  >::value),
+               PassOwnPtrTest);
+
+// Verify that PassOwnPtr does not get passed through.
+COMPILE_ASSERT((WTF::IsSameType<
+                  int,
+                  CrossThreadCopier<OwnPtr<float> >::Type
+                  >::value),
+               OwnPtrTest);
+
 } // namespace WebCore