diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 08:15:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 08:15:24 -0700 |
| commit | fa91a01aee5d4a80ca6c80f722116b850f09996c (patch) | |
| tree | f72740e60d3c3d4f0ab144e88c03d1f134944ce3 /Source/WebCore/html/canvas/Int16Array.cpp | |
| parent | 96f37d6d1b390f6690858789706ee6ec25bc1677 (diff) | |
| parent | feebf8e7a79ad68b04a1a948e2b8078d6e5f0048 (diff) | |
| download | external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.zip external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.gz external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.bz2 | |
Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f
* changes:
Merge WebKit at r78450: Update ThirdPartyProject.prop
Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
Merge WebKit at r78450: FrameLoader::url() removed
Merge WebKit at r78450: HTMLParserQuirks removed
Merge WebKit at r78450: TextRun::padding() renamed
Merge WebKit at r78450: Use new FontMetrics
Merge WebKit at r78450: GraphicsContext current path removed
Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
Merge WebKit at r78450: IntRect::bottom()/right() renamed
Merge WebKit at r78450: Fix remaining conflicts
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
Merge WebKit at r78450: Fix conflicts in media controls
Merge WebKit at r78450: Fix Makefiles
Merge WebKit at r78450: Initial merge by git.
Diffstat (limited to 'Source/WebCore/html/canvas/Int16Array.cpp')
| -rw-r--r-- | Source/WebCore/html/canvas/Int16Array.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/WebCore/html/canvas/Int16Array.cpp b/Source/WebCore/html/canvas/Int16Array.cpp index a3d04bc..9aaa1d5 100644 --- a/Source/WebCore/html/canvas/Int16Array.cpp +++ b/Source/WebCore/html/canvas/Int16Array.cpp @@ -24,9 +24,6 @@ */ #include "config.h" - -#if ENABLE(3D_CANVAS) || ENABLE(BLOB) - #include "Int16Array.h" namespace WebCore { @@ -51,16 +48,14 @@ Int16Array::Int16Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsi { } -PassRefPtr<Int16Array> Int16Array::slice(int start) const +PassRefPtr<Int16Array> Int16Array::subarray(int start) const { - return slice(start, length()); + return subarray(start, length()); } -PassRefPtr<Int16Array> Int16Array::slice(int start, int end) const +PassRefPtr<Int16Array> Int16Array::subarray(int start, int end) const { - return sliceImpl<Int16Array>(start, end); + return subarrayImpl<Int16Array>(start, end); } } - -#endif // ENABLE(3D_CANVAS) || ENABLE(BLOB) |