Add a second-order Dictionary::convert() function template.

Source/bindings/v8/Dictionary.h

 /*
  * Copyright (C) 2010 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:
  *
  * 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 141 matching lines @@
     bool convert(ConversionContext&, const String&, String&) const;
     bool convert(ConversionContext&, const String&, ScriptValue&) const;
 
     template<typename IntegralType>
     bool convert(ConversionContext&, const String&, IntegralType&) const;
     bool convert(ConversionContext&, const String&, MessagePortArray&) const;
     bool convert(ConversionContext&, const String&, HashSet<AtomicString>&) const;
     bool convert(ConversionContext&, const String&, Dictionary&) const;
     bool convert(ConversionContext&, const String&, Vector<String>&) const;
     bool convert(ConversionContext&, const String&, ArrayValue&) const;
-    template<typename T>
-    bool convert(ConversionContext&, const String&, RefPtr<T>&) const;
-    template<typename T>
-    bool convert(ConversionContext&, const String&, RawPtr<T>&) const;
+    template<template <typename> class PointerType, typename T>
+    bool convert(ConversionContext&, const String&, PointerType<T>&) const;
 
     template<typename StringType>
     bool getStringType(const String&, StringType&) const;
 
     bool getOwnPropertiesAsStringHashMap(HashMap<String, String>&) const;
     bool getOwnPropertyNames(Vector<String>&) const;
 
     bool getWithUndefinedOrNullCheck(const String&, String&) const;
 
     bool hasProperty(const String&) const;
@@ skipping 121 matching lines @@
     if (!getKey(key, v8Value))
         return true;
 
     value = IntegralTypeTraits<T>::toIntegral(v8Value, NormalConversion, context.exceptionState());
     if (context.exceptionState().throwIfNeeded())
         return false;
 
     return true;
 }
 
-template<typename T> bool Dictionary::convert(ConversionContext& context, const String& key, RefPtr<T>& value) const
+template<template <typename> class PointerType, typename T> bool Dictionary::convert(ConversionContext& context, const String& key, PointerType<T>& value) const
 {
     ConversionContextScope scope(context);
 
-    if (!get(key, value))
-        return true;
-
-    if (value)
-        return true;
-
-    v8::Local<v8::Value> v8Value;
-    getKey(key, v8Value);
-    if (context.isNullable() && WebCore::isUndefinedOrNull(v8Value))
-        return true;
-
-    context.throwTypeError(ExceptionMessages::incorrectPropertyType(key, "does not have a " + context.typeName() + " type."));
-    return false;
-}
-
-template<typename T> bool Dictionary::convert(ConversionContext& context, const String& key, RawPtr<T>& value) const
-{
-    ConversionContextScope scope(context);
-
     if (!get(key, value))
         return true;
 
     if (value)
         return true;
 
     v8::Local<v8::Value> v8Value;
     getKey(key, v8Value);
     if (context.isNullable() && WebCore::isUndefinedOrNull(v8Value))
         return true;
 
     context.throwTypeError(ExceptionMessages::incorrectPropertyType(key, "does not have a " + context.typeName() + " type."));
     return false;
 }
 
 }
 
 #endif // Dictionary_h