[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the webkit-1.1 branch:
commit 5a3179823bc6503b0ef61fcd292f189dd4a4fa46
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 05:14:04 2009 +0000

    2009-10-13  Yongjun Zhang  <yongjun.zhang at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            https://bugs.webkit.org/show_bug.cgi?id=29106
            [Qt] make CachedResourceHandle.h compile in winscw Symbian compiler.
    
            Don't inline constructor CachedResourceHandle<T>(R*) to stop winscw
            compiler aggressively resolve inheritance of class R.
    
            The winscw compiler bug is reported at:
            https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9812.
    
            The change should be reverted when the above bug is fixed in winscw compiler.
    
            * loader/CachedResourceHandle.h:
            (WebCore::::CachedResourceHandle):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49556 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 244c69c..f23dd11 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2009-10-13  Yongjun Zhang  <yongjun.zhang at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29106
+        [Qt] make CachedResourceHandle.h compile in winscw Symbian compiler.
+
+        Don't inline constructor CachedResourceHandle<T>(R*) to stop winscw
+        compiler aggressively resolve inheritance of class R.  
+        
+        The winscw compiler bug is reported at:
+        https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9812.
+        
+        The change should be reverted when the above bug is fixed in winscw compiler.
+
+        * loader/CachedResourceHandle.h:
+        (WebCore::::CachedResourceHandle):
+
 2009-10-13  Dimitri Glazkov  <dglazkov at chromium.org>
 
         No review, rolling out r49554, because it broke Win and Chromium builds.
diff --git a/WebCore/loader/CachedResourceHandle.h b/WebCore/loader/CachedResourceHandle.h
index 9d45b94..0956e0c 100644
--- a/WebCore/loader/CachedResourceHandle.h
+++ b/WebCore/loader/CachedResourceHandle.h
@@ -60,7 +60,7 @@ namespace WebCore {
     template <class R> class CachedResourceHandle : public CachedResourceHandleBase {
     public: 
         CachedResourceHandle() { }
-        CachedResourceHandle(R* res) : CachedResourceHandleBase(res) { }
+        CachedResourceHandle(R* res);
         CachedResourceHandle(const CachedResourceHandle<R>& o) : CachedResourceHandleBase(o) { }
 
         R* get() const { return reinterpret_cast<R*>(CachedResourceHandleBase::get()); }
@@ -71,6 +71,17 @@ namespace WebCore {
         bool operator==(const CachedResourceHandleBase& o) const { return get() == o.get(); }
         bool operator!=(const CachedResourceHandleBase& o) const { return get() != o.get(); }
     };
+
+    // Don't inline for winscw compiler to prevent the compiler agressively resolving
+    // the base class of R* when CachedResourceHandler<T>(R*) is inlined.  The bug is
+    // reported at: https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9812.
+    template <class R>
+#if !COMPILER(WINSCW)
+    inline
+#endif
+    CachedResourceHandle<R>::CachedResourceHandle(R* res) : CachedResourceHandleBase(res) 
+    {
+    }
     
     template <class R, class RR> bool operator==(const CachedResourceHandle<R>& h, const RR* res) 
     { 

-- 
WebKit Debian packaging