Skip to content
Permalink
Browse files
2011-06-08 Andreas Kling <andreas.kling@nokia.com>
        Reviewed by Laszlo Gombos.

        [Symbian] Float{32,64}Array and Int16Array fail to build.
        https://bugs.webkit.org/show_bug.cgi?id=62219

        For some reason, RVCT 2.x is moaning about "class member designated by
        a using-declaration must be visible in a direct base class".
        Apply same fix as r69122 and r76592.

        * html/canvas/Float32Array.h:
        (WebCore::Float32Array::set):
        * html/canvas/Float64Array.h:
        (WebCore::Float64Array::set):
        * html/canvas/Int16Array.h:
        (WebCore::Int16Array::set):


Canonical link: https://commits.webkit.org/77758@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@88336 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Andreas Kling committed Jun 8, 2011
1 parent b0f4658 commit 00793bbf7a605434281baae6ca88df1216c02118
Showing with 25 additions and 4 deletions.
  1. +18 −0 Source/WebCore/ChangeLog
  2. +2 −1 Source/WebCore/html/canvas/Float32Array.h
  3. +2 −1 Source/WebCore/html/canvas/Float64Array.h
  4. +3 −2 Source/WebCore/html/canvas/Int16Array.h
@@ -1,3 +1,21 @@
2011-06-08 Andreas Kling <andreas.kling@nokia.com>

Reviewed by Laszlo Gombos.

[Symbian] Float{32,64}Array and Int16Array fail to build.
https://bugs.webkit.org/show_bug.cgi?id=62219

For some reason, RVCT 2.x is moaning about "class member designated by
a using-declaration must be visible in a direct base class".
Apply same fix as r69122 and r76592.

* html/canvas/Float32Array.h:
(WebCore::Float32Array::set):
* html/canvas/Float64Array.h:
(WebCore::Float64Array::set):
* html/canvas/Int16Array.h:
(WebCore::Int16Array::set):

2011-06-08 Syed Idris Shah <syed.idris-shah@nokia.com>

Reviewed by Andreas Kling.
@@ -38,7 +38,8 @@ class Float32Array : public TypedArrayBase<float> {
static PassRefPtr<Float32Array> create(const float* array, unsigned length);
static PassRefPtr<Float32Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length);

using TypedArrayBase<float>::set;
// Can’t use "using" here due to a bug in the RVCT compiler.
void set(TypedArrayBase<float>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<float>::set(array, offset, ec); }

void set(unsigned index, double value)
{
@@ -38,7 +38,8 @@ class Float64Array : public TypedArrayBase<double> {
static PassRefPtr<Float64Array> create(const double* array, unsigned length);
static PassRefPtr<Float64Array> create(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);

using TypedArrayBase<double>::set;
// Can’t use "using" here due to a bug in the RVCT compiler.
void set(TypedArrayBase<double>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<double>::set(array, offset, ec); }

void set(unsigned index, double value)
{
@@ -38,8 +38,9 @@ class Int16Array : public IntegralTypedArrayBase<short> {
static PassRefPtr<Int16Array> create(short* array, unsigned length);
static PassRefPtr<Int16Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length);

using TypedArrayBase<short>::set;
using IntegralTypedArrayBase<short>::set;
// Can’t use "using" here due to a bug in the RVCT compiler.
void set(TypedArrayBase<short>* array, unsigned offset, ExceptionCode& ec) { TypedArrayBase<short>::set(array, offset, ec); }
void set(unsigned index, double value) { IntegralTypedArrayBase<short>::set(index, value); }

PassRefPtr<Int16Array> subarray(int start) const;
PassRefPtr<Int16Array> subarray(int start, int end) const;

0 comments on commit 00793bb

Please sign in to comment.