Move TypedArray implementation into JSC

https://bugs.webkit.org/show_bug.cgi?id=119489

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

Move TypedArray implementation into JSC in advance of re-implementation

* GNUmakefile.list.am:
* JSCTypedArrayStubs.h:
* JavaScriptCore.xcodeproj/project.pbxproj:
* runtime/ArrayBuffer.cpp: Renamed from Source/WTF/wtf/ArrayBuffer.cpp.
(JSC::ArrayBuffer::transfer):
(JSC::ArrayBuffer::addView):
(JSC::ArrayBuffer::removeView):
* runtime/ArrayBuffer.h: Renamed from Source/WTF/wtf/ArrayBuffer.h.
(JSC::ArrayBufferContents::ArrayBufferContents):
(JSC::ArrayBufferContents::data):
(JSC::ArrayBufferContents::sizeInBytes):
(JSC::ArrayBufferContents::transfer):
(JSC::ArrayBufferContents::copyTo):
(JSC::ArrayBuffer::isNeutered):
(JSC::ArrayBuffer::~ArrayBuffer):
(JSC::ArrayBuffer::clampValue):
(JSC::ArrayBuffer::create):
(JSC::ArrayBuffer::createUninitialized):
(JSC::ArrayBuffer::ArrayBuffer):
(JSC::ArrayBuffer::data):
(JSC::ArrayBuffer::byteLength):
(JSC::ArrayBuffer::slice):
(JSC::ArrayBuffer::sliceImpl):
(JSC::ArrayBuffer::clampIndex):
(JSC::ArrayBufferContents::tryAllocate):
(JSC::ArrayBufferContents::~ArrayBufferContents):
* runtime/ArrayBufferView.cpp: Renamed from Source/WTF/wtf/ArrayBufferView.cpp.
(JSC::ArrayBufferView::ArrayBufferView):
(JSC::ArrayBufferView::~ArrayBufferView):
(JSC::ArrayBufferView::neuter):
* runtime/ArrayBufferView.h: Renamed from Source/WTF/wtf/ArrayBufferView.h.
(JSC::ArrayBufferView::buffer):
(JSC::ArrayBufferView::baseAddress):
(JSC::ArrayBufferView::byteOffset):
(JSC::ArrayBufferView::setNeuterable):
(JSC::ArrayBufferView::isNeuterable):
(JSC::ArrayBufferView::verifySubRange):
(JSC::ArrayBufferView::clampOffsetAndNumElements):
(JSC::ArrayBufferView::setImpl):
(JSC::ArrayBufferView::setRangeImpl):
(JSC::ArrayBufferView::zeroRangeImpl):
(JSC::ArrayBufferView::calculateOffsetAndLength):
* runtime/Float32Array.h: Renamed from Source/WTF/wtf/Float32Array.h.
(JSC::Float32Array::set):
(JSC::Float32Array::getType):
(JSC::Float32Array::create):
(JSC::Float32Array::createUninitialized):
(JSC::Float32Array::Float32Array):
(JSC::Float32Array::subarray):
* runtime/Float64Array.h: Renamed from Source/WTF/wtf/Float64Array.h.
(JSC::Float64Array::set):
(JSC::Float64Array::getType):
(JSC::Float64Array::create):
(JSC::Float64Array::createUninitialized):
(JSC::Float64Array::Float64Array):
(JSC::Float64Array::subarray):
* runtime/Int16Array.h: Renamed from Source/WTF/wtf/Int16Array.h.
(JSC::Int16Array::getType):
(JSC::Int16Array::create):
(JSC::Int16Array::createUninitialized):
(JSC::Int16Array::Int16Array):
(JSC::Int16Array::subarray):
* runtime/Int32Array.h: Renamed from Source/WTF/wtf/Int32Array.h.
(JSC::Int32Array::getType):
(JSC::Int32Array::create):
(JSC::Int32Array::createUninitialized):
(JSC::Int32Array::Int32Array):
(JSC::Int32Array::subarray):
* runtime/Int8Array.h: Renamed from Source/WTF/wtf/Int8Array.h.
(JSC::Int8Array::getType):
(JSC::Int8Array::create):
(JSC::Int8Array::createUninitialized):
(JSC::Int8Array::Int8Array):
(JSC::Int8Array::subarray):
* runtime/IntegralTypedArrayBase.h: Renamed from Source/WTF/wtf/IntegralTypedArrayBase.h.
(JSC::IntegralTypedArrayBase::set):
(JSC::IntegralTypedArrayBase::IntegralTypedArrayBase):
* runtime/TypedArrayBase.h: Renamed from Source/WTF/wtf/TypedArrayBase.h.
(JSC::TypedArrayBase::data):
(JSC::TypedArrayBase::set):
(JSC::TypedArrayBase::setRange):
(JSC::TypedArrayBase::zeroRange):
(JSC::TypedArrayBase::length):
(JSC::TypedArrayBase::byteLength):
(JSC::TypedArrayBase::item):
(JSC::TypedArrayBase::checkInboundData):
(JSC::TypedArrayBase::TypedArrayBase):
(JSC::TypedArrayBase::create):
(JSC::TypedArrayBase::createUninitialized):
(JSC::TypedArrayBase::subarrayImpl):
(JSC::TypedArrayBase::neuter):
* runtime/Uint16Array.h: Renamed from Source/WTF/wtf/Uint16Array.h.
(JSC::Uint16Array::getType):
(JSC::Uint16Array::create):
(JSC::Uint16Array::createUninitialized):
(JSC::Uint16Array::Uint16Array):
(JSC::Uint16Array::subarray):
* runtime/Uint32Array.h: Renamed from Source/WTF/wtf/Uint32Array.h.
(JSC::Uint32Array::getType):
(JSC::Uint32Array::create):
(JSC::Uint32Array::createUninitialized):
(JSC::Uint32Array::Uint32Array):
(JSC::Uint32Array::subarray):
* runtime/Uint8Array.h: Renamed from Source/WTF/wtf/Uint8Array.h.
(JSC::Uint8Array::getType):
(JSC::Uint8Array::create):
(JSC::Uint8Array::createUninitialized):
(JSC::Uint8Array::Uint8Array):
(JSC::Uint8Array::subarray):
* runtime/Uint8ClampedArray.h: Renamed from Source/WTF/wtf/Uint8ClampedArray.h.
(JSC::Uint8ClampedArray::getType):
(JSC::Uint8ClampedArray::create):
(JSC::Uint8ClampedArray::createUninitialized):
(JSC::Uint8ClampedArray::zeroFill):
(JSC::Uint8ClampedArray::set):
(JSC::Uint8ClampedArray::Uint8ClampedArray):
(JSC::Uint8ClampedArray::subarray):
* runtime/VM.h:

Source/WebCore:

Update WebCore for new location of TypedArray implementation.

* ForwardingHeaders/runtime/ArrayBuffer.h: Added.
* ForwardingHeaders/runtime/ArrayBufferView.h: Added.
* ForwardingHeaders/runtime/Float32Array.h: Added.
* ForwardingHeaders/runtime/Float64Array.h: Added.
* ForwardingHeaders/runtime/Int16Array.h: Added.
* ForwardingHeaders/runtime/Int32Array.h: Added.
* ForwardingHeaders/runtime/Int8Array.h: Added.
* ForwardingHeaders/runtime/IntegralTypedArrayBase.h: Added.
* ForwardingHeaders/runtime/TypedArrayBase.h: Added.
* ForwardingHeaders/runtime/Uint16Array.h: Added.
* ForwardingHeaders/runtime/Uint32Array.h: Added.
* ForwardingHeaders/runtime/Uint8Array.h: Added.
* ForwardingHeaders/runtime/Uint8ClampedArray.h: Added.
* Modules/webaudio/AnalyserNode.h:
(WebCore::AnalyserNode::getFloatFrequencyData):
(WebCore::AnalyserNode::getByteFrequencyData):
(WebCore::AnalyserNode::getByteTimeDomainData):
* Modules/webaudio/AsyncAudioDecoder.cpp:
* Modules/webaudio/AsyncAudioDecoder.h:
(WebCore::AsyncAudioDecoder::DecodingTask::audioData):
* Modules/webaudio/AudioBuffer.h:
* Modules/webaudio/AudioContext.cpp:
* Modules/webaudio/AudioParam.h:
* Modules/webaudio/AudioParamTimeline.h:
* Modules/webaudio/PeriodicWave.h:
* Modules/webaudio/RealtimeAnalyser.cpp:
* Modules/webaudio/RealtimeAnalyser.h:
* Modules/webaudio/ScriptProcessorNode.cpp:
* Modules/webaudio/WaveShaperProcessor.h:
* Modules/websockets/ThreadableWebSocketChannel.h:
* Modules/websockets/WebSocket.cpp:
* Modules/websockets/WebSocket.h:
* Modules/websockets/WebSocketChannel.cpp:
* Modules/websockets/WebSocketChannel.h:
* Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
* Modules/websockets/WorkerThreadableWebSocketChannel.h:
* WebCore.exp.in:
* bindings/js/JSArrayBufferCustom.cpp:
* bindings/js/JSArrayBufferViewHelper.h:
* bindings/js/JSAudioContextCustom.cpp:
* bindings/js/JSCryptoCustom.cpp:
* bindings/js/JSDictionary.h:
* bindings/js/JSFileReaderCustom.cpp:
* bindings/js/JSWebGLRenderingContextCustom.cpp:
* bindings/js/JSXMLHttpRequestCustom.cpp:
* bindings/js/SerializedScriptValue.cpp:
(WebCore::SerializedScriptValue::transferArrayBuffers):
* bindings/js/SerializedScriptValue.h:
* bindings/scripts/CodeGeneratorJS.pm:
(AddIncludesForType):
(GenerateHeader):
(NativeToJSValue):
* dom/MessageEvent.h:
* fileapi/FileReader.cpp:
* fileapi/FileReader.h:
* fileapi/FileReaderLoader.cpp:
* fileapi/FileReaderLoader.h:
* fileapi/FileReaderSync.cpp:
* fileapi/FileReaderSync.h:
* fileapi/WebKitBlobBuilder.cpp:
* fileapi/WebKitBlobBuilder.h:
* html/HTMLMediaElement.cpp:
* html/ImageData.h:
* html/canvas/ArrayBuffer.idl:
* html/canvas/ArrayBufferView.idl:
* html/canvas/CanvasRenderingContext2D.cpp:
* html/canvas/DataView.h:
* html/canvas/Float32Array.idl:
* html/canvas/Float64Array.idl:
* html/canvas/Int16Array.idl:
* html/canvas/Int32Array.idl:
* html/canvas/Int8Array.idl:
* html/canvas/Uint16Array.idl:
* html/canvas/Uint32Array.idl:
* html/canvas/Uint8Array.idl:
* html/canvas/Uint8ClampedArray.idl:
* html/canvas/WebGLBuffer.h:
(WebCore::WebGLBuffer::elementArrayBuffer):
* html/canvas/WebGLGetInfo.cpp:
* html/canvas/WebGLGetInfo.h:
* html/canvas/WebGLRenderingContext.cpp:
* html/canvas/WebGLRenderingContext.h:
* inspector/InspectorMemoryAgent.cpp:
* page/Crypto.cpp:
* page/Crypto.h:
* platform/graphics/GraphicsContext3D.cpp:
* platform/graphics/ImageBuffer.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/cg/ImageBufferDataCG.h:
* platform/graphics/filters/FEBlend.cpp:
* platform/graphics/filters/FEColorMatrix.cpp:
* platform/graphics/filters/FEComponentTransfer.cpp:
* platform/graphics/filters/FEComposite.cpp:
* platform/graphics/filters/FEConvolveMatrix.cpp:
* platform/graphics/filters/FECustomFilter.cpp:
* platform/graphics/filters/FEDisplacementMap.cpp:
* platform/graphics/filters/FEDropShadow.cpp:
* platform/graphics/filters/FEGaussianBlur.cpp:
* platform/graphics/filters/FELighting.h:
* platform/graphics/filters/FEMorphology.cpp:
* platform/graphics/filters/FETurbulence.cpp:
* platform/graphics/filters/FilterEffect.cpp:
* platform/graphics/filters/FilterEffect.h:
* platform/graphics/mac/GraphicsContext3DMac.mm:
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
* testing/Internals.h:
* xml/XMLHttpRequest.cpp:
* xml/XMLHttpRequest.h:
(WebCore::XMLHttpRequest::optionalResponseArrayBuffer):

Source/WTF:

Remove TypedArray implementation from WTF

* GNUmakefile.list.am:
* WTF.xcodeproj/project.pbxproj:
* wtf/Forward.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index a83bd1bc7aa7c5fb4dcc8f96b4e07bc7cd7e910e..85d17ed7a76bcb84411b43ffc601427d492b4b78 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -264,6 +264,8 @@ set(JavaScriptCore_SOURCES
     profiler/ProfileNode.cpp
     profiler/LegacyProfiler.cpp
 
+    runtime/ArrayBuffer.cpp
+    runtime/ArrayBufferView.cpp
     runtime/ArgList.cpp
     runtime/Arguments.cpp
     runtime/ArrayConstructor.cpp

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 0a59b22f9a59654b9e741aa192b26203c57ed308..a810c87f5968110940705bc8bc7572c35bb78112 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,131 @@
+2013-08-05  Oliver Hunt  <oliver@apple.com>
+
+        Move TypedArray implementation into JSC
+        https://bugs.webkit.org/show_bug.cgi?id=119489
+
+        Reviewed by Filip Pizlo.
+
+        Move TypedArray implementation into JSC in advance of re-implementation
+
+        * GNUmakefile.list.am:
+        * JSCTypedArrayStubs.h:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * runtime/ArrayBuffer.cpp: Renamed from Source/WTF/wtf/ArrayBuffer.cpp.
+        (JSC::ArrayBuffer::transfer):
+        (JSC::ArrayBuffer::addView):
+        (JSC::ArrayBuffer::removeView):
+        * runtime/ArrayBuffer.h: Renamed from Source/WTF/wtf/ArrayBuffer.h.
+        (JSC::ArrayBufferContents::ArrayBufferContents):
+        (JSC::ArrayBufferContents::data):
+        (JSC::ArrayBufferContents::sizeInBytes):
+        (JSC::ArrayBufferContents::transfer):
+        (JSC::ArrayBufferContents::copyTo):
+        (JSC::ArrayBuffer::isNeutered):
+        (JSC::ArrayBuffer::~ArrayBuffer):
+        (JSC::ArrayBuffer::clampValue):
+        (JSC::ArrayBuffer::create):
+        (JSC::ArrayBuffer::createUninitialized):
+        (JSC::ArrayBuffer::ArrayBuffer):
+        (JSC::ArrayBuffer::data):
+        (JSC::ArrayBuffer::byteLength):
+        (JSC::ArrayBuffer::slice):
+        (JSC::ArrayBuffer::sliceImpl):
+        (JSC::ArrayBuffer::clampIndex):
+        (JSC::ArrayBufferContents::tryAllocate):
+        (JSC::ArrayBufferContents::~ArrayBufferContents):
+        * runtime/ArrayBufferView.cpp: Renamed from Source/WTF/wtf/ArrayBufferView.cpp.
+        (JSC::ArrayBufferView::ArrayBufferView):
+        (JSC::ArrayBufferView::~ArrayBufferView):
+        (JSC::ArrayBufferView::neuter):
+        * runtime/ArrayBufferView.h: Renamed from Source/WTF/wtf/ArrayBufferView.h.
+        (JSC::ArrayBufferView::buffer):
+        (JSC::ArrayBufferView::baseAddress):
+        (JSC::ArrayBufferView::byteOffset):
+        (JSC::ArrayBufferView::setNeuterable):
+        (JSC::ArrayBufferView::isNeuterable):
+        (JSC::ArrayBufferView::verifySubRange):
+        (JSC::ArrayBufferView::clampOffsetAndNumElements):
+        (JSC::ArrayBufferView::setImpl):
+        (JSC::ArrayBufferView::setRangeImpl):
+        (JSC::ArrayBufferView::zeroRangeImpl):
+        (JSC::ArrayBufferView::calculateOffsetAndLength):
+        * runtime/Float32Array.h: Renamed from Source/WTF/wtf/Float32Array.h.
+        (JSC::Float32Array::set):
+        (JSC::Float32Array::getType):
+        (JSC::Float32Array::create):
+        (JSC::Float32Array::createUninitialized):
+        (JSC::Float32Array::Float32Array):
+        (JSC::Float32Array::subarray):
+        * runtime/Float64Array.h: Renamed from Source/WTF/wtf/Float64Array.h.
+        (JSC::Float64Array::set):
+        (JSC::Float64Array::getType):
+        (JSC::Float64Array::create):
+        (JSC::Float64Array::createUninitialized):
+        (JSC::Float64Array::Float64Array):
+        (JSC::Float64Array::subarray):
+        * runtime/Int16Array.h: Renamed from Source/WTF/wtf/Int16Array.h.
+        (JSC::Int16Array::getType):
+        (JSC::Int16Array::create):
+        (JSC::Int16Array::createUninitialized):
+        (JSC::Int16Array::Int16Array):
+        (JSC::Int16Array::subarray):
+        * runtime/Int32Array.h: Renamed from Source/WTF/wtf/Int32Array.h.
+        (JSC::Int32Array::getType):
+        (JSC::Int32Array::create):
+        (JSC::Int32Array::createUninitialized):
+        (JSC::Int32Array::Int32Array):
+        (JSC::Int32Array::subarray):
+        * runtime/Int8Array.h: Renamed from Source/WTF/wtf/Int8Array.h.
+        (JSC::Int8Array::getType):
+        (JSC::Int8Array::create):
+        (JSC::Int8Array::createUninitialized):
+        (JSC::Int8Array::Int8Array):
+        (JSC::Int8Array::subarray):
+        * runtime/IntegralTypedArrayBase.h: Renamed from Source/WTF/wtf/IntegralTypedArrayBase.h.
+        (JSC::IntegralTypedArrayBase::set):
+        (JSC::IntegralTypedArrayBase::IntegralTypedArrayBase):
+        * runtime/TypedArrayBase.h: Renamed from Source/WTF/wtf/TypedArrayBase.h.
+        (JSC::TypedArrayBase::data):
+        (JSC::TypedArrayBase::set):
+        (JSC::TypedArrayBase::setRange):
+        (JSC::TypedArrayBase::zeroRange):
+        (JSC::TypedArrayBase::length):
+        (JSC::TypedArrayBase::byteLength):
+        (JSC::TypedArrayBase::item):
+        (JSC::TypedArrayBase::checkInboundData):
+        (JSC::TypedArrayBase::TypedArrayBase):
+        (JSC::TypedArrayBase::create):
+        (JSC::TypedArrayBase::createUninitialized):
+        (JSC::TypedArrayBase::subarrayImpl):
+        (JSC::TypedArrayBase::neuter):
+        * runtime/Uint16Array.h: Renamed from Source/WTF/wtf/Uint16Array.h.
+        (JSC::Uint16Array::getType):
+        (JSC::Uint16Array::create):
+        (JSC::Uint16Array::createUninitialized):
+        (JSC::Uint16Array::Uint16Array):
+        (JSC::Uint16Array::subarray):
+        * runtime/Uint32Array.h: Renamed from Source/WTF/wtf/Uint32Array.h.
+        (JSC::Uint32Array::getType):
+        (JSC::Uint32Array::create):
+        (JSC::Uint32Array::createUninitialized):
+        (JSC::Uint32Array::Uint32Array):
+        (JSC::Uint32Array::subarray):
+        * runtime/Uint8Array.h: Renamed from Source/WTF/wtf/Uint8Array.h.
+        (JSC::Uint8Array::getType):
+        (JSC::Uint8Array::create):
+        (JSC::Uint8Array::createUninitialized):
+        (JSC::Uint8Array::Uint8Array):
+        (JSC::Uint8Array::subarray):
+        * runtime/Uint8ClampedArray.h: Renamed from Source/WTF/wtf/Uint8ClampedArray.h.
+        (JSC::Uint8ClampedArray::getType):
+        (JSC::Uint8ClampedArray::create):
+        (JSC::Uint8ClampedArray::createUninitialized):
+        (JSC::Uint8ClampedArray::zeroFill):
+        (JSC::Uint8ClampedArray::set):
+        (JSC::Uint8ClampedArray::Uint8ClampedArray):
+        (JSC::Uint8ClampedArray::subarray):
+        * runtime/VM.h:
+
 2013-08-03  Filip Pizlo  <fpizlo@apple.com>
 
         Copied space should be able to handle more than one copied backing store per JSCell

diff --git a/Source/JavaScriptCore/GNUmakefile.list.am b/Source/JavaScriptCore/GNUmakefile.list.am
index 81137aaef9004f848122bdd0b0306137d84dac4a..d0bb7d64bea4690ed26ae6b9768d3aecfaf80014 100644 (file)
--- a/Source/JavaScriptCore/GNUmakefile.list.am
+++ b/Source/JavaScriptCore/GNUmakefile.list.am
@@ -32,7 +32,7 @@ javascriptcore_built_nosources += \
        DerivedSources/JavaScriptCore/LLIntAssembly.h
 
 javascriptcore_sources += \
-    Source/JavaScriptCore/API/APICallbackFunction.h \
+       Source/JavaScriptCore/API/APICallbackFunction.h \
        Source/JavaScriptCore/API/APICast.h \
        Source/JavaScriptCore/API/APIShims.h \
        Source/JavaScriptCore/API/JSAPIWrapperObject.h \
@@ -644,6 +644,10 @@ javascriptcore_sources += \
        Source/JavaScriptCore/runtime/ArgList.h \
        Source/JavaScriptCore/runtime/Arguments.cpp \
        Source/JavaScriptCore/runtime/Arguments.h \
+       Source/JavaScriptCore/runtime/ArrayBuffer.cpp \
+       Source/JavaScriptCore/runtime/ArrayBuffer.h \
+       Source/JavaScriptCore/runtime/ArrayBufferView.cpp \
+       Source/JavaScriptCore/runtime/ArrayBufferView.h \
        Source/JavaScriptCore/runtime/ArrayConstructor.cpp \
        Source/JavaScriptCore/runtime/ArrayConstructor.h \
        Source/JavaScriptCore/runtime/ArrayConventions.h \
@@ -705,6 +709,8 @@ javascriptcore_sources += \
        Source/JavaScriptCore/runtime/Executable.cpp \
        Source/JavaScriptCore/runtime/Executable.h \
        Source/JavaScriptCore/runtime/ExecutionHarness.h \
+       Source/JavaScriptCore/runtime/Float32Array.h \
+       Source/JavaScriptCore/runtime/Float64Array.h \
        Source/JavaScriptCore/runtime/FunctionConstructor.cpp \
        Source/JavaScriptCore/runtime/FunctionConstructor.h \
        Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp \
@@ -723,6 +729,10 @@ javascriptcore_sources += \
        Source/JavaScriptCore/runtime/IndexingType.h \
        Source/JavaScriptCore/runtime/InitializeThreading.cpp \
        Source/JavaScriptCore/runtime/InitializeThreading.h \
+       Source/JavaScriptCore/runtime/Int16Array.h \
+       Source/JavaScriptCore/runtime/Int32Array.h \
+       Source/JavaScriptCore/runtime/Int8Array.h \
+       Source/JavaScriptCore/runtime/IntegralTypedArrayBase.h \
        Source/JavaScriptCore/runtime/IntendedStructureChain.cpp \
        Source/JavaScriptCore/runtime/IntendedStructureChain.h \
        Source/JavaScriptCore/runtime/InternalFunction.cpp \
@@ -882,8 +892,13 @@ javascriptcore_sources += \
        Source/JavaScriptCore/runtime/SymbolTable.cpp \
        Source/JavaScriptCore/runtime/SymbolTable.h \
        Source/JavaScriptCore/runtime/Tracing.h \
+       Source/JavaScriptCore/runtime/TypedArrayBase.h \
        Source/JavaScriptCore/runtime/TypedArrayDescriptor.h \
+       Source/JavaScriptCore/runtime/Uint16Array.h \
        Source/JavaScriptCore/runtime/Uint16WithFraction.h \
+       Source/JavaScriptCore/runtime/Uint32Array.h \
+       Source/JavaScriptCore/runtime/Uint8Array.h \
+       Source/JavaScriptCore/runtime/Uint8ClampedArray.h \
        Source/JavaScriptCore/runtime/VMStackBounds.h \
        Source/JavaScriptCore/runtime/Watchdog.cpp \
        Source/JavaScriptCore/runtime/Watchdog.h \

diff --git a/Source/JavaScriptCore/JSCTypedArrayStubs.h b/Source/JavaScriptCore/JSCTypedArrayStubs.h
index d7ac1ef72ecac6a2e6dc7283a781e5abe55bf721..393e121b2bff7008d87b2309c7de93e71b8f65db 100644 (file)
--- a/Source/JavaScriptCore/JSCTypedArrayStubs.h
+++ b/Source/JavaScriptCore/JSCTypedArrayStubs.h
@@ -26,19 +26,20 @@
 #ifndef JSCTypedArrayStubs_h
 #define JSCTypedArrayStubs_h
 
+#include "Float32Array.h"
+#include "Float64Array.h"
+#include "Int16Array.h"
+#include "Int32Array.h"
+#include "Int8Array.h"
 #include "JSDestructibleObject.h"
 #include "ObjectPrototype.h"
 #include "Operations.h"
-#include <wtf/Float32Array.h>
-#include <wtf/Float64Array.h>
+#include "Uint16Array.h"
+#include "Uint32Array.h"
+#include "Uint8Array.h"
+#include "Uint8ClampedArray.h"
+
 #include <wtf/Forward.h>
-#include <wtf/Int16Array.h>
-#include <wtf/Int32Array.h>
-#include <wtf/Int8Array.h>
-#include <wtf/Uint16Array.h>
-#include <wtf/Uint32Array.h>
-#include <wtf/Uint8Array.h>
-#include <wtf/Uint8ClampedArray.h>
 
 namespace JSC {
     

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
index e8ec8ead366768f619dc4bdacfa329c727061453..5af8133dbf07b83d0643e42cc5b55276b7f16295 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
@@ -410,6 +410,8 @@
     <ClCompile Include="..\profiler\ProfilerOSRExit.cpp" />\r
     <ClCompile Include="..\profiler\ProfilerOSRExitSite.cpp" />\r
     <ClCompile Include="..\profiler\ProfilerProfiledBytecodes.cpp" />\r
+    <ClCompile Include="..\runtime\ArrayBuffer.cpp" />\r
+    <ClCompile Include="..\runtime\ArrayBufferView.cpp" />\r
     <ClCompile Include="..\runtime\ArgList.cpp" />\r
     <ClCompile Include="..\runtime\Arguments.cpp" />\r
     <ClCompile Include="..\runtime\ArrayConstructor.cpp" />\r
@@ -771,6 +773,8 @@
     <ClInclude Include="..\profiler\ProfilerOSRExit.h" />\r
     <ClInclude Include="..\profiler\ProfilerOSRExitSite.h" />\r
     <ClInclude Include="..\profiler\ProfilerProfiledBytecodes.h" />\r
+    <ClInclude Include="..\runtime\ArrayBuffer.h" />\r
+    <ClInclude Include="..\runtime\ArrayBufferView.h" />\r
     <ClInclude Include="..\runtime\ArgList.h" />\r
     <ClInclude Include="..\runtime\Arguments.h" />\r
     <ClInclude Include="..\runtime\ArrayConstructor.h" />\r
@@ -806,6 +810,8 @@
     <ClInclude Include="..\runtime\ExceptionHelpers.h" />\r
     <ClInclude Include="..\runtime\Executable.h" />\r
     <ClInclude Include="..\runtime\ExecutionHarness.h" />\r
+    <ClInclude Include="..\runtime\Float32Array.h" />\r
+    <ClInclude Include="..\runtime\Float64Array.h" />\r
     <ClInclude Include="..\runtime\FunctionConstructor.h" />\r
     <ClInclude Include="..\runtime\FunctionPrototype.h" />\r
     <ClInclude Include="..\runtime\GCActivityCallback.h" />\r
@@ -815,6 +821,9 @@
     <ClInclude Include="..\runtime\IndexingHeaderInlines.h" />\r
     <ClInclude Include="..\runtime\IndexingType.h" />\r
     <ClInclude Include="..\runtime\InitializeThreading.h" />\r
+    <ClInclude Include="..\runtime\Int16Array.h" />\r
+    <ClInclude Include="..\runtime\Int32Array.h" />\r
+    <ClInclude Include="..\runtime\Int8Array.h" />\r
     <ClInclude Include="..\runtime\IntendedStructureChain.h" />\r
     <ClInclude Include="..\runtime\InternalFunction.h" />\r
     <ClInclude Include="..\runtime\Intrinsic.h" />\r
@@ -903,7 +912,10 @@
     <ClInclude Include="..\runtime\SymbolTable.h" />\r
     <ClInclude Include="..\runtime\Tracing.h" />\r
     <ClInclude Include="..\runtime\TypedArrayDescriptor.h" />\r
+    <ClInclude Include="..\runtime\Uint16Array.h" />\r
     <ClInclude Include="..\runtime\Uint16WithFraction.h" />\r
+    <ClInclude Include="..\runtime\Uint32Array.h" />\r
+    <ClInclude Include="..\runtime\Uint8Array.h" />\r
     <ClInclude Include="..\runtime\VM.h" />\r
     <ClInclude Include="..\runtime\Watchdog.h" />\r
     <ClInclude Include="..\runtime\WeakGCMap.h" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
index f86d2e74bc1ca8c8b10d54d33bccc8b5b2fba24b..a7cbfb20d9bcc6c7d1661296b4279e4d903200fc 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
@@ -444,6 +444,12 @@
     <ClCompile Include="..\profiler\ProfilerProfiledBytecodes.cpp">\r
       <Filter>profiler</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\runtime\ArrayBuffer.cpp">\r
+      <Filter>runtime</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\runtime\ArrayBufferView.cpp">\r
+      <Filter>runtime</Filter>\r
+    </ClCompile>\r
     <ClCompile Include="..\runtime\ArgList.cpp">\r
       <Filter>runtime</Filter>\r
     </ClCompile>\r
@@ -1460,6 +1466,36 @@
     <ClInclude Include="..\profiler\ProfilerProfiledBytecodes.h">\r
       <Filter>profiler</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\runtime\ArrayBuffer.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\runtime\ArrayBufferView.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\runtime\Float32Array.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\runtime\Float64Array.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\runtime\Int16Array.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\runtime\Int32Array.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\runtime\Int8Array.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\runtime\Uint16Array.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\runtime\Uint32Array.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\runtime\Uint8Array.h">\r
+      <Filter>wtf</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="..\runtime\ArgList.h">\r
       <Filter>runtime</Filter>\r
     </ClInclude>\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index e01ba079d8039585a76bddf81828c77101856006..a7549842bc3c5bb2b6c5777653412a604dc27314 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -815,6 +815,21 @@
                A7A4AE0D17973B4D005612B1 /* JITStubsMIPS.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A4AE0917973B4D005612B1 /* JITStubsMIPS.h */; };
                A7A4AE0F17973B4D005612B1 /* JITStubsSH4.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A4AE0B17973B4D005612B1 /* JITStubsSH4.h */; };
                A7A4AE1017973B4D005612B1 /* JITStubsX86Common.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A4AE0C17973B4D005612B1 /* JITStubsX86Common.h */; };
