[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bff9ecc6b2c21ef5889cf431b7ae52fca1bf7b2d
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 17:14:38 2010 +0000

    [Qt] Fix breakage in RVCT 2.2 compile
    https://bugs.webkit.org/show_bug.cgi?id=47187
    
    Patch by Keith Kyzivat <keith.kyzivat at nokia.com> on 2010-10-05
    Reviewed by Simon Hausmann.
    
    Fix bug in RVCT 2.2 compile for Symbian^3 in html/canvas/Int32Array.h and
    html/canvas/Uin8Array.h
    For RVCT2.2, the using clause is unneeded, and can be omitted.
    
    A Test case cannot be made for this since this is a build-related issue.
    
    * html/canvas/Int32Array.h:
    * html/canvas/Uint8Array.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69122 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4c08961..ab2d103 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-05  Keith Kyzivat  <keith.kyzivat at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix breakage in RVCT 2.2 compile
+        https://bugs.webkit.org/show_bug.cgi?id=47187
+
+        Fix bug in RVCT 2.2 compile for Symbian^3 in html/canvas/Int32Array.h and 
+        html/canvas/Uin8Array.h
+        For RVCT2.2, the using clause is unneeded, and can be omitted.
+
+        A Test case cannot be made for this since this is a build-related issue.
+
+        * html/canvas/Int32Array.h:
+        * html/canvas/Uint8Array.h:
+
 2010-10-04  Andrei Popescu  <andreip at google.com>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/html/canvas/Int32Array.h b/WebCore/html/canvas/Int32Array.h
index 72fb579..bd05450 100644
--- a/WebCore/html/canvas/Int32Array.h
+++ b/WebCore/html/canvas/Int32Array.h
@@ -37,8 +37,10 @@ class Int32Array : public IntegralTypedArrayBase<int> {
     static PassRefPtr<Int32Array> create(int* array, unsigned length);
     static PassRefPtr<Int32Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length);
 
+#if !COMPILER(RVCT)
     using TypedArrayBase<int>::set;
     using IntegralTypedArrayBase<int>::set;
+#endif
 
   private:
     Int32Array(PassRefPtr<ArrayBuffer> buffer,
diff --git a/WebCore/html/canvas/Uint8Array.h b/WebCore/html/canvas/Uint8Array.h
index 6e20b42..fce63da 100644
--- a/WebCore/html/canvas/Uint8Array.h
+++ b/WebCore/html/canvas/Uint8Array.h
@@ -39,8 +39,10 @@ class Uint8Array : public IntegralTypedArrayBase<unsigned char> {
     static PassRefPtr<Uint8Array> create(unsigned char* array, unsigned length);
     static PassRefPtr<Uint8Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length);
 
+#if !COMPILER(RVCT)
     using TypedArrayBase<unsigned char>::set;
     using IntegralTypedArrayBase<unsigned char>::set;
+#endif
 
   private:
     Uint8Array(PassRefPtr<ArrayBuffer> buffer,

-- 
WebKit Debian packaging