From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 2 Jun 2011 12:07:03 +0100
Subject: Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
---
 Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Source/WebKit2/UIProcess/API/cpp')

diff --git a/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h b/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h
index cb2a63e..ae5ba65 100644
--- a/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h
+++ b/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h
@@ -204,9 +204,15 @@ template<typename T, typename U> inline bool operator!=(T* a, const WKRetainPtr<
     return a != b.get(); 
 }
 
+template<typename T> inline WKRetainPtr<T> adoptWK(T o)
+{
+    return WKRetainPtr<T>(AdoptWK, o);
+}
+
 } // namespace WebKit
 
 using WebKit::WKRetainPtr;
 using WebKit::AdoptWK;
+using WebKit::adoptWK;
 
 #endif // WKRetainPtr_h
-- 
cgit v1.1