+               A7A8AF3417ADB5F3005AB174 /* ArrayBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7A8AF2517ADB5F2005AB174 /* ArrayBuffer.cpp */; };
+               A7A8AF3517ADB5F3005AB174 /* ArrayBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF2617ADB5F3005AB174 /* ArrayBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF3617ADB5F3005AB174 /* ArrayBufferView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7A8AF2717ADB5F3005AB174 /* ArrayBufferView.cpp */; };
+               A7A8AF3717ADB5F3005AB174 /* ArrayBufferView.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF2817ADB5F3005AB174 /* ArrayBufferView.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF3817ADB5F3005AB174 /* Float32Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF2917ADB5F3005AB174 /* Float32Array.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF3917ADB5F3005AB174 /* Float64Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF2A17ADB5F3005AB174 /* Float64Array.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF3A17ADB5F3005AB174 /* Int8Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF2B17ADB5F3005AB174 /* Int8Array.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF3B17ADB5F3005AB174 /* Int16Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF2C17ADB5F3005AB174 /* Int16Array.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF3C17ADB5F3005AB174 /* Int32Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF2D17ADB5F3005AB174 /* Int32Array.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF3D17ADB5F3005AB174 /* IntegralTypedArrayBase.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF2E17ADB5F3005AB174 /* IntegralTypedArrayBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF3E17ADB5F3005AB174 /* TypedArrayBase.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF2F17ADB5F3005AB174 /* TypedArrayBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF3F17ADB5F3005AB174 /* Uint8Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF3017ADB5F3005AB174 /* Uint8Array.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF4017ADB5F3005AB174 /* Uint8ClampedArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF3117ADB5F3005AB174 /* Uint8ClampedArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF4117ADB5F3005AB174 /* Uint16Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF3217ADB5F3005AB174 /* Uint16Array.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A7A8AF4217ADB5F3005AB174 /* Uint32Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8AF3317ADB5F3005AB174 /* Uint32Array.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A7B48F490EE8936F00DCBDB6 /* ExecutableAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */; };
                A7B4ACAF1484C9CE00B38A36 /* JSExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A7B601821639FD2A00372BA3 /* UnlinkedCodeBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = A79E781F15EECBA80047C855 /* UnlinkedCodeBlock.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1903,6 +1918,21 @@
                A7A4AE0C17973B4D005612B1 /* JITStubsX86Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubsX86Common.h; sourceTree = "<group>"; };
                A7A7EE7411B98B8D0065A14F /* ASTBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASTBuilder.h; sourceTree = "<group>"; };
                A7A7EE7711B98B8D0065A14F /* SyntaxChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyntaxChecker.h; sourceTree = "<group>"; };
+               A7A8AF2517ADB5F2005AB174 /* ArrayBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayBuffer.cpp; sourceTree = "<group>"; };
+               A7A8AF2617ADB5F3005AB174 /* ArrayBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayBuffer.h; sourceTree = "<group>"; };
+               A7A8AF2717ADB5F3005AB174 /* ArrayBufferView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayBufferView.cpp; sourceTree = "<group>"; };
+               A7A8AF2817ADB5F3005AB174 /* ArrayBufferView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayBufferView.h; sourceTree = "<group>"; };
+               A7A8AF2917ADB5F3005AB174 /* Float32Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Float32Array.h; sourceTree = "<group>"; };
+               A7A8AF2A17ADB5F3005AB174 /* Float64Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Float64Array.h; sourceTree = "<group>"; };
+               A7A8AF2B17ADB5F3005AB174 /* Int8Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Int8Array.h; sourceTree = "<group>"; };
+               A7A8AF2C17ADB5F3005AB174 /* Int16Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Int16Array.h; sourceTree = "<group>"; };
+               A7A8AF2D17ADB5F3005AB174 /* Int32Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Int32Array.h; sourceTree = "<group>"; };
+               A7A8AF2E17ADB5F3005AB174 /* IntegralTypedArrayBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntegralTypedArrayBase.h; sourceTree = "<group>"; };
+               A7A8AF2F17ADB5F3005AB174 /* TypedArrayBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypedArrayBase.h; sourceTree = "<group>"; };
+               A7A8AF3017ADB5F3005AB174 /* Uint8Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint8Array.h; sourceTree = "<group>"; };
+               A7A8AF3117ADB5F3005AB174 /* Uint8ClampedArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint8ClampedArray.h; sourceTree = "<group>"; };
+               A7A8AF3217ADB5F3005AB174 /* Uint16Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint16Array.h; sourceTree = "<group>"; };
+               A7A8AF3317ADB5F3005AB174 /* Uint32Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint32Array.h; sourceTree = "<group>"; };
                A7B48DB50EE74CFC00DCBDB6 /* ExecutableAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExecutableAllocator.h; sourceTree = "<group>"; };
                A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExecutableAllocator.cpp; sourceTree = "<group>"; };
                A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSExportMacros.h; sourceTree = "<group>"; };
@@ -2209,9 +2239,9 @@
                034768DFFF38A50411DB9C8B /* Products */ = {
                        isa = PBXGroup;
                        children = (
+                               0FF922CF14F46B130041A24E /* JSCLLIntOffsetsExtractor */,
                                932F5BD90822A1C700736975 /* JavaScriptCore.framework */,
                                932F5BE10822A1C700736975 /* jsc */,
-                               0FF922CF14F46B130041A24E /* JSCLLIntOffsetsExtractor */,
                                141211200A48793C00480255 /* minidom */,
                                14BD59BF0A3E8F9000BAF59C /* testapi */,
                                6511230514046A4C002B101D /* testRegExp */,
@@ -2798,12 +2828,14 @@
                7EF6E0BB0EB7A1EC0079AFAF /* runtime */ = {
                        isa = PBXGroup;
                        children = (
-                               6553A32F17A1F1EE008CF6F3 /* CommonSlowPathsExceptions.cpp */,
-                               6553A33017A1F1EE008CF6F3 /* CommonSlowPathsExceptions.h */,
                                BCF605110E203EF800B9A64D /* ArgList.cpp */,
                                BCF605120E203EF800B9A64D /* ArgList.h */,
                                BC257DE50E1F51C50016B6C9 /* Arguments.cpp */,
                                BC257DE60E1F51C50016B6C9 /* Arguments.h */,
+                               A7A8AF2517ADB5F2005AB174 /* ArrayBuffer.cpp */,
+                               A7A8AF2617ADB5F3005AB174 /* ArrayBuffer.h */,
+                               A7A8AF2717ADB5F3005AB174 /* ArrayBufferView.cpp */,
+                               A7A8AF2817ADB5F3005AB174 /* ArrayBufferView.h */,
                                BC7952060E15E8A800A898AB /* ArrayConstructor.cpp */,
                                BC7952070E15E8A800A898AB /* ArrayConstructor.h */,
                                0FB7F38915ED8E3800F167B2 /* ArrayConventions.h */,
@@ -2832,6 +2864,8 @@
                                65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */,
                                A709F2F117A0AC2A00512E98 /* CommonSlowPaths.cpp */,
                                0F15F15D14B7A73A005DE37D /* CommonSlowPaths.h */,
+                               6553A32F17A1F1EE008CF6F3 /* CommonSlowPathsExceptions.cpp */,
+                               6553A33017A1F1EE008CF6F3 /* CommonSlowPathsExceptions.h */,
                                A7E5A3A51797432D00E893C0 /* CompilationResult.cpp */,
                                A7E5A3A61797432D00E893C0 /* CompilationResult.h */,
                                969A09220ED1E09C00F1F681 /* Completion.cpp */,
@@ -2863,6 +2897,8 @@
                                86CA032D1038E8440028A609 /* Executable.cpp */,
                                86CAFEE21035DDE60028A609 /* Executable.h */,
                                0F21C27A14BE727300ADC64B /* ExecutionHarness.h */,
+                               A7A8AF2917ADB5F3005AB174 /* Float32Array.h */,
+                               A7A8AF2A17ADB5F3005AB174 /* Float64Array.h */,
                                BC2680C00E16D4E900A06E92 /* FunctionConstructor.cpp */,
                                BC2680C10E16D4E900A06E92 /* FunctionConstructor.h */,
                                0FB4B52116B6278D003F696B /* FunctionExecutableDump.cpp */,
@@ -2881,6 +2917,10 @@
                                0FB7F38F15ED8E3800F167B2 /* IndexingType.h */,
                                E178636C0D9BEEC300D74E75 /* InitializeThreading.cpp */,
                                E178633F0D9BEC0000D74E75 /* InitializeThreading.h */,
+                               A7A8AF2C17ADB5F3005AB174 /* Int16Array.h */,
+                               A7A8AF2D17ADB5F3005AB174 /* Int32Array.h */,
+                               A7A8AF2B17ADB5F3005AB174 /* Int8Array.h */,
+                               A7A8AF2E17ADB5F3005AB174 /* IntegralTypedArrayBase.h */,
                                A78853F717972629001440E4 /* IntendedStructureChain.cpp */,
                                A78853F817972629001440E4 /* IntendedStructureChain.h */,
                                BC9BB95B0E19680600DF8855 /* InternalFunction.cpp */,
@@ -3038,8 +3078,13 @@
                                14A396A60CD2933100B5B4FF /* SymbolTable.h */,
                                5D53726D0E1C546B0021E549 /* Tracing.d */,
                                5D53726E0E1C54880021E549 /* Tracing.h */,
+                               A7A8AF2F17ADB5F3005AB174 /* TypedArrayBase.h */,
                                0FEB3ECB16237F4700AB67AD /* TypedArrayDescriptor.h */,
+                               A7A8AF3217ADB5F3005AB174 /* Uint16Array.h */,
                                866739D113BFDE710023D87C /* Uint16WithFraction.h */,
+                               A7A8AF3317ADB5F3005AB174 /* Uint32Array.h */,
+                               A7A8AF3017ADB5F3005AB174 /* Uint8Array.h */,
+                               A7A8AF3117ADB5F3005AB174 /* Uint8ClampedArray.h */,
                                E18E3A570DF9278C00D90B34 /* VM.cpp */,
                                E18E3A560DF9278C00D90B34 /* VM.h */,
                                FE6617271774E03500495B00 /* VMStackBounds.h */,
@@ -3484,6 +3529,8 @@
                                86ADD1450FDDEA980006EEC2 /* ARMv7Assembler.h in Headers */,
                                65C0285D1717966800351E35 /* ARMv7DOpcode.h in Headers */,
                                0F8335B81639C1EA001443B5 /* ArrayAllocationProfile.h in Headers */,
+                               A7A8AF3517ADB5F3005AB174 /* ArrayBuffer.h in Headers */,
+                               A7A8AF3717ADB5F3005AB174 /* ArrayBufferView.h in Headers */,
                                BC18C3E60E16F5CD00B34460 /* ArrayConstructor.h in Headers */,
                                0FB7F39515ED8E4600F167B2 /* ArrayConventions.h in Headers */,
                                0F63945515D07057006A597C /* ArrayProfile.h in Headers */,
@@ -3522,6 +3569,7 @@
                                0F0B83A714BCF50700885B4F /* CodeType.h in Headers */,
                                BC18C3F30E16F5CD00B34460 /* CommonIdentifiers.h in Headers */,
                                0F15F15F14B7A73E005DE37D /* CommonSlowPaths.h in Headers */,
+                               6553A33217A1F1EE008CF6F3 /* CommonSlowPathsExceptions.h in Headers */,
                                0FD82E39141AB14D00179C94 /* CompactJITCodeMap.h in Headers */,
                                A7E5A3A81797432D00E893C0 /* CompilationResult.h in Headers */,
                                BC18C3F40E16F5CD00B34460 /* Completion.h in Headers */,
@@ -3678,6 +3726,8 @@
                                0F21C27C14BE727600ADC64B /* ExecutionHarness.h in Headers */,
                                0FB105861675481200F8AB6E /* ExitKind.h in Headers */,
                                0F0B83AB14BCF5BB00885B4F /* ExpressionRangeInfo.h in Headers */,
+                               A7A8AF3817ADB5F3005AB174 /* Float32Array.h in Headers */,
+                               A7A8AF3917ADB5F3005AB174 /* Float64Array.h in Headers */,
                                0FDB2CC9173DA520007B3C1B /* FTLAbbreviatedTypes.h in Headers */,
                                0FEA0A08170513DB00BB722C /* FTLAbbreviations.h in Headers */,
                                0FEA0A1D1708B00700BB722C /* FTLAbstractHeap.h in Headers */,
@@ -3741,6 +3791,10 @@
                                0FB7F39B15ED8E4600F167B2 /* IndexingType.h in Headers */,
                                BC18C4100E16F5CD00B34460 /* InitializeThreading.h in Headers */,
                                969A07990ED1D3AE00F1F681 /* Instruction.h in Headers */,
+                               A7A8AF3B17ADB5F3005AB174 /* Int16Array.h in Headers */,
+                               A7A8AF3C17ADB5F3005AB174 /* Int32Array.h in Headers */,
+                               A7A8AF3A17ADB5F3005AB174 /* Int8Array.h in Headers */,
+                               A7A8AF3D17ADB5F3005AB174 /* IntegralTypedArrayBase.h in Headers */,
                                A78853FA17972629001440E4 /* IntendedStructureChain.h in Headers */,
                                BC11667B0E199C05008066DD /* InternalFunction.h in Headers */,
                                1429D77C0ED20D7300B89619 /* Interpreter.h in Headers */,
@@ -3975,7 +4029,6 @@
                                E49DC16D12EF295300184A1F /* SourceProviderCacheItem.h in Headers */,
                                0FB7F39E15ED8E4600F167B2 /* SparseArrayValueMap.h in Headers */,
                                A7386554118697B400540279 /* SpecializedThunkJIT.h in Headers */,
-                               6553A33217A1F1EE008CF6F3 /* CommonSlowPathsExceptions.h in Headers */,
                                0F5541B21613C1FB00CE3E25 /* SpecialPointer.h in Headers */,
                                0FD82E54141DAEEE00179C94 /* SpeculatedType.h in Headers */,
                                A7C1EAF217987AB600299DB2 /* StackIterator.h in Headers */,
@@ -4005,6 +4058,7 @@
                                A7386556118697B400540279 /* ThunkGenerators.h in Headers */,
                                141448CD13A1783700F5BA1A /* TinyBloomFilter.h in Headers */,
                                5D53726F0E1C54880021E549 /* Tracing.h in Headers */,
+                               A7A8AF3E17ADB5F3005AB174 /* TypedArrayBase.h in Headers */,
                                0FEB3ECD16237F4D00AB67AD /* TypedArrayDescriptor.h in Headers */,
                                0FF4274B158EBE91004CB9FF /* udis86.h in Headers */,
                                0FF42741158EBE8D004CB9FF /* udis86_decode.h in Headers */,
@@ -4013,7 +4067,11 @@
                                0FF42748158EBE91004CB9FF /* udis86_syn.h in Headers */,
                                0FF42749158EBE91004CB9FF /* udis86_types.h in Headers */,
                                A7E5AB391799E4B200D2833D /* UDis86Disassembler.h in Headers */,
+                               A7A8AF4117ADB5F3005AB174 /* Uint16Array.h in Headers */,
                                866739D313BFDE710023D87C /* Uint16WithFraction.h in Headers */,
+                               A7A8AF4217ADB5F3005AB174 /* Uint32Array.h in Headers */,
+                               A7A8AF3F17ADB5F3005AB174 /* Uint8Array.h in Headers */,
+                               A7A8AF4017ADB5F3005AB174 /* Uint8ClampedArray.h in Headers */,
                                0F5F08CF146C7633000472A9 /* UnconditionalFinalizer.h in Headers */,
                                A7B601821639FD2A00372BA3 /* UnlinkedCodeBlock.h in Headers */,
                                0F2E892C16D028AD009E4FD2 /* UnusedPointer.h in Headers */,
@@ -4393,6 +4451,8 @@
                                65C02850171795E200351E35 /* ARMv7Disassembler.cpp in Sources */,
                                65C0285C1717966800351E35 /* ARMv7DOpcode.cpp in Sources */,
                                0F8335B71639C1E6001443B5 /* ArrayAllocationProfile.cpp in Sources */,
+                               A7A8AF3417ADB5F3005AB174 /* ArrayBuffer.cpp in Sources */,
+                               A7A8AF3617ADB5F3005AB174 /* ArrayBufferView.cpp in Sources */,
                                147F39BF107EC37600427A48 /* ArrayConstructor.cpp in Sources */,
                                0F63945415D07055006A597C /* ArrayProfile.cpp in Sources */,
                                147F39C0107EC37600427A48 /* ArrayPrototype.cpp in Sources */,
@@ -4416,6 +4476,7 @@
                                0F8F94421667633500D61971 /* CodeType.cpp in Sources */,
                                147F39C1107EC37600427A48 /* CommonIdentifiers.cpp in Sources */,
                                A709F2F217A0AC2A00512E98 /* CommonSlowPaths.cpp in Sources */,
+                               6553A33117A1F1EE008CF6F3 /* CommonSlowPathsExceptions.cpp in Sources */,
                                A7E5A3A71797432D00E893C0 /* CompilationResult.cpp in Sources */,
                                147F39C2107EC37600427A48 /* Completion.cpp in Sources */,
                                146B16D812EB5B59001BEC1B /* ConservativeRoots.cpp in Sources */,
@@ -4688,7 +4749,6 @@
                                0FF729AF166AD35C000F5BA3 /* ProfilerCompilation.cpp in Sources */,
                                0FF729B0166AD35C000F5BA3 /* ProfilerCompilationKind.cpp in Sources */,
                                0FF729B1166AD35C000F5BA3 /* ProfilerCompiledBytecode.cpp in Sources */,
-                               6553A33117A1F1EE008CF6F3 /* CommonSlowPathsExceptions.cpp in Sources */,
                                0FF729B2166AD35C000F5BA3 /* ProfilerDatabase.cpp in Sources */,
                                0FF729B3166AD35C000F5BA3 /* ProfilerOrigin.cpp in Sources */,
                                0FF729B4166AD35C000F5BA3 /* ProfilerOriginStack.cpp in Sources */,

diff --git a/Source/JavaScriptCore/Target.pri b/Source/JavaScriptCore/Target.pri
index 361b2be7a17e034e88bb73ca2448f574de8aedce..69e644fdf7fa374de0ab672e8c09ad3bc6af3388 100644 (file)
--- a/Source/JavaScriptCore/Target.pri
+++ b/Source/JavaScriptCore/Target.pri
@@ -259,6 +259,8 @@ SOURCES += \
     profiler/ProfileGenerator.cpp \
     profiler/ProfileNode.cpp \
     profiler/LegacyProfiler.cpp \
+    runtime/ArrayBuffer.cpp \
+    runtime/ArrayBufferView.cpp \
     runtime/ArgList.cpp \
     runtime/Arguments.cpp \
     runtime/ArrayConstructor.cpp \

diff --git a/Source/WTF/wtf/ArrayBuffer.cpp b/Source/JavaScriptCore/runtime/ArrayBuffer.cpp
similarity index 99%
rename from Source/WTF/wtf/ArrayBuffer.cpp
rename to Source/JavaScriptCore/runtime/ArrayBuffer.cpp
index 45b57fe9c6fbca066488687dca7006c282331285..6beb6be66578f8a444e22fa4c6e13a10d420dbc1 100644 (file)
--- a/Source/WTF/wtf/ArrayBuffer.cpp
+++ b/Source/JavaScriptCore/runtime/ArrayBuffer.cpp
@@ -31,7 +31,7 @@
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
-namespace WTF {
+namespace JSC {
 
 bool ArrayBuffer::transfer(ArrayBufferContents& result, Vector<RefPtr<ArrayBufferView> >& neuteredViews)
 {

diff --git a/Source/WTF/wtf/ArrayBuffer.h b/Source/JavaScriptCore/runtime/ArrayBuffer.h
similarity index 98%
rename from Source/WTF/wtf/ArrayBuffer.h
rename to Source/JavaScriptCore/runtime/ArrayBuffer.h
index 3e0a1b3c3e3d63517c672aadab7a777164408880..b7c734c673481097c8176dd64a8da0bdb34c6ecb 100644 (file)
--- a/Source/WTF/wtf/ArrayBuffer.h
+++ b/Source/JavaScriptCore/runtime/ArrayBuffer.h
@@ -31,7 +31,7 @@
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
 
-namespace WTF {
+namespace JSC {
 
 class ArrayBuffer;
 class ArrayBufferView;
@@ -251,8 +251,9 @@ ArrayBufferContents::~ArrayBufferContents()
     WTF::fastFree(m_data);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::ArrayBuffer;
+using JSC::ArrayBuffer;
+using JSC::ArrayBufferContents;
 
 #endif // ArrayBuffer_h

diff --git a/Source/WTF/wtf/ArrayBufferView.cpp b/Source/JavaScriptCore/runtime/ArrayBufferView.cpp
similarity index 89%
rename from Source/WTF/wtf/ArrayBufferView.cpp
rename to Source/JavaScriptCore/runtime/ArrayBufferView.cpp
index 202b3a2e417fddf14bfd21208d085a6255d35e42..5d86af98ed02ec40f3f3c776749683c5c22b6fcb 100644 (file)
--- a/Source/WTF/wtf/ArrayBufferView.cpp
+++ b/Source/JavaScriptCore/runtime/ArrayBufferView.cpp
@@ -28,15 +28,14 @@
 
 #include "ArrayBuffer.h"
 
-namespace WTF {
+namespace JSC {
 
-ArrayBufferView::ArrayBufferView(PassRefPtr<ArrayBuffer> buffer,
-                       unsigned byteOffset)
-        : m_byteOffset(byteOffset)
-        , m_isNeuterable(true)
-        , m_buffer(buffer)
-        , m_prevView(0)
-        , m_nextView(0)
+ArrayBufferView::ArrayBufferView(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset)
+    : m_byteOffset(byteOffset)
+    , m_isNeuterable(true)
+    , m_buffer(buffer)
+    , m_prevView(0)
+    , m_nextView(0)
 {
     m_baseAddress = m_buffer ? (static_cast<char*>(m_buffer->data()) + m_byteOffset) : 0;
     if (m_buffer) 

diff --git a/Source/WTF/wtf/ArrayBufferView.h b/Source/JavaScriptCore/runtime/ArrayBufferView.h
similarity index 89%
rename from Source/WTF/wtf/ArrayBufferView.h
rename to Source/JavaScriptCore/runtime/ArrayBufferView.h
index 3b708fbdffab91d6f5640b1fd7def41e6309610e..2e1ac3a3147247b589c4e2c571be7c9b4a557974 100644 (file)
--- a/Source/WTF/wtf/ArrayBufferView.h
+++ b/Source/JavaScriptCore/runtime/ArrayBufferView.h
@@ -26,7 +26,7 @@
 #ifndef ArrayBufferView_h
 #define ArrayBufferView_h
 
-#include <wtf/ArrayBuffer.h>
+#include "ArrayBuffer.h"
 
 #include <algorithm>
 #include <limits.h>
@@ -34,10 +34,10 @@
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
-namespace WTF {
+namespace JSC {
 
 class ArrayBufferView : public RefCounted<ArrayBufferView> {
-  public:
+public:
     enum ViewType {
         TypeInt8,
         TypeUint8,
@@ -74,7 +74,7 @@ class ArrayBufferView : public RefCounted<ArrayBufferView> {
 
     WTF_EXPORT_PRIVATE virtual ~ArrayBufferView();
 
-  protected:
+protected:
     WTF_EXPORT_PRIVATE ArrayBufferView(PassRefPtr<ArrayBuffer>, unsigned byteOffset);
 
     inline bool setImpl(ArrayBufferView*, unsigned byteOffset);
@@ -83,15 +83,12 @@ class ArrayBufferView : public RefCounted<ArrayBufferView> {
 
     inline bool zeroRangeImpl(unsigned byteOffset, size_t rangeByteLength);
 
-    static inline void calculateOffsetAndLength(int start, int end, unsigned arraySize,
-                                         unsigned* offset, unsigned* length);
+    static inline void calculateOffsetAndLength(int start, int end, unsigned arraySize, unsigned* offset, unsigned* length);
 
     // Helper to verify that a given sub-range of an ArrayBuffer is
     // within range.
     template <typename T>
-    static bool verifySubRange(PassRefPtr<ArrayBuffer> buffer,
-                               unsigned byteOffset,
-                               unsigned numElements)
+    static bool verifySubRange(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned numElements)
     {
         if (!buffer)
             return false;
@@ -108,10 +105,7 @@ class ArrayBufferView : public RefCounted<ArrayBufferView> {
     // Input offset is in number of elements from this array's view;
     // output offset is in number of bytes from the underlying buffer's view.
     template <typename T>
-    static void clampOffsetAndNumElements(PassRefPtr<ArrayBuffer> buffer,
-                                          unsigned arrayByteOffset,
-                                          unsigned *offset,
-                                          unsigned *numElements)
+    static void clampOffsetAndNumElements(PassRefPtr<ArrayBuffer> buffer, unsigned arrayByteOffset, unsigned *offset, unsigned *numElements)
     {
         unsigned maxOffset = (UINT_MAX - arrayByteOffset) / sizeof(T);
         if (*offset > maxOffset) {
@@ -133,7 +127,7 @@ class ArrayBufferView : public RefCounted<ArrayBufferView> {
     unsigned m_byteOffset : 31;
     bool m_isNeuterable : 1;
 
-  private:
+private:
     friend class ArrayBuffer;
     RefPtr<ArrayBuffer> m_buffer;
     ArrayBufferView* m_prevView;
@@ -182,8 +176,7 @@ bool ArrayBufferView::zeroRangeImpl(unsigned byteOffset, size_t rangeByteLength)
     return true;
 }
 
-void ArrayBufferView::calculateOffsetAndLength(int start, int end, unsigned arraySize,
-                                               unsigned* offset, unsigned* length)
+void ArrayBufferView::calculateOffsetAndLength(int start, int end, unsigned arraySize, unsigned* offset, unsigned* length)
 {
     if (start < 0)
         start += arraySize;
@@ -201,8 +194,8 @@ void ArrayBufferView::calculateOffsetAndLength(int start, int end, unsigned arra
     *length = static_cast<unsigned>(end - start);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::ArrayBufferView;
+using JSC::ArrayBufferView;
 
 #endif // ArrayBufferView_h

diff --git a/Source/WTF/wtf/Float32Array.h b/Source/JavaScriptCore/runtime/Float32Array.h
similarity index 94%
rename from Source/WTF/wtf/Float32Array.h
rename to Source/JavaScriptCore/runtime/Float32Array.h
index 6672a0aff63261a5036aa257ee21a87596a84463..6c5257417ca2752e66288938fbf697e733b8ed4b 100644 (file)
--- a/Source/WTF/wtf/Float32Array.h
+++ b/Source/JavaScriptCore/runtime/Float32Array.h
@@ -27,10 +27,10 @@
 #ifndef Float32Array_h
 #define Float32Array_h
 
-#include <wtf/TypedArrayBase.h>
+#include "TypedArrayBase.h"
 #include <wtf/MathExtras.h>
 
-namespace WTF {
+namespace JSC {
 
 class Float32Array : public TypedArrayBase<float> {
 public:
@@ -60,9 +60,7 @@ public:
     }
 
 private:
-    inline Float32Array(PassRefPtr<ArrayBuffer>,
-                    unsigned byteOffset,
-                    unsigned length);
+    inline Float32Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
     // Make constructor visible to superclass.
     friend class TypedArrayBase<float>;
 };
@@ -102,8 +100,8 @@ PassRefPtr<Float32Array> Float32Array::subarray(int start, int end) const
     return subarrayImpl<Float32Array>(start, end);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::Float32Array;
+using JSC::Float32Array;
 
 #endif // Float32Array_h

diff --git a/Source/WTF/wtf/Float64Array.h b/Source/JavaScriptCore/runtime/Float64Array.h
similarity index 94%
rename from Source/WTF/wtf/Float64Array.h
rename to Source/JavaScriptCore/runtime/Float64Array.h
index 3a930ce008e9fd86b49cb3eb94f4834d26e278db..f77edbd3b8e59c52818374119f8a9d97c2271a4c 100644 (file)
--- a/Source/WTF/wtf/Float64Array.h
+++ b/Source/JavaScriptCore/runtime/Float64Array.h
@@ -27,10 +27,10 @@
 #ifndef Float64Array_h
 #define Float64Array_h
 
-#include <wtf/TypedArrayBase.h>
+#include "TypedArrayBase.h"
 #include <wtf/MathExtras.h>
 
-namespace WTF {
+namespace JSC {
 
 class Float64Array : public TypedArrayBase<double> {
 public:
@@ -60,9 +60,8 @@ public:
     }
 
 private:
-    inline Float64Array(PassRefPtr<ArrayBuffer>,
-                 unsigned byteOffset,
-                 unsigned length);
+    inline Float64Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
+    
     // Make constructor visible to superclass.
     friend class TypedArrayBase<double>;
 };
@@ -102,8 +101,8 @@ PassRefPtr<Float64Array> Float64Array::subarray(int start, int end) const
     return subarrayImpl<Float64Array>(start, end);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::Float64Array;
+using JSC::Float64Array;
 
 #endif // Float64Array_h

diff --git a/Source/WTF/wtf/Int16Array.h b/Source/JavaScriptCore/runtime/Int16Array.h
similarity index 74%
rename from Source/WTF/wtf/Int16Array.h
rename to Source/JavaScriptCore/runtime/Int16Array.h
index 7d5a579a7281ba8ffb3f981a2e084e2df5c5486a..c466ae4da7e232b567f9a24ef3f9bc8f1fba3001 100644 (file)
--- a/Source/WTF/wtf/Int16Array.h
+++ b/Source/JavaScriptCore/runtime/Int16Array.h
@@ -26,24 +26,24 @@
 #ifndef Int16Array_h
 #define Int16Array_h
 
-#include <wtf/IntegralTypedArrayBase.h>
+#include "IntegralTypedArrayBase.h"
 
-namespace WTF {
+namespace JSC {
 
 class ArrayBuffer;
 
-class Int16Array : public IntegralTypedArrayBase<short> {
+class Int16Array : public IntegralTypedArrayBase<int16_t> {
 public:
     static inline PassRefPtr<Int16Array> create(unsigned length);
-    static inline PassRefPtr<Int16Array> create(const short* array, unsigned length);
+    static inline PassRefPtr<Int16Array> create(const int16_t* array, unsigned length);
     static inline PassRefPtr<Int16Array> create(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
 
     // Should only be used when it is known the entire array will be filled. Do
     // not return these results directly to JavaScript without filling first.
     static inline PassRefPtr<Int16Array> createUninitialized(unsigned length);
 
-    using TypedArrayBase<short>::set;
-    using IntegralTypedArrayBase<short>::set;
+    using TypedArrayBase<int16_t>::set;
+    using IntegralTypedArrayBase<int16_t>::set;
 
     inline PassRefPtr<Int16Array> subarray(int start) const;
     inline PassRefPtr<Int16Array> subarray(int start, int end) const;
@@ -54,35 +54,34 @@ public:
     }
 
 private:
-    inline Int16Array(PassRefPtr<ArrayBuffer>,
-                    unsigned byteOffset,
-                    unsigned length);
+    inline Int16Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
+
     // Make constructor visible to superclass.
-    friend class TypedArrayBase<short>;
+    friend class TypedArrayBase<int16_t>;
 };
 
 PassRefPtr<Int16Array> Int16Array::create(unsigned length)
 {
-    return TypedArrayBase<short>::create<Int16Array>(length);
+    return TypedArrayBase<int16_t>::create<Int16Array>(length);
 }
 
-PassRefPtr<Int16Array> Int16Array::create(const short* array, unsigned length)
+PassRefPtr<Int16Array> Int16Array::create(const int16_t* array, unsigned length)
 {
-    return TypedArrayBase<short>::create<Int16Array>(array, length);
+    return TypedArrayBase<int16_t>::create<Int16Array>(array, length);
 }
 
 PassRefPtr<Int16Array> Int16Array::create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
 {
-    return TypedArrayBase<short>::create<Int16Array>(buffer, byteOffset, length);
+    return TypedArrayBase<int16_t>::create<Int16Array>(buffer, byteOffset, length);
 }
 
 PassRefPtr<Int16Array> Int16Array::createUninitialized(unsigned length)
 {
-    return TypedArrayBase<short>::createUninitialized<Int16Array>(length);
+    return TypedArrayBase<int16_t>::createUninitialized<Int16Array>(length);
 }
 
 Int16Array::Int16Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
-    : IntegralTypedArrayBase<short>(buffer, byteOffset, length)
+    : IntegralTypedArrayBase<int16_t>(buffer, byteOffset, length)
 {
 }
 
@@ -96,8 +95,8 @@ PassRefPtr<Int16Array> Int16Array::subarray(int start, int end) const
     return subarrayImpl<Int16Array>(start, end);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::Int16Array;
+using JSC::Int16Array;
 
 #endif // Int16Array_h

diff --git a/Source/WTF/wtf/Int32Array.h b/Source/JavaScriptCore/runtime/Int32Array.h
similarity index 93%
rename from Source/WTF/wtf/Int32Array.h
rename to Source/JavaScriptCore/runtime/Int32Array.h
index 45a997809a293efdfbed9870777648cedc481c01..2f659278826b3f26b31194d022a8e8c6a26c5751 100644 (file)
--- a/Source/WTF/wtf/Int32Array.h
+++ b/Source/JavaScriptCore/runtime/Int32Array.h
@@ -27,9 +27,9 @@
 #ifndef Int32Array_h
 #define Int32Array_h
 
-#include <wtf/IntegralTypedArrayBase.h>
+#include "IntegralTypedArrayBase.h"
 
-namespace WTF {
+namespace JSC {
 
 class Int32Array : public IntegralTypedArrayBase<int> {
 public:
@@ -53,9 +53,7 @@ public:
     }
 
 private:
-    inline Int32Array(PassRefPtr<ArrayBuffer>,
-                  unsigned byteOffset,
-                  unsigned length);
+    inline Int32Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
     // Make constructor visible to superclass.
     friend class TypedArrayBase<int>;
 };
@@ -95,8 +93,8 @@ PassRefPtr<Int32Array> Int32Array::subarray(int start, int end) const
     return subarrayImpl<Int32Array>(start, end);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::Int32Array;
+using JSC::Int32Array;
 
 #endif // Int32Array_h

diff --git a/Source/WTF/wtf/Int8Array.h b/Source/JavaScriptCore/runtime/Int8Array.h
similarity index 73%
rename from Source/WTF/wtf/Int8Array.h
rename to Source/JavaScriptCore/runtime/Int8Array.h
index b29d2d9aaba3225e64968cca0440401e0973363a..90f2286665946b3d398c992ae8580bc57cb4cec0 100644 (file)
--- a/Source/WTF/wtf/Int8Array.h
+++ b/Source/JavaScriptCore/runtime/Int8Array.h
@@ -27,24 +27,24 @@
 #ifndef Int8Array_h
 #define Int8Array_h
 
-#include <wtf/IntegralTypedArrayBase.h>
+#include "IntegralTypedArrayBase.h"
 
-namespace WTF {
+namespace JSC {
 
 class ArrayBuffer;
 
-class Int8Array : public IntegralTypedArrayBase<signed char> {
+class Int8Array : public IntegralTypedArrayBase<int8_t> {
 public:
     static inline PassRefPtr<Int8Array> create(unsigned length);
-    static inline PassRefPtr<Int8Array> create(const signed char* array, unsigned length);
+    static inline PassRefPtr<Int8Array> create(const int8_t* array, unsigned length);
     static inline PassRefPtr<Int8Array> create(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
 
     // Should only be used when it is known the entire array will be filled. Do
     // not return these results directly to JavaScript without filling first.
     static inline PassRefPtr<Int8Array> createUninitialized(unsigned length);
 
-    using TypedArrayBase<signed char>::set;
-    using IntegralTypedArrayBase<signed char>::set;
+    using TypedArrayBase<int8_t>::set;
+    using IntegralTypedArrayBase<int8_t>::set;
 
     inline PassRefPtr<Int8Array> subarray(int start) const;
     inline PassRefPtr<Int8Array> subarray(int start, int end) const;
@@ -55,35 +55,34 @@ public:
     }
 
 private:
-    inline Int8Array(PassRefPtr<ArrayBuffer>,
-                   unsigned byteOffset,
-                   unsigned length);
+    inline Int8Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
+
     // Make constructor visible to superclass.
-    friend class TypedArrayBase<signed char>;
+    friend class TypedArrayBase<int8_t>;
 };
 
 PassRefPtr<Int8Array> Int8Array::create(unsigned length)
 {
-    return TypedArrayBase<signed char>::create<Int8Array>(length);
+    return TypedArrayBase<int8_t>::create<Int8Array>(length);
 }
 
-PassRefPtr<Int8Array> Int8Array::create(const signed char* array, unsigned length)
+PassRefPtr<Int8Array> Int8Array::create(const int8_t* array, unsigned length)
 {
-    return TypedArrayBase<signed char>::create<Int8Array>(array, length);
+    return TypedArrayBase<int8_t>::create<Int8Array>(array, length);
 }
 
 PassRefPtr<Int8Array> Int8Array::create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
 {
-    return TypedArrayBase<signed char>::create<Int8Array>(buffer, byteOffset, length);
+    return TypedArrayBase<int8_t>::create<Int8Array>(buffer, byteOffset, length);
 }
 
 PassRefPtr<Int8Array> Int8Array::createUninitialized(unsigned length)
 {
-    return TypedArrayBase<signed char>::createUninitialized<Int8Array>(length);
+    return TypedArrayBase<int8_t>::createUninitialized<Int8Array>(length);
 }
 
 Int8Array::Int8Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
-    : IntegralTypedArrayBase<signed char>(buffer, byteOffset, length)
+    : IntegralTypedArrayBase<int8_t>(buffer, byteOffset, length)
 {
 }
 
@@ -97,8 +96,8 @@ PassRefPtr<Int8Array> Int8Array::subarray(int start, int end) const
     return subarrayImpl<Int8Array>(start, end);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::Int8Array;
+using JSC::Int8Array;
 
 #endif // Int8Array_h

diff --git a/Source/WTF/wtf/IntegralTypedArrayBase.h b/Source/JavaScriptCore/runtime/IntegralTypedArrayBase.h
similarity index 94%
rename from Source/WTF/wtf/IntegralTypedArrayBase.h
rename to Source/JavaScriptCore/runtime/IntegralTypedArrayBase.h
index 1faf14cab51333b06b235c276cafd2d914a68c02..99c989ec7f2307d878fa12eb5be0cd4969e1fb1e 100644 (file)
--- a/Source/WTF/wtf/IntegralTypedArrayBase.h
+++ b/Source/JavaScriptCore/runtime/IntegralTypedArrayBase.h
@@ -27,18 +27,18 @@
 #ifndef IntegralTypedArrayBase_h
 #define IntegralTypedArrayBase_h
 
-#include <wtf/TypedArrayBase.h>
+#include "TypedArrayBase.h"
 #include <limits>
 #include <wtf/MathExtras.h>
 
 // Base class for all WebGL<T>Array types holding integral
 // (non-floating-point) values.
 
-namespace WTF {
+namespace JSC {
 
 template <typename T>
 class IntegralTypedArrayBase : public TypedArrayBase<T> {
-  public:
+public:
     void set(unsigned index, double value)
     {
         if (index >= TypedArrayBase<T>::m_length)
@@ -50,15 +50,14 @@ class IntegralTypedArrayBase : public TypedArrayBase<T> {
         TypedArrayBase<T>::data()[index] = static_cast<T>(static_cast<int64_t>(value));
     }
 
-  protected:
+protected:
     IntegralTypedArrayBase(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
         : TypedArrayBase<T>(buffer, byteOffset, length)
     {
     }
-};
 
-} // namespace WTF
+};
 
-using WTF::IntegralTypedArrayBase;
+} // namespace JSC
 
 #endif // IntegralTypedArrayBase_h

diff --git a/Source/WTF/wtf/TypedArrayBase.h b/Source/JavaScriptCore/runtime/TypedArrayBase.h
similarity index 95%
rename from Source/WTF/wtf/TypedArrayBase.h
rename to Source/JavaScriptCore/runtime/TypedArrayBase.h
index ade824fa82c7bab9c7f2e512d7d3b6c5641452db..4fe7a6c1a5669578ee1d5a606ccdd8d640dc1187 100644 (file)
--- a/Source/WTF/wtf/TypedArrayBase.h
+++ b/Source/JavaScriptCore/runtime/TypedArrayBase.h
@@ -27,14 +27,14 @@
 #ifndef TypedArrayBase_h
 #define TypedArrayBase_h
 
-#include <wtf/ArrayBuffer.h>
-#include <wtf/ArrayBufferView.h>
+#include "ArrayBuffer.h"
+#include "ArrayBufferView.h"
 
-namespace WTF {
+namespace JSC {
 
 template <typename T>
 class TypedArrayBase : public ArrayBufferView {
-  public:
+public:
     T* data() const { return static_cast<T*>(baseAddress()); }
 
     bool set(TypedArrayBase<T>* array, unsigned offset)
@@ -108,9 +108,7 @@ protected:
     }
 
     template <class Subclass>
-    static PassRefPtr<Subclass> create(PassRefPtr<ArrayBuffer> buffer,
-                                       unsigned byteOffset,
-                                       unsigned length)
+    static PassRefPtr<Subclass> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
     {
         RefPtr<ArrayBuffer> buf(buffer);
         if (!verifySubRange<T>(buf, byteOffset, length))
@@ -148,8 +146,8 @@ protected:
     unsigned m_length;
 };
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::TypedArrayBase;
+using JSC::TypedArrayBase;
 
 #endif // TypedArrayBase_h

diff --git a/Source/WTF/wtf/Uint16Array.h b/Source/JavaScriptCore/runtime/Uint16Array.h
similarity index 72%
rename from Source/WTF/wtf/Uint16Array.h
rename to Source/JavaScriptCore/runtime/Uint16Array.h
index ecf5f9c99d4a8ff28b7c5860a4409de7ea59e2f7..6f2fab1b27b862a9a08d9191c8b4283454cbddea 100644 (file)
--- a/Source/WTF/wtf/Uint16Array.h
+++ b/Source/JavaScriptCore/runtime/Uint16Array.h
@@ -27,24 +27,24 @@
 #ifndef Uint16Array_h
 #define Uint16Array_h
 
-#include <wtf/IntegralTypedArrayBase.h>
+#include "IntegralTypedArrayBase.h"
 
-namespace WTF {
+namespace JSC {
 
 class ArrayBuffer;
 
-class Uint16Array : public IntegralTypedArrayBase<unsigned short> {
+class Uint16Array : public IntegralTypedArrayBase<uint16_t> {
 public:
     static inline PassRefPtr<Uint16Array> create(unsigned length);
-    static inline PassRefPtr<Uint16Array> create(const unsigned short* array, unsigned length);
+    static inline PassRefPtr<Uint16Array> create(const uint16_t* array, unsigned length);
     static inline PassRefPtr<Uint16Array> create(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
 
     // Should only be used when it is known the entire array will be filled. Do
     // not return these results directly to JavaScript without filling first.
     static inline PassRefPtr<Uint16Array> createUninitialized(unsigned length);
 
-    using TypedArrayBase<unsigned short>::set;
-    using IntegralTypedArrayBase<unsigned short>::set;
+    using TypedArrayBase<uint16_t>::set;
+    using IntegralTypedArrayBase<uint16_t>::set;
 
     inline PassRefPtr<Uint16Array> subarray(int start) const;
     inline PassRefPtr<Uint16Array> subarray(int start, int end) const;
@@ -55,35 +55,33 @@ public:
     }
 
 private:
-    inline Uint16Array(PassRefPtr<ArrayBuffer>,
-                            unsigned byteOffset,
-                            unsigned length);
+    inline Uint16Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
     // Make constructor visible to superclass.
-    friend class TypedArrayBase<unsigned short>;
+    friend class TypedArrayBase<uint16_t>;
 };
 
 PassRefPtr<Uint16Array> Uint16Array::create(unsigned length)
 {
-    return TypedArrayBase<unsigned short>::create<Uint16Array>(length);
+    return TypedArrayBase<uint16_t>::create<Uint16Array>(length);
 }
 
-PassRefPtr<Uint16Array> Uint16Array::create(const unsigned short* array, unsigned length)
+PassRefPtr<Uint16Array> Uint16Array::create(const uint16_t* array, unsigned length)
 {
-    return TypedArrayBase<unsigned short>::create<Uint16Array>(array, length);
+    return TypedArrayBase<uint16_t>::create<Uint16Array>(array, length);
 }
 
 PassRefPtr<Uint16Array> Uint16Array::create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
 {
-    return TypedArrayBase<unsigned short>::create<Uint16Array>(buffer, byteOffset, length);
+    return TypedArrayBase<uint16_t>::create<Uint16Array>(buffer, byteOffset, length);
 }
 
 PassRefPtr<Uint16Array> Uint16Array::createUninitialized(unsigned length)
 {
-    return TypedArrayBase<unsigned short>::createUninitialized<Uint16Array>(length);
+    return TypedArrayBase<uint16_t>::createUninitialized<Uint16Array>(length);
 }
 
 Uint16Array::Uint16Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
-    : IntegralTypedArrayBase<unsigned short>(buffer, byteOffset, length)
+    : IntegralTypedArrayBase<uint16_t>(buffer, byteOffset, length)
 {
 }
 
@@ -97,8 +95,8 @@ PassRefPtr<Uint16Array> Uint16Array::subarray(int start, int end) const
     return subarrayImpl<Uint16Array>(start, end);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::Uint16Array;
+using JSC::Uint16Array;
 
 #endif // Uint16Array_h

diff --git a/Source/WTF/wtf/Uint32Array.h b/Source/JavaScriptCore/runtime/Uint32Array.h
similarity index 73%
rename from Source/WTF/wtf/Uint32Array.h
rename to Source/JavaScriptCore/runtime/Uint32Array.h
index 1badf6bfc195106a8b8771403f790d82cc13edb7..aeb01e01a1cad4ebde499da132f3970a591283ec 100644 (file)
--- a/Source/WTF/wtf/Uint32Array.h
+++ b/Source/JavaScriptCore/runtime/Uint32Array.h
@@ -27,24 +27,24 @@
 #ifndef Uint32Array_h
 #define Uint32Array_h
 
-#include <wtf/IntegralTypedArrayBase.h>
+#include "IntegralTypedArrayBase.h"
 
-namespace WTF {
+namespace JSC {
 
 class ArrayBuffer;
 
-class Uint32Array : public IntegralTypedArrayBase<unsigned int> {
+class Uint32Array : public IntegralTypedArrayBase<uint32_t> {
 public:
     static inline PassRefPtr<Uint32Array> create(unsigned length);
-    static inline PassRefPtr<Uint32Array> create(const unsigned int* array, unsigned length);
+    static inline PassRefPtr<Uint32Array> create(const uint32_t* array, unsigned length);
     static inline PassRefPtr<Uint32Array> create(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
 
     // Should only be used when it is known the entire array will be filled. Do
     // not return these results directly to JavaScript without filling first.
     static inline PassRefPtr<Uint32Array> createUninitialized(unsigned length);
 
-    using TypedArrayBase<unsigned>::set;
-    using IntegralTypedArrayBase<unsigned>::set;
+    using TypedArrayBase<uint32_t>::set;
+    using IntegralTypedArrayBase<uint32_t>::set;
 
     inline PassRefPtr<Uint32Array> subarray(int start) const;
     inline PassRefPtr<Uint32Array> subarray(int start, int end) const;
@@ -55,35 +55,33 @@ public:
     }
 
 private:
-    inline Uint32Array(PassRefPtr<ArrayBuffer>,
-                          unsigned byteOffset,
-                          unsigned length);
+    inline Uint32Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
     // Make constructor visible to superclass.
-    friend class TypedArrayBase<unsigned int>;
+    friend class TypedArrayBase<uint32_t>;
 };
 
 PassRefPtr<Uint32Array> Uint32Array::create(unsigned length)
 {
-    return TypedArrayBase<unsigned int>::create<Uint32Array>(length);
+    return TypedArrayBase<uint32_t>::create<Uint32Array>(length);
 }
 
-PassRefPtr<Uint32Array> Uint32Array::create(const unsigned int* array, unsigned length)
+PassRefPtr<Uint32Array> Uint32Array::create(const uint32_t* array, unsigned length)
 {
-    return TypedArrayBase<unsigned int>::create<Uint32Array>(array, length);
+    return TypedArrayBase<uint32_t>::create<Uint32Array>(array, length);
 }
 
 PassRefPtr<Uint32Array> Uint32Array::create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
 {
-    return TypedArrayBase<unsigned int>::create<Uint32Array>(buffer, byteOffset, length);
+    return TypedArrayBase<uint32_t>::create<Uint32Array>(buffer, byteOffset, length);
 }
 
 PassRefPtr<Uint32Array> Uint32Array::createUninitialized(unsigned length)
 {
-    return TypedArrayBase<unsigned int>::createUninitialized<Uint32Array>(length);
+    return TypedArrayBase<uint32_t>::createUninitialized<Uint32Array>(length);
 }
 
 Uint32Array::Uint32Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
-    : IntegralTypedArrayBase<unsigned int>(buffer, byteOffset, length)
+    : IntegralTypedArrayBase<uint32_t>(buffer, byteOffset, length)
 {
 }
 
@@ -97,8 +95,8 @@ PassRefPtr<Uint32Array> Uint32Array::subarray(int start, int end) const
     return subarrayImpl<Uint32Array>(start, end);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::Uint32Array;
+using JSC::Uint32Array;
 
 #endif // Uint32Array_h

diff --git a/Source/WTF/wtf/Uint8Array.h b/Source/JavaScriptCore/runtime/Uint8Array.h
similarity index 73%
rename from Source/WTF/wtf/Uint8Array.h
rename to Source/JavaScriptCore/runtime/Uint8Array.h
index 8caf0547665b48887a89d3a4d2e874efba93c8b5..e65f9e170538dc0c26af8154e69dde0af6b02bce 100644 (file)
--- a/Source/WTF/wtf/Uint8Array.h
+++ b/Source/JavaScriptCore/runtime/Uint8Array.h
@@ -27,24 +27,24 @@
 #ifndef Uint8Array_h
 #define Uint8Array_h
 
-#include <wtf/IntegralTypedArrayBase.h>
+#include "IntegralTypedArrayBase.h"
 
-namespace WTF {
+namespace JSC {
 
 class ArrayBuffer;
 
-class Uint8Array : public IntegralTypedArrayBase<unsigned char> {
+class Uint8Array : public IntegralTypedArrayBase<uint8_t> {
 public:
     static inline PassRefPtr<Uint8Array> create(unsigned length);
-    static inline PassRefPtr<Uint8Array> create(const unsigned char* array, unsigned length);
+    static inline PassRefPtr<Uint8Array> create(const uint8_t* array, unsigned length);
     static inline PassRefPtr<Uint8Array> create(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
 
     // Should only be used when it is known the entire array will be filled. Do
     // not return these results directly to JavaScript without filling first.
     static inline PassRefPtr<Uint8Array> createUninitialized(unsigned length);
 
-    using TypedArrayBase<unsigned char>::set;
-    using IntegralTypedArrayBase<unsigned char>::set;
+    using TypedArrayBase<uint8_t>::set;
+    using IntegralTypedArrayBase<uint8_t>::set;
 
     inline PassRefPtr<Uint8Array> subarray(int start) const;
     inline PassRefPtr<Uint8Array> subarray(int start, int end) const;
@@ -55,35 +55,33 @@ public:
     }
 
 protected:
-    inline Uint8Array(PassRefPtr<ArrayBuffer>,
-                           unsigned byteOffset,
-                           unsigned length);
+    inline Uint8Array(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
     // Make constructor visible to superclass.
-    friend class TypedArrayBase<unsigned char>;
+    friend class TypedArrayBase<uint8_t>;
 };
 
 PassRefPtr<Uint8Array> Uint8Array::create(unsigned length)
 {
-    return TypedArrayBase<unsigned char>::create<Uint8Array>(length);
+    return TypedArrayBase<uint8_t>::create<Uint8Array>(length);
 }
 
-PassRefPtr<Uint8Array> Uint8Array::create(const unsigned char* array, unsigned length)
+PassRefPtr<Uint8Array> Uint8Array::create(const uint8_t* array, unsigned length)
 {
-    return TypedArrayBase<unsigned char>::create<Uint8Array>(array, length);
+    return TypedArrayBase<uint8_t>::create<Uint8Array>(array, length);
 }
 
 PassRefPtr<Uint8Array> Uint8Array::create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
 {
-    return TypedArrayBase<unsigned char>::create<Uint8Array>(buffer, byteOffset, length);
+    return TypedArrayBase<uint8_t>::create<Uint8Array>(buffer, byteOffset, length);
 }
 
 PassRefPtr<Uint8Array> Uint8Array::createUninitialized(unsigned length)
 {
-    return TypedArrayBase<unsigned char>::createUninitialized<Uint8Array>(length);
+    return TypedArrayBase<uint8_t>::createUninitialized<Uint8Array>(length);
 }
 
 Uint8Array::Uint8Array(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
-: IntegralTypedArrayBase<unsigned char>(buffer, byteOffset, length)
+: IntegralTypedArrayBase<uint8_t>(buffer, byteOffset, length)
 {
 }
 
@@ -97,8 +95,8 @@ PassRefPtr<Uint8Array> Uint8Array::subarray(int start, int end) const
     return subarrayImpl<Uint8Array>(start, end);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::Uint8Array;
+using JSC::Uint8Array;
 
 #endif // Uint8Array_h

diff --git a/Source/WTF/wtf/Uint8ClampedArray.h b/Source/JavaScriptCore/runtime/Uint8ClampedArray.h
similarity index 78%
rename from Source/WTF/wtf/Uint8ClampedArray.h
rename to Source/JavaScriptCore/runtime/Uint8ClampedArray.h
index 75cc2d82b29142bd312836a5079768508adb30c4..6fffae747caee8ae3b0d5e14110ae118c8d9fd26 100644 (file)
--- a/Source/WTF/wtf/Uint8ClampedArray.h
+++ b/Source/JavaScriptCore/runtime/Uint8ClampedArray.h
@@ -28,17 +28,15 @@
 #ifndef Uint8ClampedArray_h
 #define Uint8ClampedArray_h
 
-#include <wtf/Platform.h>
-
-#include <wtf/Uint8Array.h>
+#include "Uint8Array.h"
 #include <wtf/MathExtras.h>
 
-namespace WTF {
+namespace JSC {
 
 class Uint8ClampedArray : public Uint8Array {
 public:
     static inline PassRefPtr<Uint8ClampedArray> create(unsigned length);
-    static inline PassRefPtr<Uint8ClampedArray> create(const unsigned char* array, unsigned length);
+    static inline PassRefPtr<Uint8ClampedArray> create(const uint8_t* array, unsigned length);
     static inline PassRefPtr<Uint8ClampedArray> create(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
 
     // Should only be used when it is known the entire array will be filled. Do
@@ -50,7 +48,7 @@ public:
     // zero the allocated memory.
     inline void zeroFill();
 
-    using TypedArrayBase<unsigned char>::set;
+    using TypedArrayBase<uint8_t>::set;
     inline void set(unsigned index, double value);
 
     inline PassRefPtr<Uint8ClampedArray> subarray(int start) const;
@@ -62,31 +60,29 @@ public:
     }
 
 private:
-    inline Uint8ClampedArray(PassRefPtr<ArrayBuffer>,
-                             unsigned byteOffset,
-                             unsigned length);
+    inline Uint8ClampedArray(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
     // Make constructor visible to superclass.
-    friend class TypedArrayBase<unsigned char>;
+    friend class TypedArrayBase<uint8_t>;
 };
 
 PassRefPtr<Uint8ClampedArray> Uint8ClampedArray::create(unsigned length)
 {
-    return TypedArrayBase<unsigned char>::create<Uint8ClampedArray>(length);
+    return TypedArrayBase<uint8_t>::create<Uint8ClampedArray>(length);
 }
 
-PassRefPtr<Uint8ClampedArray> Uint8ClampedArray::create(const unsigned char* array, unsigned length)
+PassRefPtr<Uint8ClampedArray> Uint8ClampedArray::create(const uint8_t* array, unsigned length)
 {
-    return TypedArrayBase<unsigned char>::create<Uint8ClampedArray>(array, length);
+    return TypedArrayBase<uint8_t>::create<Uint8ClampedArray>(array, length);
 }
 
 PassRefPtr<Uint8ClampedArray> Uint8ClampedArray::create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
 {
-    return TypedArrayBase<unsigned char>::create<Uint8ClampedArray>(buffer, byteOffset, length);
+    return TypedArrayBase<uint8_t>::create<Uint8ClampedArray>(buffer, byteOffset, length);
 }
 
 PassRefPtr<Uint8ClampedArray> Uint8ClampedArray::createUninitialized(unsigned length)
 {
-    return TypedArrayBase<unsigned char>::createUninitialized<Uint8ClampedArray>(length);
+    return TypedArrayBase<uint8_t>::createUninitialized<Uint8ClampedArray>(length);
 }
 
 void Uint8ClampedArray::zeroFill()
@@ -102,7 +98,7 @@ void Uint8ClampedArray::set(unsigned index, double value)
         value = 0;
     else if (value > 255)
         value = 255;
-    data()[index] = static_cast<unsigned char>(lrint(value));
+    data()[index] = static_cast<uint8_t>(lrint(value));
 }
 
 Uint8ClampedArray::Uint8ClampedArray(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length)
@@ -120,8 +116,8 @@ PassRefPtr<Uint8ClampedArray> Uint8ClampedArray::subarray(int start, int end) co
     return subarrayImpl<Uint8ClampedArray>(start, end);
 }
 
-} // namespace WTF
+} // namespace JSC
 
-using WTF::Uint8ClampedArray;
+using JSC::Uint8ClampedArray;
 
 #endif // Uint8ClampedArray_h

diff --git a/Source/JavaScriptCore/runtime/VM.h b/Source/JavaScriptCore/runtime/VM.h
index e4843b19c2e8f39d7062e673842c7e5b830edaa4..e227e24f9aecf4c0cc82d69ad535a77d256adbb3 100644 (file)
--- a/Source/JavaScriptCore/runtime/VM.h
+++ b/Source/JavaScriptCore/runtime/VM.h
@@ -69,8 +69,13 @@ namespace JSC {
     class CodeCache;
     class CommonIdentifiers;
     class ExecState;
+    class Float32Array;
+    class Float64Array;
     class HandleStack;
     class IdentifierTable;
+    class Int8Array;
+    class Int16Array;
+    class Int32Array;
     class Interpreter;
     class JSGlobalObject;
     class JSObject;
@@ -88,6 +93,10 @@ namespace JSC {
 #if ENABLE(REGEXP_TRACING)
     class RegExp;
 #endif
+    class Uint8Array;
+    class Uint8ClampedArray;
+    class Uint16Array;
+    class Uint32Array;
     class UnlinkedCodeBlock;
     class UnlinkedEvalCodeBlock;
     class UnlinkedFunctionExecutable;

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index bf83203611dc38ef031d4d01d03cca1373ee40af..68c95b130ec087385ca0072fedc6a7376c4bfb0c 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,16 @@
+2013-08-05  Oliver Hunt  <oliver@apple.com>
+
+        Move TypedArray implementation into JSC
+        https://bugs.webkit.org/show_bug.cgi?id=119489
+
+        Reviewed by Filip Pizlo.
+
+        Remove TypedArray implementation from WTF
+
+        * GNUmakefile.list.am:
+        * WTF.xcodeproj/project.pbxproj:
+        * wtf/Forward.h:
+
 2013-08-02  Benjamin Poulain  <benjamin@webkit.org>
 
         Remove a bunch of redundant checks for empty string in StringImpl

diff --git a/Source/WTF/GNUmakefile.list.am b/Source/WTF/GNUmakefile.list.am
index 6749c6ac06dbe1e8c89d9c758c86f7d4b84ee644..f6a380bfa3ffa9d5be9275996665b459882a77b1 100644 (file)
--- a/Source/WTF/GNUmakefile.list.am
+++ b/Source/WTF/GNUmakefile.list.am
@@ -4,10 +4,6 @@ wtf_sources += \
     Source/WTF/wtf/ASCIICType.h \
     Source/WTF/wtf/AVLTree.h \
     Source/WTF/wtf/Alignment.h \
-    Source/WTF/wtf/ArrayBuffer.cpp \
-    Source/WTF/wtf/ArrayBuffer.h \
-    Source/WTF/wtf/ArrayBufferView.cpp \
-    Source/WTF/wtf/ArrayBufferView.h \
     Source/WTF/wtf/Assertions.cpp \
     Source/WTF/wtf/Assertions.h \
     Source/WTF/wtf/Atomics.cpp \
@@ -56,8 +52,6 @@ wtf_sources += \
     Source/WTF/wtf/FilePrintStream.cpp \
     Source/WTF/wtf/FilePrintStream.h \
     Source/WTF/wtf/FixedArray.h \
-    Source/WTF/wtf/Float32Array.h \
-    Source/WTF/wtf/Float64Array.h \
     Source/WTF/wtf/Forward.h \
     Source/WTF/wtf/FunctionDispatcher.cpp \
     Source/WTF/wtf/FunctionDispatcher.h \
@@ -76,10 +70,6 @@ wtf_sources += \
     Source/WTF/wtf/HexNumber.h \
     Source/WTF/wtf/InlineASM.h \
     Source/WTF/wtf/Insertion.h \
-    Source/WTF/wtf/Int16Array.h \
-    Source/WTF/wtf/Int32Array.h \
-    Source/WTF/wtf/Int8Array.h \
-    Source/WTF/wtf/IntegralTypedArrayBase.h \
     Source/WTF/wtf/ListDump.h \
     Source/WTF/wtf/ListHashSet.h \
     Source/WTF/wtf/LLVMHeaders.h \
@@ -189,11 +179,6 @@ wtf_sources += \
     Source/WTF/wtf/TriState.h \
     Source/WTF/wtf/TypeTraits.cpp \
     Source/WTF/wtf/TypeTraits.h \
-    Source/WTF/wtf/TypedArrayBase.h \
-    Source/WTF/wtf/Uint16Array.h \
-    Source/WTF/wtf/Uint32Array.h \
-    Source/WTF/wtf/Uint8Array.h \
-    Source/WTF/wtf/Uint8ClampedArray.h \
     Source/WTF/wtf/UnionFind.h \
     Source/WTF/wtf/UniStdExtras.h \
     Source/WTF/wtf/VMTags.h \

diff --git a/Source/WTF/WTF.pro b/Source/WTF/WTF.pro
index 16a9c8bc668ed11404716fa3d8f54c9827ec9e72..4a0a682286eb5496299243183270415c50376284 100644 (file)
--- a/Source/WTF/WTF.pro
+++ b/Source/WTF/WTF.pro
@@ -21,8 +21,6 @@ wince* {
 
 HEADERS += \
     Alignment.h \
-    ArrayBuffer.h \
-    ArrayBufferView.h \
     ASCIICType.h \
     Assertions.h \
     Atomics.h \
@@ -64,8 +62,6 @@ HEADERS += \
     FeatureDefines.h \
     FilePrintStream.h \
     FixedArray.h \
-    Float32Array.h \
-    Float64Array.h \
     Forward.h \
     FunctionDispatcher.h \
     Functional.h \
@@ -79,9 +75,6 @@ HEADERS += \
     HashTable.h \
     HashTraits.h \
     HexNumber.h \
-    Int16Array.h \
-    Int32Array.h \
-    Int8Array.h \
     ListHashSet.h \
     Locker.h \
     MainThread.h \
@@ -163,10 +156,6 @@ HEADERS += \
     ThreadSafeRefCounted.h \
     ThreadSpecific.h \
     TypeTraits.h \
-    Uint16Array.h \
-    Uint32Array.h \
-    Uint8Array.h \
-    Uint8ClampedArray.h \
     unicode/CharacterNames.h \
     unicode/Collator.h \
     unicode/icu/UnicodeIcu.h \
@@ -184,8 +173,6 @@ HEADERS += \
 unix: HEADERS += ThreadIdentifierDataPthreads.h
 
 SOURCES += \
-    ArrayBuffer.cpp \
-    ArrayBufferView.cpp \
     Assertions.cpp \
     Atomics.cpp \
     BitVector.cpp \

diff --git a/Source/WTF/WTF.vcxproj/WTF.vcxproj b/Source/WTF/WTF.vcxproj/WTF.vcxproj
index 3f050199aa83a3c1174f99ba82fd1fd2b1bad545..e4f5c556c205303f4fab4885515e46f47d92b594 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTF.vcxproj
+++ b/Source/WTF/WTF.vcxproj/WTF.vcxproj
@@ -51,8 +51,6 @@
     </ProjectConfiguration>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="..\wtf\ArrayBuffer.cpp" />\r
-    <ClCompile Include="..\wtf\ArrayBufferView.cpp" />\r
     <ClCompile Include="..\wtf\Assertions.cpp" />\r
     <ClCompile Include="..\wtf\BitVector.cpp" />\r
     <ClCompile Include="..\wtf\CompilationThread.cpp" />\r
@@ -122,8 +120,6 @@
     <ClInclude Include="..\wtf\CompilationThread.h" />\r
     <ClInclude Include="..\WTF\config.h" />\r
     <ClInclude Include="..\wtf\Alignment.h" />\r
-    <ClInclude Include="..\wtf\ArrayBuffer.h" />\r
-    <ClInclude Include="..\wtf\ArrayBufferView.h" />\r
     <ClInclude Include="..\wtf\ASCIICType.h" />\r
     <ClInclude Include="..\wtf\Assertions.h" />\r
     <ClInclude Include="..\wtf\Atomics.h" />\r
@@ -168,8 +164,6 @@
     <ClInclude Include="..\wtf\FeatureDefines.h" />\r
     <ClInclude Include="..\wtf\FilePrintStream.h" />\r
     <ClInclude Include="..\wtf\FixedArray.h" />\r
-    <ClInclude Include="..\wtf\Float32Array.h" />\r
-    <ClInclude Include="..\wtf\Float64Array.h" />\r
     <ClInclude Include="..\wtf\Forward.h" />\r
     <ClInclude Include="..\wtf\FunctionDispatcher.h" />\r
     <ClInclude Include="..\wtf\Functional.h" />\r
@@ -183,9 +177,6 @@
     <ClInclude Include="..\wtf\HashTable.h" />\r
     <ClInclude Include="..\wtf\HashTraits.h" />\r
     <ClInclude Include="..\wtf\HexNumber.h" />\r
-    <ClInclude Include="..\wtf\Int16Array.h" />\r
-    <ClInclude Include="..\wtf\Int32Array.h" />\r
-    <ClInclude Include="..\wtf\Int8Array.h" />\r
     <ClInclude Include="..\wtf\ListHashSet.h" />\r
     <ClInclude Include="..\wtf\Locker.h" />\r
     <ClInclude Include="..\wtf\MainThread.h" />\r
@@ -270,9 +261,6 @@
     <ClInclude Include="..\wtf\threadspecific.h" />\r
     <ClInclude Include="..\wtf\threads\BinarySemaphore.h" />\r
     <ClInclude Include="..\wtf\TypeTraits.h" />\r
-    <ClInclude Include="..\wtf\Uint16Array.h" />\r
-    <ClInclude Include="..\wtf\Uint32Array.h" />\r
-    <ClInclude Include="..\wtf\Uint8Array.h" />\r
     <ClInclude Include="..\wtf\unicode\CharacterNames.h" />\r
     <ClInclude Include="..\wtf\unicode\Collator.h" />\r
     <ClInclude Include="..\wtf\unicode\icu\UnicodeIcu.h" />\r

diff --git a/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters b/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
index a971035336e8f1706fa1e6e3c367378475068b6c..83cf08143586ea9c9a9ecf6b51c0a0fb27e1b112 100644 (file)
--- a/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
+++ b/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
@@ -96,12 +96,6 @@
     <ClCompile Include="..\wtf\unicode\UTF8.cpp">\r
       <Filter>wtf\unicode</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\wtf\ArrayBuffer.cpp">\r
-      <Filter>wtf</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\wtf\ArrayBufferView.cpp">\r
-      <Filter>wtf</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\wtf\Assertions.cpp">\r
       <Filter>wtf</Filter>\r
     </ClCompile>\r
@@ -338,12 +332,6 @@
     <ClInclude Include="..\wtf\WTFThreadData.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\wtf\ArrayBuffer.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\wtf\ArrayBufferView.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\wtf\ASCIICType.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r
@@ -437,12 +425,6 @@
     <ClInclude Include="..\wtf\FixedArray.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\wtf\Float32Array.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\wtf\Float64Array.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\wtf\Forward.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r
@@ -479,15 +461,6 @@
     <ClInclude Include="..\wtf\HexNumber.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\wtf\Int16Array.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\wtf\Int32Array.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\wtf\Int8Array.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\wtf\ListHashSet.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r
@@ -680,15 +653,6 @@
     <ClInclude Include="..\wtf\TypeTraits.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\wtf\Uint16Array.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\wtf\Uint32Array.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\wtf\Uint8Array.h">\r
-      <Filter>wtf</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\wtf\ValueCheck.h">\r
       <Filter>wtf</Filter>\r
     </ClInclude>\r

diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj
index a2af68f5d0f8543a102ce8395c8f7083cd873cd8..7491ffa1fc9845179de84e16895ce81385184a94 100644 (file)
--- a/Source/WTF/WTF.xcodeproj/project.pbxproj
+++ b/Source/WTF/WTF.xcodeproj/project.pbxproj
@@ -67,10 +67,6 @@
                A748745417A0BDAE00FA04CB /* StringHashDumpContext.h in Headers */ = {isa = PBXBuildFile; fileRef = A748745117A0BDAE00FA04CB /* StringHashDumpContext.h */; };
                A876DBD8151816E500DADB95 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = A876DBD7151816E500DADB95 /* Platform.h */; };
                A8A4737F151A825B004123FF /* Alignment.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47254151A825A004123FF /* Alignment.h */; };
-               A8A47381151A825B004123FF /* ArrayBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47256151A825A004123FF /* ArrayBuffer.cpp */; };
-               A8A47382151A825B004123FF /* ArrayBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47257151A825A004123FF /* ArrayBuffer.h */; };
-               A8A47383151A825B004123FF /* ArrayBufferView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47258151A825A004123FF /* ArrayBufferView.cpp */; };
-               A8A47384151A825B004123FF /* ArrayBufferView.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47259151A825A004123FF /* ArrayBufferView.h */; };
                A8A47385151A825B004123FF /* ASCIICType.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4725A151A825A004123FF /* ASCIICType.h */; };
                A8A47386151A825B004123FF /* Assertions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A4725B151A825A004123FF /* Assertions.cpp */; };
                A8A47387151A825B004123FF /* Assertions.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4725C151A825A004123FF /* Assertions.h */; };
@@ -128,8 +124,6 @@
                A8A473C3151A825B004123FF /* FastMalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A472A1151A825A004123FF /* FastMalloc.cpp */; };
                A8A473C4151A825B004123FF /* FastMalloc.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472A2151A825A004123FF /* FastMalloc.h */; };
                A8A473C5151A825B004123FF /* FixedArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472A3151A825A004123FF /* FixedArray.h */; };
-               A8A473C6151A825B004123FF /* Float32Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472A4151A825A004123FF /* Float32Array.h */; };
-               A8A473C7151A825B004123FF /* Float64Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472A5151A825A004123FF /* Float64Array.h */; };
                A8A473C8151A825B004123FF /* Forward.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472A6151A825A004123FF /* Forward.h */; };
                A8A473C9151A825B004123FF /* Functional.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472A7151A825A004123FF /* Functional.h */; };
                A8A473CA151A825B004123FF /* GetPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472A8151A825A004123FF /* GetPtr.h */; };
@@ -143,10 +137,6 @@
                A8A473DA151A825B004123FF /* HashTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472BA151A825A004123FF /* HashTraits.h */; };
                A8A473DB151A825B004123FF /* HexNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472BB151A825A004123FF /* HexNumber.h */; };
                A8A473DC151A825B004123FF /* InlineASM.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472BC151A825A004123FF /* InlineASM.h */; };
-               A8A473DD151A825B004123FF /* Int8Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472BD151A825A004123FF /* Int8Array.h */; };
-               A8A473DE151A825B004123FF /* Int16Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472BE151A825A004123FF /* Int16Array.h */; };
-               A8A473DF151A825B004123FF /* Int32Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472BF151A825A004123FF /* Int32Array.h */; };
-               A8A473E0151A825B004123FF /* IntegralTypedArrayBase.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472C0151A825A004123FF /* IntegralTypedArrayBase.h */; };
                A8A473E1151A825B004123FF /* ListHashSet.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472C1151A825A004123FF /* ListHashSet.h */; };
                A8A473E3151A825B004123FF /* Locker.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472C3151A825A004123FF /* Locker.h */; };
                A8A473E4151A825B004123FF /* MainThreadMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8A472C5151A825A004123FF /* MainThreadMac.mm */; };
@@ -250,13 +240,8 @@
                A8A47452151A825B004123FF /* BinarySemaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4733B151A825B004123FF /* BinarySemaphore.h */; };
                A8A47454151A825B004123FF /* ThreadSafeRefCounted.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4733E151A825B004123FF /* ThreadSafeRefCounted.h */; };
                A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4733F151A825B004123FF /* ThreadSpecific.h */; };
-               A8A47457151A825B004123FF /* TypedArrayBase.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47341151A825B004123FF /* TypedArrayBase.h */; };
                A8A47458151A825B004123FF /* TypeTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47342151A825B004123FF /* TypeTraits.cpp */; };
                A8A47459151A825B004123FF /* TypeTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47343151A825B004123FF /* TypeTraits.h */; };
-               A8A4745A151A825B004123FF /* Uint8Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47344151A825B004123FF /* Uint8Array.h */; };
-               A8A4745B151A825B004123FF /* Uint8ClampedArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47345151A825B004123FF /* Uint8ClampedArray.h */; };
-               A8A4745C151A825B004123FF /* Uint16Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47346151A825B004123FF /* Uint16Array.h */; };
-               A8A4745D151A825B004123FF /* Uint32Array.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47347151A825B004123FF /* Uint32Array.h */; };
                A8A4745E151A825B004123FF /* CharacterNames.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47349151A825B004123FF /* CharacterNames.h */; };
                A8A4745F151A825B004123FF /* Collator.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4734A151A825B004123FF /* Collator.h */; };
                A8A47460151A825B004123FF /* CollatorDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A4734B151A825B004123FF /* CollatorDefault.cpp */; };
@@ -349,10 +334,6 @@
                A748745117A0BDAE00FA04CB /* StringHashDumpContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringHashDumpContext.h; sourceTree = "<group>"; };
                A876DBD7151816E500DADB95 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
                A8A47254151A825A004123FF /* Alignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Alignment.h; sourceTree = "<group>"; };
-               A8A47256151A825A004123FF /* ArrayBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayBuffer.cpp; sourceTree = "<group>"; };
-               A8A47257151A825A004123FF /* ArrayBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayBuffer.h; sourceTree = "<group>"; };
-               A8A47258151A825A004123FF /* ArrayBufferView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayBufferView.cpp; sourceTree = "<group>"; };
-               A8A47259151A825A004123FF /* ArrayBufferView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayBufferView.h; sourceTree = "<group>"; };
                A8A4725A151A825A004123FF /* ASCIICType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASCIICType.h; sourceTree = "<group>"; };
                A8A4725B151A825A004123FF /* Assertions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Assertions.cpp; sourceTree = "<group>"; };
                A8A4725C151A825A004123FF /* Assertions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Assertions.h; sourceTree = "<group>"; };
@@ -413,8 +394,6 @@
                A8A472A1151A825A004123FF /* FastMalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FastMalloc.cpp; sourceTree = "<group>"; };
                A8A472A2151A825A004123FF /* FastMalloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastMalloc.h; sourceTree = "<group>"; };
                A8A472A3151A825A004123FF /* FixedArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FixedArray.h; sourceTree = "<group>"; };
-               A8A472A4151A825A004123FF /* Float32Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Float32Array.h; sourceTree = "<group>"; };
-               A8A472A5151A825A004123FF /* Float64Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Float64Array.h; sourceTree = "<group>"; };
                A8A472A6151A825A004123FF /* Forward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Forward.h; sourceTree = "<group>"; };
                A8A472A7151A825A004123FF /* Functional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Functional.h; sourceTree = "<group>"; };
                A8A472A8151A825A004123FF /* GetPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GetPtr.h; sourceTree = "<group>"; };
@@ -428,10 +407,6 @@
                A8A472BA151A825A004123FF /* HashTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashTraits.h; sourceTree = "<group>"; };
                A8A472BB151A825A004123FF /* HexNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HexNumber.h; sourceTree = "<group>"; };
                A8A472BC151A825A004123FF /* InlineASM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineASM.h; sourceTree = "<group>"; };
-               A8A472BD151A825A004123FF /* Int8Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Int8Array.h; sourceTree = "<group>"; };
-               A8A472BE151A825A004123FF /* Int16Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Int16Array.h; sourceTree = "<group>"; };
-               A8A472BF151A825A004123FF /* Int32Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Int32Array.h; sourceTree = "<group>"; };
-               A8A472C0151A825A004123FF /* IntegralTypedArrayBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntegralTypedArrayBase.h; sourceTree = "<group>"; };
                A8A472C1151A825A004123FF /* ListHashSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListHashSet.h; sourceTree = "<group>"; };
                A8A472C3151A825A004123FF /* Locker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Locker.h; sourceTree = "<group>"; };
                A8A472C5151A825A004123FF /* MainThreadMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MainThreadMac.mm; sourceTree = "<group>"; };
@@ -535,13 +510,8 @@
                A8A4733B151A825B004123FF /* BinarySemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BinarySemaphore.h; sourceTree = "<group>"; };
                A8A4733E151A825B004123FF /* ThreadSafeRefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadSafeRefCounted.h; sourceTree = "<group>"; };
                A8A4733F151A825B004123FF /* ThreadSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadSpecific.h; sourceTree = "<group>"; };
-               A8A47341151A825B004123FF /* TypedArrayBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypedArrayBase.h; sourceTree = "<group>"; };
                A8A47342151A825B004123FF /* TypeTraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TypeTraits.cpp; sourceTree = "<group>"; };
                A8A47343151A825B004123FF /* TypeTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h; sourceTree = "<group>"; };
-               A8A47344151A825B004123FF /* Uint8Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint8Array.h; sourceTree = "<group>"; };
-               A8A47345151A825B004123FF /* Uint8ClampedArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint8ClampedArray.h; sourceTree = "<group>"; };
-               A8A47346151A825B004123FF /* Uint16Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint16Array.h; sourceTree = "<group>"; };
-               A8A47347151A825B004123FF /* Uint32Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint32Array.h; sourceTree = "<group>"; };
                A8A47349151A825B004123FF /* CharacterNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterNames.h; sourceTree = "<group>"; };
                A8A4734A151A825B004123FF /* Collator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Collator.h; sourceTree = "<group>"; };
                A8A4734B151A825B004123FF /* CollatorDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CollatorDefault.cpp; sourceTree = "<group>"; };
@@ -626,10 +596,6 @@
                                A8A47339151A825B004123FF /* threads */,
                                A8A47348151A825B004123FF /* unicode */,
                                A8A47254151A825A004123FF /* Alignment.h */,
-                               A8A47256151A825A004123FF /* ArrayBuffer.cpp */,
-                               A8A47257151A825A004123FF /* ArrayBuffer.h */,
-                               A8A47258151A825A004123FF /* ArrayBufferView.cpp */,
-                               A8A47259151A825A004123FF /* ArrayBufferView.h */,
                                A8A4725A151A825A004123FF /* ASCIICType.h */,
                                A8A4725B151A825A004123FF /* Assertions.cpp */,
                                A8A4725C151A825A004123FF /* Assertions.h */,
@@ -682,8 +648,6 @@
                                0F9D335B165DBA73005AD387 /* FilePrintStream.cpp */,
                                0F9D335C165DBA73005AD387 /* FilePrintStream.h */,
                                A8A472A3151A825A004123FF /* FixedArray.h */,
-                               A8A472A4151A825A004123FF /* Float32Array.h */,
-                               A8A472A5151A825A004123FF /* Float64Array.h */,
                                A8A472A6151A825A004123FF /* Forward.h */,
                                A8A472A7151A825A004123FF /* Functional.h */,
                                1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */,
@@ -702,10 +666,6 @@
                                A8A472BB151A825A004123FF /* HexNumber.h */,
                                A8A472BC151A825A004123FF /* InlineASM.h */,
                                A70DA0821799F04D00529A9B /* Insertion.h */,
-                               A8A472BE151A825A004123FF /* Int16Array.h */,
-                               A8A472BF151A825A004123FF /* Int32Array.h */,
-                               A8A472BD151A825A004123FF /* Int8Array.h */,
-                               A8A472C0151A825A004123FF /* IntegralTypedArrayBase.h */,
                                A70DA0831799F04D00529A9B /* ListDump.h */,
                                A8A472C1151A825A004123FF /* ListHashSet.h */,
                                A736B3581799E11A00C6F05E /* LLVMHeaders.h */,
@@ -816,13 +776,8 @@
                                A8A4733E151A825B004123FF /* ThreadSafeRefCounted.h */,
                                A8A4733F151A825B004123FF /* ThreadSpecific.h */,
                                149EF16216BBFE0D000A4331 /* TriState.h */,
-                               A8A47341151A825B004123FF /* TypedArrayBase.h */,
                                A8A47342151A825B004123FF /* TypeTraits.cpp */,
                                A8A47343151A825B004123FF /* TypeTraits.h */,
-                               A8A47346151A825B004123FF /* Uint16Array.h */,
-                               A8A47347151A825B004123FF /* Uint32Array.h */,
-                               A8A47344151A825B004123FF /* Uint8Array.h */,
-                               A8A47345151A825B004123FF /* Uint8ClampedArray.h */,
                                A8A4735C151A825B004123FF /* UnionFind.h */,
                                A8A4736F151A825B004123FF /* ValueCheck.h */,
                                A8A47370151A825B004123FF /* Vector.h */,
@@ -945,8 +900,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                A8A4737F151A825B004123FF /* Alignment.h in Headers */,
-                               A8A47382151A825B004123FF /* ArrayBuffer.h in Headers */,
-                               A8A47384151A825B004123FF /* ArrayBufferView.h in Headers */,
                                A8A47385151A825B004123FF /* ASCIICType.h in Headers */,
                                A8A47434151A825B004123FF /* ASCIIFastPath.h in Headers */,
                                A8A47387151A825B004123FF /* Assertions.h in Headers */,
@@ -1005,8 +958,6 @@
                                0F9D3361165DBA73005AD387 /* FilePrintStream.h in Headers */,
                                A8A473B6151A825B004123FF /* fixed-dtoa.h in Headers */,
                                A8A473C5151A825B004123FF /* FixedArray.h in Headers */,
-                               A8A473C6151A825B004123FF /* Float32Array.h in Headers */,
-                               A8A473C7151A825B004123FF /* Float64Array.h in Headers */,
                                A8A473C8151A825B004123FF /* Forward.h in Headers */,
                                A8A473C9151A825B004123FF /* Functional.h in Headers */,
                                1A1D8B9C173186CE00141DA4 /* FunctionDispatcher.h in Headers */,
@@ -1022,11 +973,7 @@
                                A8A473DB151A825B004123FF /* HexNumber.h in Headers */,
                                A8A473DC151A825B004123FF /* InlineASM.h in Headers */,
                                A70DA0841799F04D00529A9B /* Insertion.h in Headers */,
-                               A8A473DE151A825B004123FF /* Int16Array.h in Headers */,
-                               A8A473DF151A825B004123FF /* Int32Array.h in Headers */,
-                               A8A473DD151A825B004123FF /* Int8Array.h in Headers */,
                                26147B0A15DDCCDC00DDB907 /* IntegerToStringConversion.h in Headers */,
-                               A8A473E0151A825B004123FF /* IntegralTypedArrayBase.h in Headers */,
                                A70DA0851799F04D00529A9B /* ListDump.h in Headers */,
                                A8A473E1151A825B004123FF /* ListHashSet.h in Headers */,
                                A8A473E3151A825B004123FF /* Locker.h in Headers */,
@@ -1117,12 +1064,7 @@
                                A8A47454151A825B004123FF /* ThreadSafeRefCounted.h in Headers */,
                                A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */,
                                149EF16316BBFE0D000A4331 /* TriState.h in Headers */,
-                               A8A47457151A825B004123FF /* TypedArrayBase.h in Headers */,
                                A8A47459151A825B004123FF /* TypeTraits.h in Headers */,
-                               A8A4745C151A825B004123FF /* Uint16Array.h in Headers */,
-                               A8A4745D151A825B004123FF /* Uint32Array.h in Headers */,
-                               A8A4745A151A825B004123FF /* Uint8Array.h in Headers */,
-                               A8A4745B151A825B004123FF /* Uint8ClampedArray.h in Headers */,
                                A8A47467151A825B004123FF /* Unicode.h in Headers */,
                                A8A47464151A825B004123FF /* UnicodeIcu.h in Headers */,
                                A8A47468151A825B004123FF /* UnicodeMacrosFromICU.h in Headers */,
@@ -1208,8 +1150,6 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               A8A47381151A825B004123FF /* ArrayBuffer.cpp in Sources */,
-                               A8A47383151A825B004123FF /* ArrayBufferView.cpp in Sources */,
                                A8A47386151A825B004123FF /* Assertions.cpp in Sources */,
                                A8A47435151A825B004123FF /* AtomicString.cpp in Sources */,
                                9BC70F05176C379D00101DEC /* AtomicStringTable.cpp in Sources */,

diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
index c613736ab5c15e79cfa91154115394de981f5810..0860ee9a6550200f255aa7cb67e4e2bdd3a48056 100644 (file)
--- a/Source/WTF/wtf/CMakeLists.txt
+++ b/Source/WTF/wtf/CMakeLists.txt
@@ -145,8 +145,6 @@ set(WTF_HEADERS
 )
 
 set(WTF_SOURCES
-    ArrayBuffer.cpp
-    ArrayBufferView.cpp
     Assertions.cpp
     Atomics.cpp
     BitVector.cpp

diff --git a/Source/WTF/wtf/Forward.h b/Source/WTF/wtf/Forward.h
index 82c2e181ac62e4778132a0392701ab19a43c29bc..2a47503cbc34003eb07e49c3be6d4c9cc459c485 100644 (file)
--- a/Source/WTF/wtf/Forward.h
+++ b/Source/WTF/wtf/Forward.h
@@ -33,30 +33,19 @@ namespace WTF {
     template<typename T> class PassRefPtr;
     template<typename T> class RefPtr;
     template<typename T, size_t inlineCapacity, typename OverflowHandler> class Vector;
-    
-    class ArrayBuffer;
-    class ArrayBufferView;
+
     class AtomicString;
     class AtomicStringImpl;
     class BinarySemaphore;
     class CString;
     class Decoder;
     class Encoder;
-    class Float32Array;
-    class Float64Array;
     class FunctionDispatcher;
-    class Int8Array;
-    class Int16Array;
-    class Int32Array;
     class PrintStream;
     class String;
     template <typename T> class StringBuffer;
     class StringBuilder;
     class StringImpl;
-    class Uint8Array;
-    class Uint8ClampedArray;
-    class Uint16Array;
-    class Uint32Array;
 }
 
 using WTF::Function;
@@ -68,28 +57,17 @@ using WTF::PassRefPtr;
 using WTF::RefPtr;
 using WTF::Vector;
 
-using WTF::ArrayBuffer;
-using WTF::ArrayBufferView;
 using WTF::AtomicString;
 using WTF::AtomicStringImpl;
 using WTF::BinarySemaphore;
 using WTF::CString;
 using WTF::Encoder;
 using WTF::Decoder;
-using WTF::Float32Array;
-using WTF::Float64Array;
 using WTF::FunctionDispatcher;
-using WTF::Int8Array;
-using WTF::Int16Array;
-using WTF::Int32Array;
 using WTF::PrintStream;
 using WTF::String;
 using WTF::StringBuffer;
 using WTF::StringBuilder;
 using WTF::StringImpl;
-using WTF::Uint8Array;
-using WTF::Uint8ClampedArray;
-using WTF::Uint16Array;
-using WTF::Uint32Array;
 
 #endif // WTF_Forward_h

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3bce35b37b3e529749735e0ef27435a006c3814e..d9335cf672f14be5785bde3330237cf55261ebb6 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,122 @@
+2013-08-05  Oliver Hunt  <oliver@apple.com>
+
+        Move TypedArray implementation into JSC
+        https://bugs.webkit.org/show_bug.cgi?id=119489
+
+        Reviewed by Filip Pizlo.
+
+        Update WebCore for new location of TypedArray implementation.
+
+        * ForwardingHeaders/runtime/ArrayBuffer.h: Added.
+        * ForwardingHeaders/runtime/ArrayBufferView.h: Added.
+        * ForwardingHeaders/runtime/Float32Array.h: Added.
+        * ForwardingHeaders/runtime/Float64Array.h: Added.
+        * ForwardingHeaders/runtime/Int16Array.h: Added.
+        * ForwardingHeaders/runtime/Int32Array.h: Added.
+        * ForwardingHeaders/runtime/Int8Array.h: Added.
+        * ForwardingHeaders/runtime/IntegralTypedArrayBase.h: Added.
+        * ForwardingHeaders/runtime/TypedArrayBase.h: Added.
+        * ForwardingHeaders/runtime/Uint16Array.h: Added.
+        * ForwardingHeaders/runtime/Uint32Array.h: Added.
+        * ForwardingHeaders/runtime/Uint8Array.h: Added.
+        * ForwardingHeaders/runtime/Uint8ClampedArray.h: Added.
+        * Modules/webaudio/AnalyserNode.h:
+        (WebCore::AnalyserNode::getFloatFrequencyData):
+        (WebCore::AnalyserNode::getByteFrequencyData):
+        (WebCore::AnalyserNode::getByteTimeDomainData):
+        * Modules/webaudio/AsyncAudioDecoder.cpp:
+        * Modules/webaudio/AsyncAudioDecoder.h:
+        (WebCore::AsyncAudioDecoder::DecodingTask::audioData):
+        * Modules/webaudio/AudioBuffer.h:
+        * Modules/webaudio/AudioContext.cpp:
+        * Modules/webaudio/AudioParam.h:
+        * Modules/webaudio/AudioParamTimeline.h:
+        * Modules/webaudio/PeriodicWave.h:
+        * Modules/webaudio/RealtimeAnalyser.cpp:
+        * Modules/webaudio/RealtimeAnalyser.h:
+        * Modules/webaudio/ScriptProcessorNode.cpp:
+        * Modules/webaudio/WaveShaperProcessor.h:
+        * Modules/websockets/ThreadableWebSocketChannel.h:
+        * Modules/websockets/WebSocket.cpp:
+        * Modules/websockets/WebSocket.h:
+        * Modules/websockets/WebSocketChannel.cpp:
+        * Modules/websockets/WebSocketChannel.h:
+        * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+        * Modules/websockets/WorkerThreadableWebSocketChannel.h:
+        * WebCore.exp.in:
+        * bindings/js/JSArrayBufferCustom.cpp:
+        * bindings/js/JSArrayBufferViewHelper.h:
+        * bindings/js/JSAudioContextCustom.cpp:
+        * bindings/js/JSCryptoCustom.cpp:
+        * bindings/js/JSDictionary.h:
+        * bindings/js/JSFileReaderCustom.cpp:
+        * bindings/js/JSWebGLRenderingContextCustom.cpp:
+        * bindings/js/JSXMLHttpRequestCustom.cpp:
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValue::transferArrayBuffers):
+        * bindings/js/SerializedScriptValue.h:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (AddIncludesForType):
+        (GenerateHeader):
+        (NativeToJSValue):
+        * dom/MessageEvent.h:
+        * fileapi/FileReader.cpp:
+        * fileapi/FileReader.h:
+        * fileapi/FileReaderLoader.cpp:
+        * fileapi/FileReaderLoader.h:
+        * fileapi/FileReaderSync.cpp:
+        * fileapi/FileReaderSync.h:
+        * fileapi/WebKitBlobBuilder.cpp:
+        * fileapi/WebKitBlobBuilder.h:
+        * html/HTMLMediaElement.cpp:
+        * html/ImageData.h:
+        * html/canvas/ArrayBuffer.idl:
+        * html/canvas/ArrayBufferView.idl:
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        * html/canvas/DataView.h:
+        * html/canvas/Float32Array.idl:
+        * html/canvas/Float64Array.idl:
+        * html/canvas/Int16Array.idl:
+        * html/canvas/Int32Array.idl:
+        * html/canvas/Int8Array.idl:
+        * html/canvas/Uint16Array.idl:
+        * html/canvas/Uint32Array.idl:
+        * html/canvas/Uint8Array.idl:
+        * html/canvas/Uint8ClampedArray.idl:
+        * html/canvas/WebGLBuffer.h:
+        (WebCore::WebGLBuffer::elementArrayBuffer):
+        * html/canvas/WebGLGetInfo.cpp:
+        * html/canvas/WebGLGetInfo.h:
+        * html/canvas/WebGLRenderingContext.cpp:
+        * html/canvas/WebGLRenderingContext.h:
+        * inspector/InspectorMemoryAgent.cpp:
+        * page/Crypto.cpp:
+        * page/Crypto.h:
+        * platform/graphics/GraphicsContext3D.cpp:
+        * platform/graphics/ImageBuffer.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        * platform/graphics/cg/ImageBufferDataCG.h:
+        * platform/graphics/filters/FEBlend.cpp:
+        * platform/graphics/filters/FEColorMatrix.cpp:
+        * platform/graphics/filters/FEComponentTransfer.cpp:
+        * platform/graphics/filters/FEComposite.cpp:
+        * platform/graphics/filters/FEConvolveMatrix.cpp:
+        * platform/graphics/filters/FECustomFilter.cpp:
+        * platform/graphics/filters/FEDisplacementMap.cpp:
+        * platform/graphics/filters/FEDropShadow.cpp:
+        * platform/graphics/filters/FEGaussianBlur.cpp:
+        * platform/graphics/filters/FELighting.h:
+        * platform/graphics/filters/FEMorphology.cpp:
+        * platform/graphics/filters/FETurbulence.cpp:
+        * platform/graphics/filters/FilterEffect.cpp:
+        * platform/graphics/filters/FilterEffect.h:
+        * platform/graphics/mac/GraphicsContext3DMac.mm:
+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+        * testing/Internals.h:
+        * xml/XMLHttpRequest.cpp:
+        * xml/XMLHttpRequest.h:
+        (WebCore::XMLHttpRequest::optionalResponseArrayBuffer):
+
 2013-08-05  Alexey Proskuryakov  <ap@apple.com>
 
         <rdar://problem/14637103> REGRESSION (r153060?): Microphone appears in the way

diff --git a/Source/WebCore/ForwardingHeaders/runtime/ArrayBuffer.h b/Source/WebCore/ForwardingHeaders/runtime/ArrayBuffer.h
new file mode 100644 (file)
index 0000000..687d98c
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/ArrayBuffer.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_ArrayBuffer_h
+#define WebCore_FWD_ArrayBuffer_h
+#include <JavaScriptCore/ArrayBuffer.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/ArrayBufferView.h b/Source/WebCore/ForwardingHeaders/runtime/ArrayBufferView.h
new file mode 100644 (file)
index 0000000..de39526
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/ArrayBufferView.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_ArrayBufferView_h
+#define WebCore_FWD_ArrayBufferView_h
+#include <JavaScriptCore/ArrayBufferView.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Float32Array.h b/Source/WebCore/ForwardingHeaders/runtime/Float32Array.h
new file mode 100644 (file)
index 0000000..b2453dd
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Float32Array.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Float32Array_h
+#define WebCore_FWD_Float32Array_h
+#include <JavaScriptCore/Float32Array.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Float64Array.h b/Source/WebCore/ForwardingHeaders/runtime/Float64Array.h
new file mode 100644 (file)
index 0000000..e7e35aa
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Float64Array.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Float64Array_h
+#define WebCore_FWD_Float64Array_h
+#include <JavaScriptCore/Float64Array.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Int16Array.h b/Source/WebCore/ForwardingHeaders/runtime/Int16Array.h
new file mode 100644 (file)
index 0000000..45d0039
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Int16Array.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Int16Array_h
+#define WebCore_FWD_Int16Array_h
+#include <JavaScriptCore/Int16Array.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Int32Array.h b/Source/WebCore/ForwardingHeaders/runtime/Int32Array.h
new file mode 100644 (file)
index 0000000..7b65741
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Int32Array.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Int32Array_h
+#define WebCore_FWD_Int32Array_h
+#include <JavaScriptCore/Int32Array.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Int8Array.h b/Source/WebCore/ForwardingHeaders/runtime/Int8Array.h
new file mode 100644 (file)
index 0000000..6b6ad52
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Int8Array.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Int8Array_h
+#define WebCore_FWD_Int8Array_h
+#include <JavaScriptCore/Int8Array.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/IntegralTypedArrayBase.h b/Source/WebCore/ForwardingHeaders/runtime/IntegralTypedArrayBase.h
new file mode 100644 (file)
index 0000000..c679b56
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/IntegralTypedArrayBase.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_IntegralTypedArrayBase_h
+#define WebCore_FWD_IntegralTypedArrayBase_h
+#include <JavaScriptCore/IntegralTypedArrayBase.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/TypedArrayBase.h b/Source/WebCore/ForwardingHeaders/runtime/TypedArrayBase.h
new file mode 100644 (file)
index 0000000..e641a57
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/TypedArrayBase.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_TypedArrayBase_h
+#define WebCore_FWD_TypedArrayBase_h
+#include <JavaScriptCore/TypedArrayBase.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Uint16Array.h b/Source/WebCore/ForwardingHeaders/runtime/Uint16Array.h
new file mode 100644 (file)
index 0000000..cccea2c
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Uint16Array.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Uint16Array_h
+#define WebCore_FWD_Uint16Array_h
+#include <JavaScriptCore/Uint16Array.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Uint32Array.h b/Source/WebCore/ForwardingHeaders/runtime/Uint32Array.h
new file mode 100644 (file)
index 0000000..f6026f1
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Uint32Array.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Uint32Array_h
+#define WebCore_FWD_Uint32Array_h
+#include <JavaScriptCore/Uint32Array.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Uint8Array.h b/Source/WebCore/ForwardingHeaders/runtime/Uint8Array.h
new file mode 100644 (file)
index 0000000..4c8de4e
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Uint8Array.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Uint8Array_h
+#define WebCore_FWD_Uint8Array_h
+#include <JavaScriptCore/Uint8Array.h>
+#endif

diff --git a/Source/WebCore/ForwardingHeaders/runtime/Uint8ClampedArray.h b/Source/WebCore/ForwardingHeaders/runtime/Uint8ClampedArray.h
new file mode 100644 (file)
index 0000000..27d2e01
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/runtime/Uint8ClampedArray.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Uint8ClampedArray_h
+#define WebCore_FWD_Uint8ClampedArray_h
+#include <JavaScriptCore/Uint8ClampedArray.h>
+#endif

diff --git a/Source/WebCore/Modules/encryptedmedia/CDM.h b/Source/WebCore/Modules/encryptedmedia/CDM.h
index 3b753dc537a781865e9b6e13affd63d6dfedcaab..3c40f9cd5b4b37aa1db1f8b61a3a0ecb56e0412a 100644 (file)
--- a/Source/WebCore/Modules/encryptedmedia/CDM.h
+++ b/Source/WebCore/Modules/encryptedmedia/CDM.h
@@ -28,9 +28,9 @@
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
 
+#include <runtime/Uint8Array.h>
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
-#include <wtf/Uint8Array.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp b/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp
index 4a9c843a6521f9b1c7f2d9bbbf2036c43e7aca79..2b31b479c77d56f26687f95b375a2a8143eb2990 100644 (file)
--- a/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp
+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp
@@ -30,7 +30,7 @@
 #include "MediaKeyMessageEvent.h"
 
 #include "EventNames.h"
-#include <wtf/Uint8Array.h>
+#include <runtime/Uint8Array.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp b/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp
index 5e06f8d506317ea3fb9a837879ff801c8f967a25..db061738a012b0b9672d272fbadd53cc1763c3e3 100644 (file)
--- a/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp
+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp
@@ -30,7 +30,7 @@
 #include "MediaKeyNeededEvent.h"
 
 #include "EventNames.h"
-#include <wtf/Uint8Array.h>
+#include <runtime/Uint8Array.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h
index 83d1fbeeac37664ed0fd4f2ec509cd632f9fbd86..0766844793f8aa08568c55633fef0ab6009ef027 100644 (file)
--- a/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h
+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h
@@ -32,10 +32,10 @@
 #include "EventTarget.h"
 #include "ExceptionCode.h"
 #include "Timer.h"
+#include <runtime/Uint8Array.h>
 #include <wtf/Deque.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
-#include <wtf/Uint8Array.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeys.h b/Source/WebCore/Modules/encryptedmedia/MediaKeys.h
index 4ff3e069ea12955248b071adc13337684a2a4866..f162f961bf0d5c1a5d912a91d49110ec6c51eb41 100644 (file)
--- a/Source/WebCore/Modules/encryptedmedia/MediaKeys.h
+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeys.h
@@ -31,10 +31,10 @@
 #include "CDM.h"
 #include "EventTarget.h"
 #include "ExceptionCode.h"
+#include <runtime/Uint8Array.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
-#include <wtf/Uint8Array.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 

diff --git a/Source/WebCore/Modules/mediasource/MediaSource.cpp b/Source/WebCore/Modules/mediasource/MediaSource.cpp
index ee63269c6e8b8064ab6413a222866a7b177019a4..707a833f92d90495e8be0262d41d789ab67424d3 100644 (file)
--- a/Source/WebCore/Modules/mediasource/MediaSource.cpp
+++ b/Source/WebCore/Modules/mediasource/MediaSource.cpp
@@ -38,7 +38,7 @@
 #include "MIMETypeRegistry.h"
 #include "SourceBufferPrivate.h"
 #include "TimeRanges.h"
-#include <wtf/Uint8Array.h>
+#include <runtime/Uint8Array.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/Modules/mediasource/SourceBuffer.cpp b/Source/WebCore/Modules/mediasource/SourceBuffer.cpp
index ff80df54744a4a313489c25670a72d651493ee21..22eb6ada1bbaeb4aca5f6b7d0c04e5449881951d 100644 (file)
--- a/Source/WebCore/Modules/mediasource/SourceBuffer.cpp
+++ b/Source/WebCore/Modules/mediasource/SourceBuffer.cpp
@@ -36,7 +36,7 @@
 #include "MediaSource.h"
 #include "SourceBufferPrivate.h"
 #include "TimeRanges.h"
-#include <wtf/Uint8Array.h>
+#include <runtime/Uint8Array.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp b/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
index f201883cb60cd61bd2b468f5f0382e8e0c76ad1d..045c5d72d07aa564718a57a327936b5952bdbae3 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
@@ -35,8 +35,8 @@
 #include "RTCDataChannelHandler.h"
 #include "RTCPeerConnectionHandler.h"
 #include "ScriptExecutionContext.h"
-#include <wtf/ArrayBuffer.h>
-#include <wtf/ArrayBufferView.h>
+#include <runtime/ArrayBuffer.h>
+#include <runtime/ArrayBufferView.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/Modules/vibration/NavigatorVibration.cpp b/Source/WebCore/Modules/vibration/NavigatorVibration.cpp
index 96e97a915f52716a60cebc99b364e682fe6032f8..83b6028bd08043f0b4be6759353aa3ed5c94e2a4 100644 (file)
--- a/Source/WebCore/Modules/vibration/NavigatorVibration.cpp
+++ b/Source/WebCore/Modules/vibration/NavigatorVibration.cpp
@@ -26,7 +26,7 @@
 #include "Navigator.h"
 #include "Page.h"
 #include "Vibration.h"
-#include <wtf/Uint32Array.h>
+#include <runtime/Uint32Array.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/Modules/webaudio/AnalyserNode.h b/Source/WebCore/Modules/webaudio/AnalyserNode.h
index 9f2f0b8732092376edd79dc7c1aea5ea97cd8344..c3aa5c7782c077c4d14bc00c15a7b501dc320dde 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AnalyserNode.h
+++ b/Source/WebCore/Modules/webaudio/AnalyserNode.h
@@ -59,9 +59,9 @@ public:
     void setSmoothingTimeConstant(float k, ExceptionCode&);
     float smoothingTimeConstant() const { return m_analyser.smoothingTimeConstant(); }
 
-    void getFloatFrequencyData(Float32Array* array) { m_analyser.getFloatFrequencyData(array); }
-    void getByteFrequencyData(Uint8Array* array) { m_analyser.getByteFrequencyData(array); }
-    void getByteTimeDomainData(Uint8Array* array) { m_analyser.getByteTimeDomainData(array); }
+    void getFloatFrequencyData(JSC::Float32Array* array) { m_analyser.getFloatFrequencyData(array); }
+    void getByteFrequencyData(JSC::Uint8Array* array) { m_analyser.getByteFrequencyData(array); }
+    void getByteTimeDomainData(JSC::Uint8Array* array) { m_analyser.getByteTimeDomainData(array); }
 
 private:
     virtual double tailTime() const OVERRIDE { return 0; }

diff --git a/Source/WebCore/Modules/webaudio/AsyncAudioDecoder.cpp b/Source/WebCore/Modules/webaudio/AsyncAudioDecoder.cpp
index f00bd1adcf2104cfd2e97fa3501b603dc7da288a..09383ef5f479f35407ff1130080d3e16246bbe24 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AsyncAudioDecoder.cpp
+++ b/Source/WebCore/Modules/webaudio/AsyncAudioDecoder.cpp
@@ -30,7 +30,7 @@
 
 #include "AudioBuffer.h"
 #include "AudioBufferCallback.h"
-#include <wtf/ArrayBuffer.h>
+#include <runtime/ArrayBuffer.h>
 #include <wtf/MainThread.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>

diff --git a/Source/WebCore/Modules/webaudio/AsyncAudioDecoder.h b/Source/WebCore/Modules/webaudio/AsyncAudioDecoder.h
index ced8058c0f60143d33351d4eca565abd8d7848a7..9cfa88e5ec0cb3e6f706bda264f0e9275d32fb2b 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AsyncAudioDecoder.h
+++ b/Source/WebCore/Modules/webaudio/AsyncAudioDecoder.h
@@ -32,6 +32,10 @@
 #include <wtf/RefPtr.h>
 #include <wtf/Threading.h>
 
+namespace JSC {
+class ArrayBuffer;
+}
+
 namespace WebCore {
 
 class AudioBuffer;
@@ -47,20 +51,20 @@ public:
     ~AsyncAudioDecoder();
 
     // Must be called on the main thread.
-    void decodeAsync(ArrayBuffer* audioData, float sampleRate, PassRefPtr<AudioBufferCallback> successCallback, PassRefPtr<AudioBufferCallback> errorCallback);
+    void decodeAsync(JSC::ArrayBuffer* audioData, float sampleRate, PassRefPtr<AudioBufferCallback> successCallback, PassRefPtr<AudioBufferCallback> errorCallback);
 
 private:
     class DecodingTask {
         WTF_MAKE_NONCOPYABLE(DecodingTask);
     public:
-        static PassOwnPtr<DecodingTask> create(ArrayBuffer* audioData, float sampleRate, PassRefPtr<AudioBufferCallback> successCallback, PassRefPtr<AudioBufferCallback> errorCallback);
+        static PassOwnPtr<DecodingTask> create(JSC::ArrayBuffer* audioData, float sampleRate, PassRefPtr<AudioBufferCallback> successCallback, PassRefPtr<AudioBufferCallback> errorCallback);
 
         void decode();
         
     private:
-        DecodingTask(ArrayBuffer* audioData, float sampleRate, PassRefPtr<AudioBufferCallback> successCallback, PassRefPtr<AudioBufferCallback> errorCallback);
+        DecodingTask(JSC::ArrayBuffer* audioData, float sampleRate, PassRefPtr<AudioBufferCallback> successCallback, PassRefPtr<AudioBufferCallback> errorCallback);
 
-        ArrayBuffer* audioData() { return m_audioData.get(); }
+        JSC::ArrayBuffer* audioData() { return m_audioData.get(); }
         float sampleRate() const { return m_sampleRate; }
         AudioBufferCallback* successCallback() { return m_successCallback.get(); }
         AudioBufferCallback* errorCallback() { return m_errorCallback.get(); }
@@ -69,7 +73,7 @@ private:
         static void notifyCompleteDispatch(void* userData);
         void notifyComplete();
 
-        RefPtr<ArrayBuffer> m_audioData;
+        RefPtr<JSC::ArrayBuffer> m_audioData;
         float m_sampleRate;
         RefPtr<AudioBufferCallback> m_successCallback;
         RefPtr<AudioBufferCallback> m_errorCallback;

diff --git a/Source/WebCore/Modules/webaudio/AudioBuffer.h b/Source/WebCore/Modules/webaudio/AudioBuffer.h
index 827df9ebb84e6e0a27bde2cd80150316eb067daf..1ca6766bc99e2a2af3998e2fde987a094b1ee09d 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioBuffer.h
+++ b/Source/WebCore/Modules/webaudio/AudioBuffer.h
@@ -29,7 +29,7 @@
 #ifndef AudioBuffer_h
 #define AudioBuffer_h
 
-#include <wtf/Float32Array.h>
+#include <runtime/Float32Array.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>

diff --git a/Source/WebCore/Modules/webaudio/AudioContext.cpp b/Source/WebCore/Modules/webaudio/AudioContext.cpp
index 2b4d17988a2af16221474485569cfab9efff3525..8a0e8d5b2b6150edcd24c4dfcc05b3fffc9b7ee6 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioContext.cpp
+++ b/Source/WebCore/Modules/webaudio/AudioContext.cpp
@@ -79,7 +79,7 @@
 #include "GStreamerUtilities.h"
 #endif
 
-#include <wtf/ArrayBuffer.h>
+#include <runtime/ArrayBuffer.h>
 #include <wtf/Atomics.h>
 #include <wtf/MainThread.h>
 #include <wtf/OwnPtr.h>

diff --git a/Source/WebCore/Modules/webaudio/AudioParam.h b/Source/WebCore/Modules/webaudio/AudioParam.h
index 524f98f07f8c2aae63903196c741fc2b94c48991..1e407ba0ba48513ea86453a7123c647bf5401663 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioParam.h
+++ b/Source/WebCore/Modules/webaudio/AudioParam.h
@@ -32,8 +32,8 @@
 #include "AudioContext.h"
 #include "AudioParamTimeline.h"
 #include "AudioSummingJunction.h"
+#include <runtime/Float32Array.h>
 #include <sys/types.h>
-#include <wtf/Float32Array.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>

diff --git a/Source/WebCore/Modules/webaudio/AudioParamTimeline.h b/Source/WebCore/Modules/webaudio/AudioParamTimeline.h
index c0a960870491308e7104409dad79486035dc1b11..e0e5a5dccb502bb373edbd07201b54defba46cea 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioParamTimeline.h
+++ b/Source/WebCore/Modules/webaudio/AudioParamTimeline.h
@@ -30,7 +30,7 @@
 #define AudioParamTimeline_h
 
 #include "AudioContext.h"
-#include <wtf/Float32Array.h>
+#include <runtime/Float32Array.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/Threading.h>

diff --git a/Source/WebCore/Modules/webaudio/PeriodicWave.h b/Source/WebCore/Modules/webaudio/PeriodicWave.h
index 3b6de68fe0e0fb32906b0f728426ab981b0790f6..1243d9080d2dcee66c063bd8717896c42a1bdff3 100644 (file)
--- a/Source/WebCore/Modules/webaudio/PeriodicWave.h
+++ b/Source/WebCore/Modules/webaudio/PeriodicWave.h
@@ -30,7 +30,7 @@
 #define PeriodicWave_h
 
 #include "AudioArray.h"
-#include <wtf/Float32Array.h>
+#include <runtime/Float32Array.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>

diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp b/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp
index 68163ce557a1fe1801912ea29fda7ed0c5822976..64a3cf3b94973103ce08ba0b91da27b2b61df1d5 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp
+++ b/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp
@@ -34,10 +34,10 @@
 #include "VectorMath.h"
 #include <algorithm>
 #include <complex>
-#include <wtf/Float32Array.h>
+#include <runtime/Float32Array.h>
+#include <runtime/Uint8Array.h>
 #include <wtf/MainThread.h>
 #include <wtf/MathExtras.h>
-#include <wtf/Uint8Array.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h b/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h
index 02ea05f5eeea5cfaef20653350df423f39a9c00b..1fbb68a5667d71aecd39f9535919709a3fb1a397 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h
+++ b/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h
@@ -30,6 +30,11 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 
+namespace JSC {
+class Float32Array;
+class Uint8Array;
+}
+
 namespace WebCore {
 
 class AudioBus;
@@ -57,9 +62,9 @@ public:
     void setSmoothingTimeConstant(float k) { m_smoothingTimeConstant = k; }
     float smoothingTimeConstant() const { return static_cast<float>(m_smoothingTimeConstant); }
 
-    void getFloatFrequencyData(Float32Array*);
-    void getByteFrequencyData(Uint8Array*);
-    void getByteTimeDomainData(Uint8Array*);
+    void getFloatFrequencyData(JSC::Float32Array*);
+    void getByteFrequencyData(JSC::Uint8Array*);
+    void getByteTimeDomainData(JSC::Uint8Array*);
 
     // The audio thread writes input data here.
     void writeInput(AudioBus*, size_t framesToProcess);

diff --git a/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp
index 4e36e8797a6edd92f71191c039040a9e1e83c896..ab1d2ee0fb2845f96b1a9df9514d50c3a2340762 100644 (file)
--- a/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp
+++ b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp
@@ -35,7 +35,7 @@
 #include "AudioNodeOutput.h"
 #include "AudioProcessingEvent.h"
 #include "Document.h"
-#include <wtf/Float32Array.h>
+#include <runtime/Float32Array.h>
 #include <wtf/MainThread.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/Modules/webaudio/WaveShaperProcessor.h b/Source/WebCore/Modules/webaudio/WaveShaperProcessor.h
index 5597a94c1e72743adf7f84abf28f274dcf390977..635ac75d94b23d31f8a9d69ca97547db1a932c11 100644 (file)
--- a/Source/WebCore/Modules/webaudio/WaveShaperProcessor.h
+++ b/Source/WebCore/Modules/webaudio/WaveShaperProcessor.h
@@ -28,7 +28,7 @@
 #include "AudioDSPKernel.h"
 #include "AudioDSPKernelProcessor.h"
 #include "AudioNode.h"
-#include <wtf/Float32Array.h>
+#include <runtime/Float32Array.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Threading.h>
 

diff --git a/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h b/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h
index 18d99a9f0aaf02d5e94f5d5e8ea4e83f53284baa..ff7283d857f8e2cde38cf02335849bb7be41efdd 100644 (file)
--- a/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h
+++ b/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h
@@ -37,6 +37,11 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/PassRefPtr.h>
 
+namespace JSC {
+class ArrayBuffer;
+class ArrayBufferView;
+}
+
 namespace WebCore {
 
 class Blob;
@@ -60,7 +65,7 @@ public:
     virtual String subprotocol() = 0; // Will be available after didConnect() callback is invoked.
     virtual String extensions() = 0; // Will be available after didConnect() callback is invoked.
     virtual SendResult send(const String& message) = 0;
-    virtual SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) = 0;
+    virtual SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength) = 0;
     virtual SendResult send(const Blob&) = 0;
     virtual unsigned long bufferedAmount() const = 0;
     virtual void close(int code, const String& reason) = 0;

diff --git a/Source/WebCore/Modules/websockets/WebSocket.cpp b/Source/WebCore/Modules/websockets/WebSocket.cpp
index b4b49c10e9494dd526dab81a59f07d9a991aee5e..5fa3d9f6a0d1c8df181f0d24290d58123f293409 100644 (file)
--- a/Source/WebCore/Modules/websockets/WebSocket.cpp
+++ b/Source/WebCore/Modules/websockets/WebSocket.cpp
@@ -54,8 +54,8 @@
 #include "SecurityOrigin.h"
 #include "ThreadableWebSocketChannel.h"
 #include "WebSocketChannel.h"
-#include <wtf/ArrayBuffer.h>
-#include <wtf/ArrayBufferView.h>
+#include <runtime/ArrayBuffer.h>
+#include <runtime/ArrayBufferView.h>
 #include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>

diff --git a/Source/WebCore/Modules/websockets/WebSocket.h b/Source/WebCore/Modules/websockets/WebSocket.h
index e647903155670ec9c907a5a9a241315d7cef6a83..9a582370ffd8640c401f2d37e1b9cd9abdf3bd3b 100644 (file)
--- a/Source/WebCore/Modules/websockets/WebSocket.h
+++ b/Source/WebCore/Modules/websockets/WebSocket.h
@@ -73,8 +73,8 @@ public:
     void connect(const String& url, const Vector<String>& protocols, ExceptionCode&);
 
     void send(const String& message, ExceptionCode&);
-    void send(ArrayBuffer*, ExceptionCode&);
-    void send(ArrayBufferView*, ExceptionCode&);
+    void send(JSC::ArrayBuffer*, ExceptionCode&);
+    void send(JSC::ArrayBufferView*, ExceptionCode&);
     void send(Blob*, ExceptionCode&);
 
     void close(int code, const String& reason, ExceptionCode&);

diff --git a/Source/WebCore/Modules/websockets/WebSocketChannel.cpp b/Source/WebCore/Modules/websockets/WebSocketChannel.cpp
index 5be99a912e597eb88e5995b3ea976ca197d091a0..34f4abe620f8e2ea3fc0d010b0109bbdaab15615 100644 (file)
--- a/Source/WebCore/Modules/websockets/WebSocketChannel.cpp
+++ b/Source/WebCore/Modules/websockets/WebSocketChannel.cpp
@@ -56,7 +56,7 @@
 #include "WebSocketChannelClient.h"
 #include "WebSocketHandshake.h"
 
-#include <wtf/ArrayBuffer.h>
+#include <runtime/ArrayBuffer.h>
 #include <wtf/Deque.h>
 #include <wtf/FastMalloc.h>
 #include <wtf/HashMap.h>

diff --git a/Source/WebCore/Modules/websockets/WebSocketChannel.h b/Source/WebCore/Modules/websockets/WebSocketChannel.h
index 170ab183ad483e99434919fe29dea103a6608592..f148cd91b081008f8baf5005fe09a49748371508 100644 (file)
--- a/Source/WebCore/Modules/websockets/WebSocketChannel.h
+++ b/Source/WebCore/Modules/websockets/WebSocketChannel.h
@@ -72,7 +72,7 @@ public:
     virtual String subprotocol() OVERRIDE;
     virtual String extensions() OVERRIDE;
     virtual ThreadableWebSocketChannel::SendResult send(const String& message) OVERRIDE;
-    virtual ThreadableWebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) OVERRIDE;
+    virtual ThreadableWebSocketChannel::SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength) OVERRIDE;
     virtual ThreadableWebSocketChannel::SendResult send(const Blob&) OVERRIDE;
     virtual unsigned long bufferedAmount() const OVERRIDE;
     virtual void close(int code, const String& reason) OVERRIDE; // Start closing handshake.

diff --git a/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp b/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp
index 567b97952252f43fd7c519da3f47c2324a266635..78b5b103a2425e9f6525a7c1186655cf4e6a9cfe 100644 (file)
--- a/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp
+++ b/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp
@@ -45,7 +45,7 @@
 #include "WorkerLoaderProxy.h"
 #include "WorkerRunLoop.h"
 #include "WorkerThread.h"
-#include <wtf/ArrayBuffer.h>
+#include <runtime/ArrayBuffer.h>
 #include <wtf/MainThread.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>

diff --git a/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h b/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h
index 24213435d13d6b550fa64dfb22c78fe6b6463033..419ac42d6bc39d86fb6cc2fb779fc1c69ef2dba0 100644 (file)
--- a/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h
+++ b/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h
@@ -66,7 +66,7 @@ public:
     virtual String subprotocol() OVERRIDE;
     virtual String extensions() OVERRIDE;
     virtual ThreadableWebSocketChannel::SendResult send(const String& message) OVERRIDE;
-    virtual ThreadableWebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) OVERRIDE;
+    virtual ThreadableWebSocketChannel::SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength) OVERRIDE;
     virtual ThreadableWebSocketChannel::SendResult send(const Blob&) OVERRIDE;
     virtual unsigned long bufferedAmount() const OVERRIDE;
     virtual void close(int code, const String& reason) OVERRIDE;
@@ -88,7 +88,7 @@ public:
 
         void connect(const KURL&, const String& protocol);
         void send(const String& message);
-        void send(const ArrayBuffer&);
+        void send(const JSC::ArrayBuffer&);
         void send(const Blob&);
         void bufferedAmount();
         void close(int code, const String& reason);
@@ -134,7 +134,7 @@ private:
         void initialize();
         void connect(const KURL&, const String& protocol);
         ThreadableWebSocketChannel::SendResult send(const String& message);
-        ThreadableWebSocketChannel::SendResult send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength);
+        ThreadableWebSocketChannel::SendResult send(const JSC::ArrayBuffer&, unsigned byteOffset, unsigned byteLength);
         ThreadableWebSocketChannel::SendResult send(const Blob&);
         unsigned long bufferedAmount();
         void close(int code, const String& reason);

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index 4f2c7073192fac41dc355c2f939a076c8765c93a..b1ff21697d65fa7d7d76151d22493e8d4bedeb4e 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -720,7 +720,7 @@ __ZN7WebCore21ResourceLoadSchedulerD2Ev
 __ZN7WebCore21SerializedScriptValue11deserializeEPK15OpaqueJSContextPPK13OpaqueJSValue
 __ZN7WebCore21SerializedScriptValue11deserializeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectEPN3WTF6VectorINS6_6RefPtrINS_11MessagePortEEELm1ENS6_15CrashOnOverflowEEENS_22SerializationErrorModeE
 __ZN7WebCore21SerializedScriptValue6createEPK15OpaqueJSContextPK13OpaqueJSValuePS6_
-__ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueEPN3WTF6VectorINS5_6RefPtrINS_11MessagePortEEELm1ENS5_15CrashOnOverflowEEEPNS6_INS7_INS5_11ArrayBufferEEELm1ESA_EENS_22SerializationErrorModeE
+__ZN7WebCore21SerializedScriptValue6createEPN3JSC9ExecStateENS1_7JSValueEPN3WTF6VectorINS5_6RefPtrINS_11MessagePortEEELm1ENS5_15CrashOnOverflowEEEPNS6_INS7_INS1_11ArrayBufferEEELm1ESA_EENS_22SerializationErrorModeE
 __ZN7WebCore21SerializedScriptValue6createERKN3WTF6StringE
 __ZN7WebCore21SerializedScriptValueC1ERN3WTF6VectorIhLm0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore21SerializedScriptValueD1Ev
@@ -907,7 +907,7 @@ __ZN7WebCore4PathC1Ev
 __ZN7WebCore4PathD1Ev
 __ZN7WebCore4coreEP20NSURLProtectionSpace
 __ZN7WebCore4coreEP28NSURLAuthenticationChallenge
-__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPN3WTF11ArrayBufferE
+__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS0_11ArrayBufferE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10ClientRectE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_13DOMStringListE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_14ClientRectListE

diff --git a/Source/WebCore/bindings/js/JSArrayBufferCustom.cpp b/Source/WebCore/bindings/js/JSArrayBufferCustom.cpp
index 2fa306a9d38c2c39b372e594a6f82829a463589e..dfd52ab78fcc67e7d2b463a05f65b6f407f60a25 100644 (file)
--- a/Source/WebCore/bindings/js/JSArrayBufferCustom.cpp
+++ b/Source/WebCore/bindings/js/JSArrayBufferCustom.cpp
@@ -27,8 +27,8 @@
 #include "JSArrayBuffer.h"
 
 #include "ExceptionCode.h"
+#include <runtime/ArrayBuffer.h>
 #include <runtime/Error.h>
-#include <wtf/ArrayBuffer.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/bindings/js/JSArrayBufferViewHelper.h b/Source/WebCore/bindings/js/JSArrayBufferViewHelper.h
index 9af3f8add7d6957b5ed0b9506575a3a4aa9b7526..87b6e4c917dc454879982e278889cca071efa0ce 100644 (file)
--- a/Source/WebCore/bindings/js/JSArrayBufferViewHelper.h
+++ b/Source/WebCore/bindings/js/JSArrayBufferViewHelper.h
@@ -32,12 +32,12 @@
 #include "JSDOMBinding.h"
 #include <interpreter/CallFrame.h>
 #include <runtime/ArgList.h>
+#include <runtime/ArrayBufferView.h>
 #include <runtime/Error.h>
 #include <runtime/JSCJSValue.h>
 #include <runtime/JSObject.h>
 #include <runtime/Operations.h>
-#include <wtf/ArrayBufferView.h>
-#include <wtf/TypedArrayBase.h>
+#include <runtime/TypedArrayBase.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/bindings/js/JSAudioContextCustom.cpp b/Source/WebCore/bindings/js/JSAudioContextCustom.cpp
index d73036ff91b10ee66e703d7ac3f650954732c6ed..ab68526ec6254d26e1c2fdb33f0f12dbf9bc7160 100644 (file)
--- a/Source/WebCore/bindings/js/JSAudioContextCustom.cpp
+++ b/Source/WebCore/bindings/js/JSAudioContextCustom.cpp
@@ -34,8 +34,8 @@
 #include "JSAudioContext.h"
 #include "JSOfflineAudioContext.h"
 #include "OfflineAudioContext.h"
+#include <runtime/ArrayBuffer.h>
 #include <runtime/Error.h>
-#include <wtf/ArrayBuffer.h>
 
 using namespace JSC;
 

diff --git a/Source/WebCore/bindings/js/JSCryptoCustom.cpp b/Source/WebCore/bindings/js/JSCryptoCustom.cpp
index a963a74687654a2ec8008d4fc37221831a9b5ba5..d9e92981a6a391c6998435e666849a1edb0be389 100644 (file)
--- a/Source/WebCore/bindings/js/JSCryptoCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCryptoCustom.cpp
@@ -28,8 +28,8 @@
 #include "ExceptionCode.h"
 #include "JSArrayBufferView.h"
 
+#include <runtime/ArrayBufferView.h>
 #include <runtime/Error.h>
-#include <wtf/ArrayBufferView.h>
 
 using namespace JSC;
 

diff --git a/Source/WebCore/bindings/js/JSDictionary.h b/Source/WebCore/bindings/js/JSDictionary.h
index 1f8684ff0c13751cb1b7ff028ea8049ef6084f06..0519fe265dfe094452cd6a23a91fa223410acb54 100644 (file)
--- a/Source/WebCore/bindings/js/JSDictionary.h
+++ b/Source/WebCore/bindings/js/JSDictionary.h
@@ -119,7 +119,7 @@ private:
 #endif
     static void convertValue(JSC::ExecState*, JSC::JSValue, HashSet<AtomicString>& result);
     static void convertValue(JSC::ExecState*, JSC::JSValue, ArrayValue& result);
-    static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<Uint8Array>& result);
+    static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<JSC::Uint8Array>& result);
 #if ENABLE(ENCRYPTED_MEDIA)
     static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaKeyError>& result);
 #endif

diff --git a/Source/WebCore/bindings/js/JSFileReaderCustom.cpp b/Source/WebCore/bindings/js/JSFileReaderCustom.cpp
index 8b493ca1769f2ed997a9e50557f0c54d54032c37..e851219afa7488b33591f46cba64d803a5091794 100644 (file)
--- a/Source/WebCore/bindings/js/JSFileReaderCustom.cpp
+++ b/Source/WebCore/bindings/js/JSFileReaderCustom.cpp
@@ -36,7 +36,7 @@
 
 #include "FileReader.h"
 #include "JSArrayBuffer.h"
-#include <wtf/ArrayBuffer.h>
+#include <runtime/ArrayBuffer.h>
 
 using namespace JSC;
 

diff --git a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
index 5ed53e7b53d29304db33aedc279210e20113e10c..22bf1aac7c1206942f57ef2ae2edefb6d45ad2e0 100644 (file)
--- a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
+++ b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
@@ -85,11 +85,11 @@
 #include "WebGLRenderingContext.h"
 #include "WebGLVertexArrayObjectOES.h"
 #include <runtime/Error.h>
+#include <runtime/Float32Array.h>
+#include <runtime/Int32Array.h>
 #include <runtime/JSArray.h>
+#include <runtime/Uint32Array.h>
 #include <wtf/FastMalloc.h>
-#include <wtf/Float32Array.h>
-#include <wtf/Int32Array.h>
-#include <wtf/Uint32Array.h>
 
 #if ENABLE(VIDEO)
 #include "HTMLVideoElement.h"

diff --git a/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp b/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
index 2b799c50eebc0b1c49324d56ec19aa9aefd00e6b..8dd8bf55922f654475945b04ac142c85942a6add 100644 (file)
--- a/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
+++ b/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
@@ -48,8 +48,8 @@
 #include "JSEventListener.h"
 #include "XMLHttpRequest.h"
 #include <interpreter/StackIterator.h>
+#include <runtime/ArrayBuffer.h>
 #include <runtime/Error.h>
-#include <wtf/ArrayBuffer.h>
 
 using namespace JSC;
 

diff --git a/Source/WebCore/bindings/js/SerializedScriptValue.cpp b/Source/WebCore/bindings/js/SerializedScriptValue.cpp
index 126a04bfba119445841587985a35852f4a70e98e..382cb27eb3ed4b2b053d2e5a6871cd5714ac0d3c 100644 (file)
--- a/Source/WebCore/bindings/js/SerializedScriptValue.cpp
+++ b/Source/WebCore/bindings/js/SerializedScriptValue.cpp
@@ -58,6 +58,7 @@
 #include <limits>
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/APIShims.h>
+#include <runtime/ArrayBuffer.h>
 #include <runtime/BooleanObject.h>
 #include <runtime/DateInstance.h>
 #include <runtime/Error.h>
@@ -67,9 +68,8 @@
 #include <runtime/PropertyNameArray.h>
 #include <runtime/RegExp.h>
 #include <runtime/RegExpObject.h>
-#include <wtf/ArrayBuffer.h>
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/HashTraits.h>
-#include <wtf/Uint8ClampedArray.h>
 #include <wtf/Vector.h>
 
 using namespace JSC;
@@ -978,7 +978,7 @@ SerializationReturnCode CloneSerializer::serialize(JSValue in)
     return SuccessfullyCompleted;
 }
 
-typedef Vector<WTF::ArrayBufferContents> ArrayBufferContentsArray;
+typedef Vector<JSC::ArrayBufferContents> ArrayBufferContentsArray;
 
 class CloneDeserializer : CloneBase {
 public:
@@ -1777,7 +1777,7 @@ PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValu
     Vector<RefPtr<DOMWrapperWorld> > worlds;
     static_cast<WebCoreJSClientData*>(exec->vm().clientData)->getAllWorlds(worlds);
 
-    HashSet<WTF::ArrayBuffer*> visited;
+    HashSet<JSC::ArrayBuffer*> visited;
     for (size_t arrayBufferIndex = 0; arrayBufferIndex < arrayBuffers.size(); arrayBufferIndex++) {
         Vector<RefPtr<ArrayBufferView> > neuteredViews;
 

diff --git a/Source/WebCore/bindings/js/SerializedScriptValue.h b/Source/WebCore/bindings/js/SerializedScriptValue.h
index d3cd8808d846b3e77c80035066de5f54c7a077c9..61112e7c685009e674f6370437824b6b32a44736 100644 (file)
--- a/Source/WebCore/bindings/js/SerializedScriptValue.h
+++ b/Source/WebCore/bindings/js/SerializedScriptValue.h
@@ -29,8 +29,8 @@
 
 #include "ScriptState.h"
 #include <heap/Strong.h>
+#include <runtime/ArrayBuffer.h>
 #include <runtime/JSCJSValue.h>
-#include <wtf/ArrayBuffer.h>
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -43,7 +43,7 @@ namespace WebCore {
 
 class MessagePort;
 typedef Vector<RefPtr<MessagePort>, 1> MessagePortArray;
-typedef Vector<RefPtr<WTF::ArrayBuffer>, 1> ArrayBufferArray;
+typedef Vector<RefPtr<JSC::ArrayBuffer>, 1> ArrayBufferArray;
  
 enum SerializationReturnCode {
     SuccessfullyCompleted,
@@ -113,7 +113,7 @@ public:
     ~SerializedScriptValue();
 
 private:
-    typedef Vector<WTF::ArrayBufferContents> ArrayBufferContentsArray;
+    typedef Vector<JSC::ArrayBufferContents> ArrayBufferContentsArray;
     static void maybeThrowExceptionIfSerializationFailed(JSC::ExecState*, SerializationReturnCode);
     static bool serializationDidCompleteSuccessfully(SerializationReturnCode);
     static PassOwnPtr<ArrayBufferContentsArray> transferArrayBuffers(JSC::ExecState*, ArrayBufferArray&, SerializationReturnCode&);

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 0f28f6ee5292b422e40c5df61faa3bcf61e0d572..6d5892d79567f39fb89639058e26fae028fcd725 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -226,7 +226,7 @@ sub AddIncludesForType
     } elsif ($isCallback && $codeGenerator->IsWrapperType($type)) {
         $includesRef->{"JS${type}.h"} = 1;
     } elsif ($codeGenerator->IsTypedArrayType($type)) {
-        $includesRef->{"<wtf/${type}.h>"} = 1;
+        $includesRef->{"<runtime/${type}.h>"} = 1;
     } else {
         # default, include the same named file
         $includesRef->{"${type}.h"} = 1;
@@ -683,7 +683,7 @@ sub GenerateHeader
 
     if ($hasParent && $interface->extendedAttributes->{"JSGenerateToNativeObject"}) {
         if ($codeGenerator->IsTypedArrayType($interfaceName)) {
-            $headerIncludes{"<wtf/$interfaceName.h>"} = 1;
+            $headerIncludes{"<runtime/$interfaceName.h>"} = 1;
         } else {
             $headerIncludes{"$interfaceName.h"} = 1;
         }
@@ -3612,7 +3612,7 @@ sub NativeToJSValue
         # Default, include header with same name.
         AddToImplIncludes("JS$type.h", $conditional);
         if ($codeGenerator->IsTypedArrayType($type)) {
-            AddToImplIncludes("<wtf/$type.h>", $conditional) if not $codeGenerator->SkipIncludeHeader($type);
+            AddToImplIncludes("<runtime/$type.h>", $conditional) if not $codeGenerator->SkipIncludeHeader($type);
         } else {
             AddToImplIncludes("$type.h", $conditional) if not $codeGenerator->SkipIncludeHeader($type);
         }

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.cpp b/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.cpp
index 827b6badeb73be4bfefc9b0319386cd43fb0e388..0152f8bd354b0a8d02427adb4a77fcaf9eef041f 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.cpp
@@ -27,10 +27,10 @@
 #include "JSFloat32Array.h"
 #include "JSInt32Array.h"
 #include <runtime/Error.h>
+#include <runtime/Float64Array.h>
+#include <runtime/Int32Array.h>
 #include <runtime/PropertyNameArray.h>
-#include <wtf/Float64Array.h>
 #include <wtf/GetPtr.h>
-#include <wtf/Int32Array.h>
 
 using namespace JSC;
 

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.h b/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.h
index 1d7dfd73e304245bb66f11f4512fe77afd117d4a..f349c4d820decf205326ab253197cc3eae830fe9 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSFloat64Array.h
@@ -23,8 +23,8 @@
 
 #include "JSArrayBufferView.h"
 #include "JSDOMBinding.h"
+#include <runtime/Float64Array.h>
 #include <runtime/JSObject.h>
-#include <wtf/Float64Array.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
index dca6a591f4269e8d7a508f74d284a5d9f8caf9c8..9b06baa8c14c885fdf2e518cd8edcd0c14164ade 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
@@ -54,9 +54,9 @@
 #include "TestObj.h"
 #include "bool.h"
 #include <runtime/Error.h>
+#include <runtime/Float32Array.h>
 #include <runtime/JSArray.h>
 #include <runtime/JSString.h>
-#include <wtf/Float32Array.h>
 #include <wtf/GetPtr.h>
 
 #if ENABLE(Condition1)

diff --git a/Source/WebCore/bridge/qt/qt_runtime.cpp b/Source/WebCore/bridge/qt/qt_runtime.cpp
index d382462ac320770a3ad5054cc0e9ffb80860df03..a48151f64bdb1c03171a88a9ab75b9040a9aa45b 100644 (file)
--- a/Source/WebCore/bridge/qt/qt_runtime.cpp
+++ b/Source/WebCore/bridge/qt/qt_runtime.cpp
@@ -494,7 +494,7 @@ QVariant convertValueToQVariant(JSContextRef context, JSValueRef value, QMetaTyp
 
         case QMetaType::QByteArray: {
             if (type == RTUint8Array) {
-                WTF::Uint8Array* arr = toUint8Array(toJS(toJS(context), value));
+                JSC::Uint8Array* arr = toUint8Array(toJS(toJS(context), value));
                 ret = QVariant(QByteArray(reinterpret_cast<const char*>(arr->data()), arr->length()));
                 dist = 0;
             } else {
@@ -729,7 +729,7 @@ JSValueRef convertQVariantToValue(JSContextRef context, PassRefPtr<RootObject> r
 
     if (type == QMetaType::QByteArray) {
         QByteArray qtByteArray = variant.value<QByteArray>();
-        WTF::RefPtr<WTF::Uint8ClampedArray> wtfByteArray = WTF::Uint8ClampedArray::createUninitialized(qtByteArray.length());
+        WTF::RefPtr<JSC::Uint8ClampedArray> wtfByteArray = JSC::Uint8ClampedArray::createUninitialized(qtByteArray.length());
         memcpy(wtfByteArray->data(), qtByteArray.constData(), qtByteArray.length());
         ExecState* exec = toJS(context);
         APIEntryShim entryShim(exec);

diff --git a/Source/WebCore/dom/MessageEvent.h b/Source/WebCore/dom/MessageEvent.h
index 6598efb7fb60e3d0637e2d12736bb9aba2110f12..f04fbb2d33888086b5dfd8824c4e0faef2a9acd3 100644 (file)
--- a/Source/WebCore/dom/MessageEvent.h
+++ b/Source/WebCore/dom/MessageEvent.h
@@ -34,7 +34,7 @@
 #include "MessagePort.h"
 #include "ScriptValue.h"
 #include "SerializedScriptValue.h"
-#include <wtf/ArrayBuffer.h>
+#include <runtime/ArrayBuffer.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/fileapi/FileReader.cpp b/Source/WebCore/fileapi/FileReader.cpp
index bf8c33d96d386a91599e360d1a0a07cb5066717f..f696775b3b8d5dc026d3f12050d6b39a729908bf 100644 (file)
--- a/Source/WebCore/fileapi/FileReader.cpp
+++ b/Source/WebCore/fileapi/FileReader.cpp
@@ -40,7 +40,7 @@
 #include "Logging.h"
 #include "ProgressEvent.h"
 #include "ScriptExecutionContext.h"
-#include <wtf/ArrayBuffer.h>
+#include <runtime/ArrayBuffer.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/text/CString.h>
 

diff --git a/Source/WebCore/fileapi/FileReader.h b/Source/WebCore/fileapi/FileReader.h
index 7f2133de08a1e1471cba9c3dfe0e79940403e3a1..c20f97a9fbf3df93a254c53b0c3ea59031cbc925 100644 (file)
--- a/Source/WebCore/fileapi/FileReader.h
+++ b/Source/WebCore/fileapi/FileReader.h
@@ -42,6 +42,10 @@
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
 
+namespace JSC {
+class ArrayBuffer;
+}
+
 namespace WebCore {
 
 class Blob;
@@ -73,7 +77,7 @@ public:
     ReadyState readyState() const { return m_state; }
     PassRefPtr<FileError> error() { return m_error; }
     FileReaderLoader::ReadType readType() const { return m_readType; }
-    PassRefPtr<ArrayBuffer> arrayBufferResult() const;
+    PassRefPtr<JSC::ArrayBuffer> arrayBufferResult() const;
     String stringResult();
 
     // EventTarget

diff --git a/Source/WebCore/fileapi/FileReaderLoader.cpp b/Source/WebCore/fileapi/FileReaderLoader.cpp
index 77c05fe813b78704da43f93ca2a9502e42a355d4..2447c30ea514afc8af225b4ea6ef04c22da57ceb 100644 (file)
--- a/Source/WebCore/fileapi/FileReaderLoader.cpp
+++ b/Source/WebCore/fileapi/FileReaderLoader.cpp
@@ -43,7 +43,7 @@
 #include "TextResourceDecoder.h"
 #include "ThreadableBlobRegistry.h"
 #include "ThreadableLoader.h"
-#include <wtf/ArrayBuffer.h>
+#include <runtime/ArrayBuffer.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>

diff --git a/Source/WebCore/fileapi/FileReaderLoader.h b/Source/WebCore/fileapi/FileReaderLoader.h
index ec1bdfdb2d512957a383be65adf1a5ffa9869d78..24f1e7f1bda86a3477718f171af072cbec9f9535 100644 (file)
--- a/Source/WebCore/fileapi/FileReaderLoader.h
+++ b/Source/WebCore/fileapi/FileReaderLoader.h
@@ -40,6 +40,10 @@
 #include <wtf/Forward.h>
 #include <wtf/text/WTFString.h>
 
+namespace JSC {
+class ArrayBuffer;
+}
+
 namespace WebCore {
 
 class Blob;
@@ -72,7 +76,7 @@ public:
     virtual void didFail(const ResourceError&);
 
     String stringResult();
-    PassRefPtr<ArrayBuffer> arrayBufferResult() const;
+    PassRefPtr<JSC::ArrayBuffer> arrayBufferResult() const;
 #if ENABLE(STREAM)
     PassRefPtr<Blob> blobResult();
 #endif // ENABLE(STREAM)
@@ -105,7 +109,7 @@ private:
     KURL m_urlForReading;
     RefPtr<ThreadableLoader> m_loader;
 
-    RefPtr<ArrayBuffer> m_rawData;
+    RefPtr<JSC::ArrayBuffer> m_rawData;
     bool m_isRawDataConverted;
 
     String m_stringResult;

diff --git a/Source/WebCore/fileapi/FileReaderSync.cpp b/Source/WebCore/fileapi/FileReaderSync.cpp
index 79e5200ea7afbdcce9722a8f1ff2651c08b4b574..2d53afd1b9e7218b52d335280960162db643b1b2 100644 (file)
--- a/Source/WebCore/fileapi/FileReaderSync.cpp
+++ b/Source/WebCore/fileapi/FileReaderSync.cpp
@@ -38,7 +38,7 @@
 #include "BlobURL.h"
 #include "FileException.h"
 #include "FileReaderLoader.h"
-#include <wtf/ArrayBuffer.h>
+#include <runtime/ArrayBuffer.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/fileapi/FileReaderSync.h b/Source/WebCore/fileapi/FileReaderSync.h
index 9fe5c3003b5de78b3312c8b03fc8e772c94c49dd..50140efcdd60d6598543ffc7ecbb3bd7806a0188 100644 (file)
--- a/Source/WebCore/fileapi/FileReaderSync.h
+++ b/Source/WebCore/fileapi/FileReaderSync.h
@@ -37,6 +37,10 @@
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
 
+namespace JSC {
+class ArrayBuffer;
+}
+
 namespace WebCore {
 
 class Blob;
@@ -54,7 +58,7 @@ public:
 
     virtual ~FileReaderSync() { }
 
-    PassRefPtr<ArrayBuffer> readAsArrayBuffer(ScriptExecutionContext*, Blob*, ExceptionCode&);
+    PassRefPtr<JSC::ArrayBuffer> readAsArrayBuffer(ScriptExecutionContext*, Blob*, ExceptionCode&);
     String readAsBinaryString(ScriptExecutionContext*, Blob*, ExceptionCode&);
     String readAsText(ScriptExecutionContext* scriptExecutionContext, Blob* blob, ExceptionCode& ec)
     {

diff --git a/Source/WebCore/fileapi/WebKitBlobBuilder.cpp b/Source/WebCore/fileapi/WebKitBlobBuilder.cpp
index 1622e2fe42b0b93ab90d83f1df1a4741fe43c1bf..4b3a2ea7aaf16297b5599db8ff0766b3cb99b58b 100644 (file)
--- a/Source/WebCore/fileapi/WebKitBlobBuilder.cpp
+++ b/Source/WebCore/fileapi/WebKitBlobBuilder.cpp
@@ -40,8 +40,8 @@
 #include "LineEnding.h"
 #include "ScriptCallStack.h"
 #include "TextEncoding.h"
-#include <wtf/ArrayBuffer.h>
-#include <wtf/ArrayBufferView.h>
+#include <runtime/ArrayBuffer.h>
+#include <runtime/ArrayBufferView.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/AtomicString.h>

diff --git a/Source/WebCore/fileapi/WebKitBlobBuilder.h b/Source/WebCore/fileapi/WebKitBlobBuilder.h
index 335bc766dea5d62b9e704675b1fa8d00f572e47c..bccc27802012de3092c9515c2faefeedf9c4dbbb 100644 (file)
--- a/Source/WebCore/fileapi/WebKitBlobBuilder.h
+++ b/Source/WebCore/fileapi/WebKitBlobBuilder.h
@@ -34,6 +34,11 @@
 #include "BlobData.h"
 #include <wtf/Forward.h>
 
+namespace JSC {
+class ArrayBuffer;
+class ArrayBufferView;
+}
+
 namespace WebCore {
 
 // FIXME: Move this file to BlobBuilder.h
@@ -50,8 +55,8 @@ public:
     void append(Blob*);
     void append(const String& text, const String& ending);
 #if ENABLE(BLOB)
-    void append(ArrayBuffer*);
-    void append(ArrayBufferView*);
+    void append(JSC::ArrayBuffer*);
+    void append(JSC::ArrayBufferView*);
 #endif
 
     PassRefPtr<Blob> getBlob(const String& contentType);

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index 3a9a6d932c6f6027b3bb24b405ed84b5fedaaaf6..9632493bb53d1eb763a2ebcaf6ce110f48375a46 100644 (file)
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -80,10 +80,10 @@
 #include "ShadowRoot.h"
 #include "TimeRanges.h"
 #include <limits>
+#include <runtime/Uint8Array.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/NonCopyingSort.h>
-#include <wtf/Uint8Array.h>
 #include <wtf/text/CString.h>
 
 #if USE(ACCELERATED_COMPOSITING)

diff --git a/Source/WebCore/html/ImageData.h b/Source/WebCore/html/ImageData.h
index 761687063a55e545fbcddc68fb0892f49e49ca9a..80b3eb0cdfb6f890ac203d436fb568afa6025aa0 100644 (file)
--- a/Source/WebCore/html/ImageData.h
+++ b/Source/WebCore/html/ImageData.h
@@ -30,9 +30,9 @@
 #define ImageData_h
 
 #include "IntSize.h"
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
-#include <wtf/Uint8ClampedArray.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/html/MediaKeyError.h b/Source/WebCore/html/MediaKeyError.h
index 49e3843e328b390878e65e12c11e0695d9718d82..48eb26dff09ac5d6d86f4bed7d3eab8c7c7b5146 100644 (file)
--- a/Source/WebCore/html/MediaKeyError.h
+++ b/Source/WebCore/html/MediaKeyError.h
@@ -28,6 +28,7 @@
 
 #if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
 
+#include <runtime/Uint8Array.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 

diff --git a/Source/WebCore/html/MediaKeyEvent.cpp b/Source/WebCore/html/MediaKeyEvent.cpp
index 2f62dbc4909eb23e31c9c7577f8c243e2222b7c7..03b2512de99190789ab10757ff2a80306264db60 100644 (file)
--- a/Source/WebCore/html/MediaKeyEvent.cpp
+++ b/Source/WebCore/html/MediaKeyEvent.cpp
@@ -30,7 +30,7 @@
 #include "MediaKeyEvent.h"
 
 #include "EventNames.h"
-#include <wtf/Uint8Array.h>
+#include <runtime/Uint8Array.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/html/canvas/ArrayBuffer.idl b/Source/WebCore/html/canvas/ArrayBuffer.idl
index 0f70af64da17cf30d00f4dbaad5f09b695ff66f4..8363137a8a61d661fa99f449ae10be078ab615e0 100644 (file)
--- a/Source/WebCore/html/canvas/ArrayBuffer.idl
+++ b/Source/WebCore/html/canvas/ArrayBuffer.idl
@@ -28,7 +28,7 @@
     GenerateIsReachable=Impl,
     CustomConstructor(unsigned long length),
     JSNoStaticTables,
-    ImplementationNamespace=WTF,
+    ImplementationNamespace=JSC,
     ImplementationLacksVTable
 ] interface ArrayBuffer {
     readonly attribute unsigned long byteLength;

diff --git a/Source/WebCore/html/canvas/ArrayBufferView.idl b/Source/WebCore/html/canvas/ArrayBufferView.idl
index 3d6fae2a40e8b5399da1e57a8a44635a3026e44c..fc61a5e827f086bde2d3e9cee2f53a0390f17fa0 100644 (file)
--- a/Source/WebCore/html/canvas/ArrayBufferView.idl
+++ b/Source/WebCore/html/canvas/ArrayBufferView.idl
@@ -26,7 +26,7 @@
 [
     CustomToJSObject,
     JSNoStaticTables,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface ArrayBufferView {
     readonly attribute ArrayBuffer buffer;
     readonly attribute unsigned long byteOffset;

diff --git a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index caae0ba2568e50e3f6b06ddb1cd5f9d62e29dfd3..851c034cd71080aa4cb45cc43e45c1d5dd241430 100644 (file)
--- a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -62,10 +62,11 @@
 #include "RenderLayer.h"
 #endif
 
+#include <runtime/Uint8ClampedArray.h>
+
 #include <wtf/CheckedArithmetic.h>
 #include <wtf/MathExtras.h>
 #include <wtf/OwnPtr.h>
-#include <wtf/Uint8ClampedArray.h>
 #include <wtf/text/StringBuilder.h>
 
 #if USE(CG)

diff --git a/Source/WebCore/html/canvas/DataView.h b/Source/WebCore/html/canvas/DataView.h
index 00d56d8f187f9f96e7fd0b7458b7d24840bd5042..00dd6e4ca088d1e8975c769efcda8712a1c04290 100644 (file)
--- a/Source/WebCore/html/canvas/DataView.h
+++ b/Source/WebCore/html/canvas/DataView.h
@@ -26,7 +26,7 @@
 #ifndef DataView_h
 #define DataView_h
 
-#include <wtf/ArrayBufferView.h>
+#include <runtime/ArrayBufferView.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/html/canvas/Float32Array.idl b/Source/WebCore/html/canvas/Float32Array.idl
index ac258d55561c5c59c0fdf3e643619ab3752d61ae..833d0111aaea98725a630e98ea0b0c44965cd85d 100644 (file)
--- a/Source/WebCore/html/canvas/Float32Array.idl
+++ b/Source/WebCore/html/canvas/Float32Array.idl
@@ -33,7 +33,7 @@
     CustomToJSObject,
     DoNotCheckConstants,
     TypedArray=float,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface Float32Array : ArrayBufferView {
     const unsigned long BYTES_PER_ELEMENT = 4;
 

diff --git a/Source/WebCore/html/canvas/Float64Array.idl b/Source/WebCore/html/canvas/Float64Array.idl
index dee44f6c40aa502da71f791208d62bdbb5be54af..c98c032cc0bffcc8e578123487a213f62630ba1e 100644 (file)
--- a/Source/WebCore/html/canvas/Float64Array.idl
+++ b/Source/WebCore/html/canvas/Float64Array.idl
@@ -33,7 +33,7 @@
     CustomToJSObject,
     DoNotCheckConstants,
     TypedArray=double,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface Float64Array : ArrayBufferView {
     const unsigned long BYTES_PER_ELEMENT = 8;
 

diff --git a/Source/WebCore/html/canvas/Int16Array.idl b/Source/WebCore/html/canvas/Int16Array.idl
index 0576460db602dbf468b1fc4b9e6d27a926e921b4..433f36f729da62c53ec677edf97e87289733630e 100644 (file)
--- a/Source/WebCore/html/canvas/Int16Array.idl
+++ b/Source/WebCore/html/canvas/Int16Array.idl
@@ -32,7 +32,7 @@
     CustomToJSObject,
     DoNotCheckConstants,
     TypedArray=short,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface Int16Array : ArrayBufferView {
     const unsigned long BYTES_PER_ELEMENT = 2;
 

diff --git a/Source/WebCore/html/canvas/Int32Array.idl b/Source/WebCore/html/canvas/Int32Array.idl
index d867e65dd29d00d41e4ba7ab96fd4d31a72e7f0c..53a70b7261dd51f556f05bcfd616e3dc7a391c8c 100644 (file)
--- a/Source/WebCore/html/canvas/Int32Array.idl
+++ b/Source/WebCore/html/canvas/Int32Array.idl
@@ -33,7 +33,7 @@
     CustomToJSObject,
     DoNotCheckConstants,
     TypedArray=int,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface Int32Array : ArrayBufferView {
     const unsigned long BYTES_PER_ELEMENT = 4;
 

diff --git a/Source/WebCore/html/canvas/Int8Array.idl b/Source/WebCore/html/canvas/Int8Array.idl
index 6cb20a146e36924011d9d874acfc7a506e39c3b6..5db02ad3298904a075684fd32138eaeb491fe3e5 100644 (file)
--- a/Source/WebCore/html/canvas/Int8Array.idl
+++ b/Source/WebCore/html/canvas/Int8Array.idl
@@ -33,7 +33,7 @@
     CustomToJSObject,
     DoNotCheckConstants,
     TypedArray=signed char,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface Int8Array : ArrayBufferView {
     const unsigned long BYTES_PER_ELEMENT = 1;
 

diff --git a/Source/WebCore/html/canvas/Uint16Array.idl b/Source/WebCore/html/canvas/Uint16Array.idl
index 708cdb3015b736bf90e81653773f0fc19f78dc8f..8292b3b9d422ce7fef50cdc2cbcc2dcb7c1bff97 100644 (file)
--- a/Source/WebCore/html/canvas/Uint16Array.idl
+++ b/Source/WebCore/html/canvas/Uint16Array.idl
@@ -33,7 +33,7 @@
     CustomToJSObject,
     DoNotCheckConstants,
     TypedArray=unsigned short,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface Uint16Array : ArrayBufferView {
     const unsigned long BYTES_PER_ELEMENT = 2;
 

diff --git a/Source/WebCore/html/canvas/Uint32Array.idl b/Source/WebCore/html/canvas/Uint32Array.idl
index 643c092de3ab18a9586b6758e6446cc3c3ac986c..b5c055d4312d937d3cb6339515e2371b5ac52733 100644 (file)
--- a/Source/WebCore/html/canvas/Uint32Array.idl
+++ b/Source/WebCore/html/canvas/Uint32Array.idl
@@ -33,7 +33,7 @@
     CustomToJSObject,
     DoNotCheckConstants,
     TypedArray=unsigned int,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface Uint32Array : ArrayBufferView {
     const unsigned long BYTES_PER_ELEMENT = 4;
 

diff --git a/Source/WebCore/html/canvas/Uint8Array.idl b/Source/WebCore/html/canvas/Uint8Array.idl
index daf3f80573030e2f86f1a4575b329589ce04171b..2416a47df648b3787201e938d6c49090c6fa2ebf 100644 (file)
--- a/Source/WebCore/html/canvas/Uint8Array.idl
+++ b/Source/WebCore/html/canvas/Uint8Array.idl
@@ -33,7 +33,7 @@
     CustomToJSObject,
     DoNotCheckConstants,
     TypedArray=unsigned char,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface Uint8Array : ArrayBufferView {
     const unsigned long BYTES_PER_ELEMENT = 1;
 

diff --git a/Source/WebCore/html/canvas/Uint8ClampedArray.idl b/Source/WebCore/html/canvas/Uint8ClampedArray.idl
index b17f13572ceb950f5567bf82cc077be4febd0f8f..5a9995e80834886ecc43d73069e9a8d0862fa7b6 100644 (file)
--- a/Source/WebCore/html/canvas/Uint8ClampedArray.idl
+++ b/Source/WebCore/html/canvas/Uint8ClampedArray.idl
@@ -33,7 +33,7 @@
     CustomToJSObject,
     DoNotCheckConstants,
     TypedArray=unsigned char,
-    ImplementationNamespace=WTF
+    ImplementationNamespace=JSC
 ] interface Uint8ClampedArray : Uint8Array {
     const unsigned long BYTES_PER_ELEMENT = 1;
 

diff --git a/Source/WebCore/html/canvas/WebGLBuffer.h b/Source/WebCore/html/canvas/WebGLBuffer.h
index 0512450d762dcaa4e129ba9b7631cf39f923a6d0..9465b674ad868049e05453db84e171f32422cab9 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLBuffer.h
+++ b/Source/WebCore/html/canvas/WebGLBuffer.h
@@ -30,6 +30,11 @@
 
 #include <wtf/Forward.h>
 
+namespace JSC {
+class ArrayBuffer;
+class ArrayBufferView;
+}
+
 namespace WebCore {
 
 class WebGLBuffer : public WebGLSharedObject {
@@ -39,13 +44,13 @@ public:
     static PassRefPtr<WebGLBuffer> create(WebGLRenderingContext*);
 
     bool associateBufferData(GC3Dsizeiptr size);
-    bool associateBufferData(ArrayBuffer*);
-    bool associateBufferData(ArrayBufferView*);
-    bool associateBufferSubData(GC3Dintptr offset, ArrayBuffer*);
-    bool associateBufferSubData(GC3Dintptr offset, ArrayBufferView*);
+    bool associateBufferData(JSC::ArrayBuffer*);
+    bool associateBufferData(JSC::ArrayBufferView*);
+    bool associateBufferSubData(GC3Dintptr offset, JSC::ArrayBuffer*);
+    bool associateBufferSubData(GC3Dintptr offset, JSC::ArrayBufferView*);
 
     GC3Dsizeiptr byteLength() const;
-    const ArrayBuffer* elementArrayBuffer() const { return m_elementArrayBuffer.get(); }
+    const JSC::ArrayBuffer* elementArrayBuffer() const { return m_elementArrayBuffer.get(); }
 
     // Gets the cached max index for the given type. Returns -1 if
     // none has been set.
@@ -68,7 +73,7 @@ private:
 
     GC3Denum m_target;
 
-    RefPtr<ArrayBuffer> m_elementArrayBuffer;
+    RefPtr<JSC::ArrayBuffer> m_elementArrayBuffer;
     GC3Dsizeiptr m_byteLength;
 
     // Optimization for index validation. For each type of index

diff --git a/Source/WebCore/html/canvas/WebGLGetInfo.cpp b/Source/WebCore/html/canvas/WebGLGetInfo.cpp
index f7166c41932dc3476d8b5c2e11a3ec42e4425b1d..8e27d3b9a1120a76f7c30ac01e1b804bd06626f2 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLGetInfo.cpp
+++ b/Source/WebCore/html/canvas/WebGLGetInfo.cpp
@@ -36,10 +36,10 @@
 #include "WebGLRenderbuffer.h"
 #include "WebGLTexture.h"
 #include "WebGLVertexArrayObjectOES.h"
-#include <wtf/Float32Array.h>
-#include <wtf/Int32Array.h>
-#include <wtf/Uint32Array.h>
-#include <wtf/Uint8Array.h>
+#include <runtime/Float32Array.h>
+#include <runtime/Int32Array.h>
+#include <runtime/Uint32Array.h>
+#include <runtime/Uint8Array.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/html/canvas/WebGLGetInfo.h b/Source/WebCore/html/canvas/WebGLGetInfo.h
index 7f9b04266a0ea66785b0bc91b60fba8e1bf445e4..082612ac9e1c872810a89612869a5557e795faf2 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLGetInfo.h
+++ b/Source/WebCore/html/canvas/WebGLGetInfo.h
@@ -33,12 +33,12 @@
 #include "WebGLRenderbuffer.h"
 #include "WebGLTexture.h"
 #include "WebGLVertexArrayObjectOES.h"
-#include <wtf/Float32Array.h>
-#include <wtf/Int32Array.h>
+#include <runtime/Float32Array.h>
+#include <runtime/Int32Array.h>
+#include <runtime/Uint32Array.h>
+#include <runtime/Uint8Array.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
-#include <wtf/Uint32Array.h>
-#include <wtf/Uint8Array.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
index 8ff091bc92a2b4dbd546425d293f918186084cd8..d1e212177ad07843c43b32dd576173f9794cdacf 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -74,9 +74,9 @@
 #include "WebGLTexture.h"
 #include "WebGLUniformLocation.h"
 
+#include <runtime/Uint32Array.h>
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/PassOwnArrayPtr.h>
-#include <wtf/Uint32Array.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.h b/Source/WebCore/html/canvas/WebGLRenderingContext.h
index 9723ca776b08489a9dd640a365b4acc6cafed48c..8b5cb69ca960efe03075f19cf675640fad02f3b5 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.h
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.h
@@ -34,8 +34,8 @@
 #include "Timer.h"
 #include "WebGLGetInfo.h"
 
-#include <wtf/Float32Array.h>
-#include <wtf/Int32Array.h>
+#include <runtime/Float32Array.h>
+#include <runtime/Int32Array.h>
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/text/WTFString.h>
 

diff --git a/Source/WebCore/inspector/InspectorMemoryAgent.cpp b/Source/WebCore/inspector/InspectorMemoryAgent.cpp
index 88f3d60e1676e2317cf137ada9d246d6eeae7bf7..1dc3e12eca470fe64b154028dda88f76dc0155e6 100644 (file)
--- a/Source/WebCore/inspector/InspectorMemoryAgent.cpp
+++ b/Source/WebCore/inspector/InspectorMemoryAgent.cpp
@@ -50,7 +50,7 @@
 #include "ScriptGCEvent.h"
 #include "ScriptProfiler.h"
 #include "StyledElement.h"
-#include <wtf/ArrayBufferView.h>
+#include <runtime/ArrayBufferView.h>
 #include <wtf/HashSet.h>
 #include <wtf/NonCopyingSort.h>
 #include <wtf/OwnPtr.h>

diff --git a/Source/WebCore/page/Crypto.cpp b/Source/WebCore/page/Crypto.cpp
index ae416ee1777ee8639bfafe08cb4746c57bff35ca..f0e4b5da8bcf2889fe1382a67241c0c2641b6149 100644 (file)
--- a/Source/WebCore/page/Crypto.cpp
+++ b/Source/WebCore/page/Crypto.cpp
@@ -32,7 +32,7 @@
 
 #include "ExceptionCode.h"
 #include "ScriptWrappableInlines.h"
-#include <wtf/ArrayBufferView.h>
+#include <runtime/ArrayBufferView.h>
 #include <wtf/CryptographicallyRandomNumber.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/page/Crypto.h b/Source/WebCore/page/Crypto.h
index 1725af86eb21a48164d70d8afe2bab61fcc30230..86552bc6105becaa6cc26b5c5c8c7623c475a26a 100644 (file)
--- a/Source/WebCore/page/Crypto.h
+++ b/Source/WebCore/page/Crypto.h
@@ -34,6 +34,10 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
+namespace JSC {
+class ArrayBufferView;
+}
+
 namespace WebCore {
 
 typedef int ExceptionCode;
@@ -42,7 +46,7 @@ class Crypto : public ScriptWrappable, public RefCounted<Crypto> {
 public:
     static PassRefPtr<Crypto> create() { return adoptRef(new Crypto()); }
 
-    void getRandomValues(ArrayBufferView*, ExceptionCode&);
+    void getRandomValues(JSC::ArrayBufferView*, ExceptionCode&);
 
 private:
     Crypto();

diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.cpp b/Source/WebCore/platform/graphics/GraphicsContext3D.cpp
index 5a248d0a5c7312eee1bc71b427f4f85b0046de68..611056dd797364c7b1642224bdf75bbc0ea87d87 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsContext3D.cpp
+++ b/Source/WebCore/platform/graphics/GraphicsContext3D.cpp
@@ -40,7 +40,7 @@
 #include "GraphicsContext3DNEON.h"
 #endif
 
-#include <wtf/ArrayBufferView.h>
+#include <runtime/ArrayBufferView.h>
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/PassOwnArrayPtr.h>
 

diff --git a/Source/WebCore/platform/graphics/ImageBuffer.h b/Source/WebCore/platform/graphics/ImageBuffer.h
index 871d7c05550e9859d0c1afa76348b150556718b4..dc8c6437ad833210ad11d5a259e404eafcda08af 100644 (file)
--- a/Source/WebCore/platform/graphics/ImageBuffer.h
+++ b/Source/WebCore/platform/graphics/ImageBuffer.h
@@ -39,11 +39,11 @@
 #include "GraphicsTypes3D.h"
 #include "IntSize.h"
 #include "ImageBufferData.h"
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/Forward.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
-#include <wtf/Uint8ClampedArray.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h
index 92734cab50cc3034e4ace2b308d5f7879ca85c98..b24ab4af1711302782d08847ab9e7a1ef1706fb4 100644 (file)
--- a/Source/WebCore/platform/graphics/MediaPlayer.h
+++ b/Source/WebCore/platform/graphics/MediaPlayer.h
@@ -39,6 +39,7 @@
 #include "LayoutRect.h"
 #include "Timer.h"
 #include "VideoTrackPrivate.h"
+#include <runtime/Uint8Array.h>
 #include <wtf/Forward.h>
 #include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
index 1e2b88c5efea456578cb831a3874cbd94e1c3661..4af4916ecbfc2bd7413bc080596e21fb7fedaaaf 100644 (file)
--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
@@ -47,10 +47,10 @@
 #import "WebCoreAVFResourceLoader.h"
 #import "WebCoreSystemInterface.h"
 #import <objc/runtime.h>
+#import <runtime/Uint16Array.h>
+#import <runtime/Uint32Array.h>
+#import <runtime/Uint8Array.h>
 #import <wtf/CurrentTime.h>
-#import <wtf/Uint16Array.h>
-#import <wtf/Uint32Array.h>
-#import <wtf/Uint8Array.h>
 #import <wtf/text/CString.h>
 
 #import <AVFoundation/AVFoundation.h>

diff --git a/Source/WebCore/platform/graphics/blackberry/ImageBufferDataBlackBerry.h b/Source/WebCore/platform/graphics/blackberry/ImageBufferDataBlackBerry.h
index 8da330e9302074e63d3af84a24f13ad5de504228..8a85afda9cfa169970d406edc14bdc64a3ef757b 100644 (file)
--- a/Source/WebCore/platform/graphics/blackberry/ImageBufferDataBlackBerry.h
+++ b/Source/WebCore/platform/graphics/blackberry/ImageBufferDataBlackBerry.h
@@ -24,7 +24,7 @@
 
 #include <BlackBerryPlatformGraphics.h>
 #include <BlackBerryPlatformGuardedPointer.h>
-#include <wtf/Uint8ClampedArray.h>
+#include <runtime/Uint8ClampedArray.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h b/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
index 8e61edff9c86cfcfa41ab73318d96993dac219d2..793eb7bc89a0c3b88a3abdc9fb78108d88142228 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
+++ b/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h
@@ -25,10 +25,10 @@
  */
 
 #include "Image.h"
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/CheckedArithmetic.h>
 #include <wtf/RefPtr.h>
 #include <wtf/RetainPtr.h>
-#include <wtf/Uint8ClampedArray.h>
 
 #if (PLATFORM(MAC) && USE(CA) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070))
 #define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1

diff --git a/Source/WebCore/platform/graphics/filters/FEBlend.cpp b/Source/WebCore/platform/graphics/filters/FEBlend.cpp
index bf527ff53b63167c2b85a15ef43d240e66746f6a..8145390b8143f87d7923272dce8e66deb5a1b059 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEBlend.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEBlend.cpp
@@ -33,7 +33,7 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
-#include <wtf/Uint8ClampedArray.h>
+#include <runtime/Uint8ClampedArray.h>
 
 typedef unsigned char (*BlendType)(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char alphaB);
 

diff --git a/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp b/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp
index bdf5552ae18981043f5262b84b920c2271cfc2fa..4d52f8f57c78a6722fc4fa641f6fc6db6beb745c 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp
@@ -30,8 +30,8 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/MathExtras.h>
-#include <wtf/Uint8ClampedArray.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp b/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
index 2294426def9ce15a64135920f663f1aa4cee2d2d..e494b08bd1f066cf02d99102756e1079c25bf9df 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
@@ -31,9 +31,9 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/MathExtras.h>
 #include <wtf/StdLibExtras.h>
-#include <wtf/Uint8ClampedArray.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/filters/FEComposite.cpp b/Source/WebCore/platform/graphics/filters/FEComposite.cpp
index 27e73aa9cf57510e432b448597ae4fb91c6193a0..06291e79b27a38734474fcd1314efbd1a5ae7c9e 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEComposite.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEComposite.cpp
@@ -32,7 +32,7 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
-#include <wtf/Uint8ClampedArray.h>
+#include <runtime/Uint8ClampedArray.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp b/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp
index fad92c95a1f50e40cf1530786cbcef655d8bd74a..73968d88b9f6c6bfc88e3eb7264784bacc2a8945 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp
@@ -30,8 +30,8 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/ParallelJobs.h>
-#include <wtf/Uint8ClampedArray.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp b/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp
index c22f50ef90109c280abcdfba4674a8848f7747cd..c4306c0fa14a82443a3942d85c37bab02ff30cac 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp
+++ b/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp
@@ -41,7 +41,7 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
-#include <wtf/Uint8ClampedArray.h>
+#include <runtime/Uint8ClampedArray.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp
index 025ff65ac3a86c3729cd7e05ec34190bb087bba5..8eb5640e28bc6eab2e5bb1aa8d9b2e65afa5161a 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp
@@ -31,7 +31,7 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
-#include <wtf/Uint8ClampedArray.h>
+#include <runtime/Uint8ClampedArray.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp b/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp
index c1efa2adeaf6502f668101061af8e5569d234dc8..0977dd2ef75ebb6b469f9c4d242d02b059d39d5c 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp
@@ -29,8 +29,8 @@
 #include "RenderTreeAsText.h"
 #include "ShadowBlur.h"
 #include "TextStream.h"
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/MathExtras.h>
-#include <wtf/Uint8ClampedArray.h>
 
 using namespace std;
 

diff --git a/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp b/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp
index 446e25a10c5e63475a5e40a474edde4a23b6c84e..61ba302a4aced817e943896558bb53c8c8eb2c92 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp
@@ -33,9 +33,9 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/MathExtras.h>
 #include <wtf/ParallelJobs.h>
-#include <wtf/Uint8ClampedArray.h>
 
 using namespace std;
 

diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h
index b40bb13090abf3127648913769677863eb0deb8e..eb79bbdbcb54b05c38a19842b05075747024082e 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FELighting.h
+++ b/Source/WebCore/platform/graphics/filters/FELighting.h
@@ -34,7 +34,7 @@
 #include "LightSource.h"
 #include "PointLightSource.h"
 #include "SpotLightSource.h"
-#include <wtf/Uint8ClampedArray.h>
+#include <runtime/Uint8ClampedArray.h>
 
 // Common base class for FEDiffuseLighting and FESpecularLighting
 

diff --git a/Source/WebCore/platform/graphics/filters/FEMorphology.cpp b/Source/WebCore/platform/graphics/filters/FEMorphology.cpp
index 9e720f74aceb978971f42f1e95153738d2f5cd28..6b028ee39376929ddeeb7f34ac1427826fd2e6bc 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FEMorphology.cpp
+++ b/Source/WebCore/platform/graphics/filters/FEMorphology.cpp
@@ -30,8 +30,8 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/ParallelJobs.h>
-#include <wtf/Uint8ClampedArray.h>
 #include <wtf/Vector.h>
 
 using std::min;

diff --git a/Source/WebCore/platform/graphics/filters/FETurbulence.cpp b/Source/WebCore/platform/graphics/filters/FETurbulence.cpp
index 17688746f6f9e446271a41fcb1e25111ead1c5a5..c4bd9795d6ced833d4e7fb69fe3b1c5ac974ff45 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FETurbulence.cpp
+++ b/Source/WebCore/platform/graphics/filters/FETurbulence.cpp
@@ -31,9 +31,9 @@
 #include "RenderTreeAsText.h"
 #include "TextStream.h"
 
+#include <runtime/Uint8ClampedArray.h>
 #include <wtf/MathExtras.h>
 #include <wtf/ParallelJobs.h>
-#include <wtf/Uint8ClampedArray.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/filters/FilterEffect.cpp b/Source/WebCore/platform/graphics/filters/FilterEffect.cpp
index 5dd065d98da7c79f5c9b7b1798fd00117b3a7cb5..f1b45d6971132bc8ded449d108e1b5e4a60bd41b 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterEffect.cpp
+++ b/Source/WebCore/platform/graphics/filters/FilterEffect.cpp
@@ -28,7 +28,7 @@
 #include "Filter.h"
 #include "ImageBuffer.h"
 #include "TextStream.h"
-#include <wtf/Uint8ClampedArray.h>
+#include <runtime/Uint8ClampedArray.h>
 
 #if HAVE(ARM_NEON_INTRINSICS)
 #include <arm_neon.h>

diff --git a/Source/WebCore/platform/graphics/filters/FilterEffect.h b/Source/WebCore/platform/graphics/filters/FilterEffect.h
index 296461f9f1974b889c23fd8236af867ad52ecace..cdc7a5012ef78cfac1b5edbd15a18c98285cb8b6 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterEffect.h
+++ b/Source/WebCore/platform/graphics/filters/FilterEffect.h
@@ -27,10 +27,11 @@
 #include "FloatRect.h"
 #include "IntRect.h"
 
+#include <runtime/Uint8ClampedArray.h>
+
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
-#include <wtf/Uint8ClampedArray.h>
 #include <wtf/Vector.h>
 
 #if ENABLE(OPENCL)

diff --git a/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm b/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
index 2613aaaa8642e985a6b9376cc244695907847031..c2c43e946018172c3bf694ce63966edacf4989db 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
+++ b/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
@@ -43,11 +43,11 @@
 #include <OpenGL/gl.h>
 #include "WebGLLayer.h"
 #include "WebGLObject.h"
-#include <wtf/ArrayBuffer.h>
-#include <wtf/ArrayBufferView.h>
-#include <wtf/Int32Array.h>
-#include <wtf/Float32Array.h>
-#include <wtf/Uint8Array.h>
+#include <runtime/ArrayBuffer.h>
+#include <runtime/ArrayBufferView.h>
+#include <runtime/Int32Array.h>
+#include <runtime/Float32Array.h>
+#include <runtime/Uint8Array.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
index 9d46a4c3de0a083e188901ab5e26a0440e7ee049..6902b6135efb1a5f6e058d0393fdb3cac8779e91 100644 (file)
--- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
@@ -44,13 +44,13 @@
 #include "IntSize.h"
 #include "NotImplemented.h"
 #include <cstring>
-#include <wtf/ArrayBuffer.h>
-#include <wtf/ArrayBufferView.h>
-#include <wtf/Float32Array.h>
-#include <wtf/Int32Array.h>
+#include <runtime/ArrayBuffer.h>
+#include <runtime/ArrayBufferView.h>
+#include <runtime/Float32Array.h>
+#include <runtime/Int32Array.h>
+#include <runtime/Uint8Array.h>
 #include <wtf/MainThread.h>
 #include <wtf/OwnArrayPtr.h>
-#include <wtf/Uint8Array.h>
 #include <wtf/text/CString.h>
 
 #if USE(OPENGL_ES_2)

diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
index d4dc2401eb9b7f7b6bf82aa7c80e1c06181f0b19..d1b4b97977276019519b367f921931d11687417f 100644 (file)
--- a/Source/WebCore/testing/Internals.h
+++ b/Source/WebCore/testing/Internals.h
@@ -31,8 +31,8 @@
 #include "ContextDestructionObserver.h"
 #include "ExceptionCodePlaceholder.h"
 #include "NodeList.h"
-#include <wtf/ArrayBuffer.h>
-#include <wtf/Float32Array.h>
+#include <runtime/ArrayBuffer.h>
+#include <runtime/Float32Array.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>

diff --git a/Source/WebCore/testing/MockCDM.cpp b/Source/WebCore/testing/MockCDM.cpp
index 3e6bf8a14cb548c939a36ac790f46b72e545692b..ad74a247927c3b6d264d9523ff61669c8cfb0926 100644 (file)
--- a/Source/WebCore/testing/MockCDM.cpp
+++ b/Source/WebCore/testing/MockCDM.cpp
@@ -30,7 +30,7 @@
 
 #include "CDM.h"
 #include "MediaKeyError.h"
-#include <wtf/Uint8Array.h>
+#include <runtime/Uint8Array.h>
 
 namespace WebCore {
 
@@ -80,7 +80,7 @@ static Uint8Array* initDataPrefix()
 static Uint8Array* keyPrefix()
 {
     static const unsigned char prefixData[] = {'k', 'e', 'y'};
-    DEFINE_STATIC_LOCAL(RefPtr<WTF::Uint8Array>, prefix, ());
+    DEFINE_STATIC_LOCAL(RefPtr<JSC::Uint8Array>, prefix, ());
     static bool initialized = false;
     if (!initialized) {
         initialized = true;
@@ -92,7 +92,7 @@ static Uint8Array* keyPrefix()
 static Uint8Array* keyRequest()
 {
     static const unsigned char requestData[] = {'r', 'e', 'q', 'u', 'e', 's', 't'};
-    DEFINE_STATIC_LOCAL(RefPtr<WTF::Uint8Array>, request, ());
+    DEFINE_STATIC_LOCAL(RefPtr<JSC::Uint8Array>, request, ());
     static bool initialized = false;
     if (!initialized) {
         initialized = true;

diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
index 09e7fe58252f919b8670de1d8afdae19fb673cff..4bc0596e78ce001c96e9407ac070292d4551ba9c 100644 (file)
--- a/Source/WebCore/xml/XMLHttpRequest.cpp
+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
@@ -58,10 +58,10 @@
 #include "XMLHttpRequestUpload.h"
 #include "markup.h"
 #include <heap/Strong.h>
+#include <runtime/ArrayBuffer.h>
+#include <runtime/ArrayBufferView.h>
 #include <runtime/JSLock.h>
 #include <runtime/Operations.h>
-#include <wtf/ArrayBuffer.h>
-#include <wtf/ArrayBufferView.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/CString.h>

diff --git a/Source/WebCore/xml/XMLHttpRequest.h b/Source/WebCore/xml/XMLHttpRequest.h
index 1cd76bcdd49052b88058d8ae3f03ac5a36a936da..6afff37ea6cb4d051001cafcf9ab2aed052a9a17 100644 (file)
--- a/Source/WebCore/xml/XMLHttpRequest.h
+++ b/Source/WebCore/xml/XMLHttpRequest.h
@@ -35,6 +35,11 @@
 #include <wtf/text/AtomicStringHash.h>
 #include <wtf/text/StringBuilder.h>
 
+namespace JSC {
+class ArrayBuffer;
+class ArrayBufferView;
+}
+
 namespace WebCore {
 
 class Blob;
@@ -91,8 +96,8 @@ public:
     void send(const String&, ExceptionCode&);
     void send(Blob*, ExceptionCode&);
     void send(DOMFormData*, ExceptionCode&);
-    void send(ArrayBuffer*, ExceptionCode&);
-    void send(ArrayBufferView*, ExceptionCode&);
+    void send(JSC::ArrayBuffer*, ExceptionCode&);
+    void send(JSC::ArrayBufferView*, ExceptionCode&);
     void abort();
     void setRequestHeader(const AtomicString& name, const String& value, ExceptionCode&);
     void overrideMimeType(const String& override);
@@ -120,8 +125,8 @@ public:
     ResponseTypeCode responseTypeCode() const { return m_responseTypeCode; }
     
     // response attribute has custom getter.
-    ArrayBuffer* responseArrayBuffer(ExceptionCode&);
-    ArrayBuffer* optionalResponseArrayBuffer() const { return m_responseArrayBuffer.get(); }
+    JSC::ArrayBuffer* responseArrayBuffer(ExceptionCode&);
+    JSC::ArrayBuffer* optionalResponseArrayBuffer() const { return m_responseArrayBuffer.get(); }
 
     void setLastSendLineNumber(unsigned lineNumber) { m_lastSendLineNumber = lineNumber; }
     void setLastSendURL(const String& url) { m_lastSendURL = url; }
@@ -222,7 +227,7 @@ private:
     mutable RefPtr<Document> m_responseDocument;
     
     RefPtr<SharedBuffer> m_binaryResponseBuilder;
-    mutable RefPtr<ArrayBuffer> m_responseArrayBuffer;
+    mutable RefPtr<JSC::ArrayBuffer> m_responseArrayBuffer;
 
     bool m_error;