[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 4125ef5d6e1e96a0b494f14ba4a726e98dd0c510
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 18:14:22 2010 +0000

    Fix WebKitCreateInstance helper
    
    Part of <http://webkit.org/b/33212> Small fixes/improvements to
    WebKitAPITest
    
    Reviewed by Sam Weinig.
    
    * WebKitAPITest/tests/WebViewDestruction.cpp:
    (WebKitAPITest::WebKitCreateInstance): Pass the pointer straight
    through, instead of taking its address.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52802 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 493297e..34cdc85 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-05  Adam Roben  <aroben at apple.com>
+
+        Fix WebKitCreateInstance helper
+
+        Part of <http://webkit.org/b/33212> Small fixes/improvements to
+        WebKitAPITest
+
+        Reviewed by Sam Weinig.
+
+        * WebKitAPITest/tests/WebViewDestruction.cpp:
+        (WebKitAPITest::WebKitCreateInstance): Pass the pointer straight
+        through, instead of taking its address.
+
 2010-01-04  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKitTools/WebKitAPITest/tests/WebViewDestruction.cpp b/WebKitTools/WebKitAPITest/tests/WebViewDestruction.cpp
index e103a8b..928dda5 100644
--- a/WebKitTools/WebKitAPITest/tests/WebViewDestruction.cpp
+++ b/WebKitTools/WebKitAPITest/tests/WebViewDestruction.cpp
@@ -34,7 +34,7 @@ namespace WebKitAPITest {
 template <typename T>
 static HRESULT WebKitCreateInstance(REFCLSID clsid, T** object)
 {
-    return WebKitCreateInstance(clsid, 0, __uuidof(T), reinterpret_cast<void**>(&object));
+    return WebKitCreateInstance(clsid, 0, __uuidof(T), reinterpret_cast<void**>(object));
 }
 
 static int webViewCount()

-- 
WebKit Debian packaging