Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / bindings / v8 / Dictionary.h

diff --git a/src/third_party/WebKit/Source/bindings/v8/Dictionary.h b/src/third_party/WebKit/Source/bindings/v8/Dictionary.h
index fff0cfa..7d19bba 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/v8/Dictionary.h
+++ b/src/third_party/WebKit/Source/bindings/v8/Dictionary.h
@@ -80,7 +80,7 @@ public:
     bool get(const String&, unsigned long&) const;
     bool get(const String&, unsigned long long&) const;
     bool get(const String&, RefPtr<DOMWindow>&) const;
-    bool get(const String&, RefPtr<Storage>&) const;
+    bool get(const String&, RefPtrWillBeRawPtr<Storage>&) const;
     bool get(const String&, MessagePortArray&) const;
     bool get(const String&, RefPtr<Uint8Array>&) const;
     bool get(const String&, RefPtr<ArrayBufferView>&) const;
@@ -88,8 +88,8 @@ public:
     bool get(const String&, RefPtr<MediaKeyError>&) const;
     bool get(const String&, RefPtr<TrackBase>&) const;
     bool get(const String&, RefPtr<SpeechRecognitionError>&) const;
-    bool get(const String&, RefPtr<SpeechRecognitionResult>&) const;
-    bool get(const String&, RefPtr<SpeechRecognitionResultList>&) const;
+    bool get(const String&, RefPtrWillBeRawPtr<SpeechRecognitionResult>&) const;
+    bool get(const String&, RefPtrWillBeRawPtr<SpeechRecognitionResultList>&) const;
     bool get(const String&, RefPtr<MediaStream>&) const;
     bool get(const String&, RefPtr<EventTarget>&) const;
     bool get(const String&, HashSet<AtomicString>&) const;
@@ -153,14 +153,14 @@ public:
     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;
+    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<template <typename> class PointerType, typename T>
+    bool convert(ConversionContext&, const String&, PointerType<T>&) const;
 
     template<typename StringType>
     bool getStringType(const String&, StringType&) const;
@@ -302,7 +302,7 @@ template<typename T> bool Dictionary::convert(ConversionContext& context, const
     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);