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

[darin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit f4afd14e24d6c044dff7b3317a437663d077defa
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 18:14:56 2010 +0000

    2010-03-12  Darin Fisher  <darin at chromium.org>
    
            Fix Chromium build bustage.
    
            Wrap usage of WebPrivatePtr from WebNode.h in a #if
            WEBKIT_IMPLEMENTATION guard.
    
            * public/WebNode.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55912 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d6f3541..fafd0f1 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-12  Darin Fisher  <darin at chromium.org>
+
+        Fix Chromium build bustage.
+
+        Wrap usage of WebPrivatePtr from WebNode.h in a #if
+        WEBKIT_IMPLEMENTATION guard.
+
+        * public/WebNode.h:
+
 2010-03-12  Nicolas Weber  <thakis at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKit/chromium/public/WebNode.h b/WebKit/chromium/public/WebNode.h
index 470eefd..6f2780d 100644
--- a/WebKit/chromium/public/WebNode.h
+++ b/WebKit/chromium/public/WebNode.h
@@ -121,6 +121,7 @@ public:
 #endif
 
 protected:
+#if WEBKIT_IMPLEMENTATION
     template<typename T> T* unwrap()
     {
         return static_cast<T*>(m_private.get());
@@ -130,6 +131,7 @@ protected:
     {
         return static_cast<const T*>(m_private.get());
     }
+#endif
 
     WebPrivatePtr<WebCore::Node> m_private;
 };

-- 
WebKit Debian packaging