[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 36b7f076e29dfbdd36bfb93edc31c0d5dfa6c5d1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 15:24:45 2011 +0000

    2011-01-25  Qi Zhang  <qi.2.zhang at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Symbian] RVCT fails to compile [U|I]nt[8|16|32]Array.h
            https://bugs.webkit.org/show_bug.cgi?id=51873
    
            Replace the using declaration, because it doesn't compile on RVCT, and WINSCW has the same issue.
            No new functionality so no new tests.
    
            * html/canvas/Int32Array.h:
            (WebCore::Int32Array::set):
            * html/canvas/Int8Array.h:
            (WebCore::Int8Array::set):
            * html/canvas/Uint16Array.h:
            (WebCore::Uint16Array::set):
            * html/canvas/Uint32Array.h:
            (WebCore::Uint32Array::set):
            * html/canvas/Uint8Array.h:
            (WebCore::Uint8Array::set):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76592 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b627bef..46fe612 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2011-01-25  Qi Zhang  <qi.2.zhang at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Symbian] RVCT fails to compile [U|I]nt[8|16|32]Array.h
+        https://bugs.webkit.org/show_bug.cgi?id=51873
+        
+        Replace the using declaration, because it doesn't compile on RVCT, and WINSCW has the same issue.
+        No new functionality so no new tests.
+
+        * html/canvas/Int32Array.h:
+        (WebCore::Int32Array::set):
+        * html/canvas/Int8Array.h:
+        (WebCore::Int8Array::set):
+        * html/canvas/Uint16Array.h:
+        (WebCore::Uint16Array::set):
+        * html/canvas/Uint32Array.h:
+        (WebCore::Uint32Array::set):
+        * html/canvas/Uint8Array.h:
+        (WebCore::Uint8Array::set):
+
 2011-01-25  Zoltan Herczeg  <zherczeg at webkit.org>
 
         Reviewed by Dirk Schulze.
diff --git a/Source/WebCore/html/canvas/Int32Array.h b/Source/WebCore/html/canvas/Int32Array.h
index 068a677..143c840 100644
--- a/Source/WebCore/html/canvas/Int32Array.h
+++ b/Source/WebCore/html/canvas/Int32Array.h
@@ -37,10 +37,9 @@ public:
     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
+    // Can’t use "using" here due to a bug in the RVCT compiler.
+    void set(TypedArrayBase<int>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<int>::set(array, offset, ec); }
+    void set(unsigned index, double value) { return IntegralTypedArrayBase<int>::set(index, value); }
 
     PassRefPtr<Int32Array> slice(int start) const;
     PassRefPtr<Int32Array> slice(int start, int end) const;
diff --git a/Source/WebCore/html/canvas/Int8Array.h b/Source/WebCore/html/canvas/Int8Array.h
index a5df302..24854fd 100644
--- a/Source/WebCore/html/canvas/Int8Array.h
+++ b/Source/WebCore/html/canvas/Int8Array.h
@@ -39,8 +39,9 @@ public:
     static PassRefPtr<Int8Array> create(signed char* array, unsigned length);
     static PassRefPtr<Int8Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length);
 
-    using TypedArrayBase<signed char>::set;
-    using IntegralTypedArrayBase<signed char>::set;
+    // Can’t use "using" here due to a bug in the RVCT compiler.
+    void set(TypedArrayBase<signed char>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<signed char>::set(array, offset, ec); }
+    void set(unsigned index, double value) { return IntegralTypedArrayBase<signed char>::set(index, value); }
 
     PassRefPtr<Int8Array> slice(int start) const;
     PassRefPtr<Int8Array> slice(int start, int end) const;
diff --git a/Source/WebCore/html/canvas/Uint16Array.h b/Source/WebCore/html/canvas/Uint16Array.h
index f63b67d..e2d9a64 100644
--- a/Source/WebCore/html/canvas/Uint16Array.h
+++ b/Source/WebCore/html/canvas/Uint16Array.h
@@ -39,8 +39,9 @@ public:
     static PassRefPtr<Uint16Array> create(unsigned short* array, unsigned length);
     static PassRefPtr<Uint16Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length);
 
-    using TypedArrayBase<unsigned short>::set;
-    using IntegralTypedArrayBase<unsigned short>::set;
+    // Can’t use "using" here due to a bug in the RVCT compiler.
+    void set(TypedArrayBase<unsigned short>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<unsigned short>::set(array, offset, ec); }
+    void set(unsigned index, double value) { return IntegralTypedArrayBase<unsigned short>::set(index, value); }
 
     PassRefPtr<Uint16Array> slice(int start) const;
     PassRefPtr<Uint16Array> slice(int start, int end) const;
diff --git a/Source/WebCore/html/canvas/Uint32Array.h b/Source/WebCore/html/canvas/Uint32Array.h
index 9c0f137..c222820 100644
--- a/Source/WebCore/html/canvas/Uint32Array.h
+++ b/Source/WebCore/html/canvas/Uint32Array.h
@@ -39,8 +39,9 @@ public:
     static PassRefPtr<Uint32Array> create(unsigned int* array, unsigned length);
     static PassRefPtr<Uint32Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length);
 
-    using TypedArrayBase<unsigned int>::set;
-    using IntegralTypedArrayBase<unsigned int>::set;
+    // Can’t use "using" here due to a bug in the RVCT compiler.
+    void set(TypedArrayBase<unsigned int>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<unsigned int>::set(array, offset, ec); }
+    void set(unsigned index, double value) { return IntegralTypedArrayBase<unsigned int>::set(index, value); }
 
     PassRefPtr<Uint32Array> slice(int start) const;
     PassRefPtr<Uint32Array> slice(int start, int end) const;
diff --git a/Source/WebCore/html/canvas/Uint8Array.h b/Source/WebCore/html/canvas/Uint8Array.h
index 66154b5..266e76f 100644
--- a/Source/WebCore/html/canvas/Uint8Array.h
+++ b/Source/WebCore/html/canvas/Uint8Array.h
@@ -39,10 +39,9 @@ public:
     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
+    // Can’t use "using" here due to a bug in the RVCT compiler.
+    void set(TypedArrayBase<unsigned char>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<unsigned char>::set(array, offset, ec); }
+    void set(unsigned index, double value) { return IntegralTypedArrayBase<unsigned char>::set(index, value); }
 
     PassRefPtr<Uint8Array> slice(int start) const;
     PassRefPtr<Uint8Array> slice(int start, int end) const;

-- 
WebKit Debian packaging