Merge WebKit at r78450: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebCore / html / canvas / Float32Array.h

diff --git a/Source/WebCore/html/canvas/Float32Array.h b/Source/WebCore/html/canvas/Float32Array.h
index d00a7c5..ee1ea56 100644 (file)
--- a/Source/WebCore/html/canvas/Float32Array.h
+++ b/Source/WebCore/html/canvas/Float32Array.h
@@ -56,8 +56,8 @@ public:
         return result;
     }
 
-    PassRefPtr<Float32Array> slice(int start) const;
-    PassRefPtr<Float32Array> slice(int start, int end) const;
+    PassRefPtr<Float32Array> subarray(int start) const;
+    PassRefPtr<Float32Array> subarray(int start, int end) const;
 
 private:
     Float32Array(PassRefPtr<ArrayBuffer> buffer,