Skip to content

Commit 281f45e

Browse files
phoboslabphoboslab
committed
Move ArrayBuffer back to WebCore namespace
1 parent 2695b7a commit 281f45e

5 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎JavaScriptCore/runtime/TypedArrays/JSArrayBuffer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
using namespace JSC;
3131

32-
namespace JSC {
32+
namespace WebCore {
3333

3434
enum ParameterDefaultPolicy {
3535
DefaultIsUndefined,

‎JavaScriptCore/runtime/TypedArrays/JSArrayBuffer.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
#include <runtime/ObjectPrototype.h>
3030
#include <wtf/ArrayBuffer.h>
3131

32-
namespace JSC {
32+
namespace WebCore {
3333

34-
class JSArrayBuffer : public JSNonFinalObject {
34+
class JSArrayBuffer : public JSC::JSNonFinalObject {
3535
public:
36-
typedef JSNonFinalObject Base;
37-
static JSArrayBuffer* create(JSC::Structure* structure, JSGlobalObject* globalObject, PassRefPtr<ArrayBuffer> impl)
36+
typedef JSC::JSNonFinalObject Base;
37+
static JSArrayBuffer* create(JSC::Structure* structure, JSC::JSGlobalObject* globalObject, PassRefPtr<ArrayBuffer> impl)
3838
{
3939
JSArrayBuffer* ptr = new (NotNull, JSC::allocateCell<JSArrayBuffer>(globalObject->globalData().heap)) JSArrayBuffer(structure, globalObject, impl);
4040
ptr->finishCreation(globalObject->globalData());
@@ -62,7 +62,7 @@ class JSArrayBuffer : public JSNonFinalObject {
6262
private:
6363
ArrayBuffer* m_impl;
6464
protected:
65-
JSArrayBuffer(JSC::Structure*, JSGlobalObject*, PassRefPtr<ArrayBuffer>);
65+
JSArrayBuffer(JSC::Structure*, JSC::JSGlobalObject*, PassRefPtr<ArrayBuffer>);
6666
void finishCreation(JSC::JSGlobalData&);
6767
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
6868
};
@@ -85,7 +85,7 @@ inline void* wrapperContext(DOMWrapperWorld* world, ArrayBuffer*)
8585
}
8686
*/
8787

88-
JSC::JSValue toJS(JSC::ExecState*, JSGlobalObject*, ArrayBuffer*);
88+
JSC::JSValue toJS(JSC::ExecState*, JSC::JSGlobalObject*, ArrayBuffer*);
8989
ArrayBuffer* toArrayBuffer(JSC::JSValue);
9090

9191
class JSArrayBufferPrototype : public JSC::JSNonFinalObject {
@@ -113,14 +113,14 @@ class JSArrayBufferPrototype : public JSC::JSNonFinalObject {
113113
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
114114
};
115115

116-
class JSArrayBufferConstructor : public InternalFunction {
116+
class JSArrayBufferConstructor : public JSC::InternalFunction {
117117
private:
118-
JSArrayBufferConstructor(JSGlobalObject* globalObject, Structure* structure);
119-
void finishCreation(JSC::ExecState*, JSGlobalObject*);
118+
JSArrayBufferConstructor(JSC::JSGlobalObject* globalObject, JSC::Structure* structure);
119+
void finishCreation(JSC::ExecState*, JSC::JSGlobalObject*);
120120

121121
public:
122-
typedef InternalFunction Base;
123-
static JSArrayBufferConstructor* create(JSC::ExecState* exec, JSC::Structure* structure, JSGlobalObject* globalObject)
122+
typedef JSC::InternalFunction Base;
123+
static JSArrayBufferConstructor* create(JSC::ExecState* exec, JSC::Structure* structure, JSC::JSGlobalObject* globalObject)
124124
{
125125
JSArrayBufferConstructor* ptr = new (NotNull, JSC::allocateCell<JSArrayBufferConstructor>(*exec->heap())) JSArrayBufferConstructor(globalObject, structure);
126126
ptr->finishCreation(exec, globalObject);
@@ -135,7 +135,7 @@ class JSArrayBufferConstructor : public InternalFunction {
135135
return JSC::Structure::create(globalData, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), &s_info);
136136
}
137137
protected:
138-
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::ImplementsHasInstance | InternalFunction::StructureFlags;
138+
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::ImplementsHasInstance | JSC::InternalFunction::StructureFlags;
139139
static JSC::EncodedJSValue JSC_HOST_CALL constructJSArrayBuffer(JSC::ExecState*);
140140
static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
141141
};

‎JavaScriptCore/runtime/TypedArrays/JSArrayBufferCustom.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
#include <runtime/Error.h>
3030
#include <wtf/ArrayBuffer.h>
3131

32-
namespace JSC {
32+
namespace WebCore {
3333

34-
EncodedJSValue JSC_HOST_CALL JSArrayBufferConstructor::constructJSArrayBuffer(ExecState* exec)
34+
JSC::EncodedJSValue JSC_HOST_CALL JSArrayBufferConstructor::constructJSArrayBuffer(JSC::ExecState* exec)
3535
{
36-
JSArrayBufferConstructor* jsConstructor = jsCast<JSArrayBufferConstructor*>(exec->callee());
36+
JSArrayBufferConstructor* jsConstructor = JSC::jsCast<JSArrayBufferConstructor*>(exec->callee());
3737

3838
int length = 0;
3939
if (exec->argumentCount() > 0)
@@ -42,8 +42,8 @@ EncodedJSValue JSC_HOST_CALL JSArrayBufferConstructor::constructJSArrayBuffer(Ex
4242
if (length >= 0)
4343
buffer = ArrayBuffer::create(static_cast<unsigned>(length), 1);
4444
if (!buffer.get())
45-
return throwVMError(exec, createRangeError(exec, "ArrayBuffer size is not a small enough positive integer."));
46-
return JSValue::encode(asObject(toJS(exec, jsConstructor->globalObject(), buffer.get())));
45+
return JSC::throwVMError(exec, JSC::createRangeError(exec, "ArrayBuffer size is not a small enough positive integer."));
46+
return JSC::JSValue::encode(asObject(toJS(exec, jsConstructor->globalObject(), buffer.get())));
4747
}
4848

4949
} // namespace WebCore

‎JavaScriptCore/runtime/TypedArrays/JSArrayBufferView.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
using namespace JSC;
3131

32-
namespace JSC {
32+
namespace WebCore {
3333

3434
ASSERT_CLASS_FITS_IN_CELL(JSArrayBufferView);
3535
/* Hash table */

‎JavaScriptCore/runtime/TypedArrays/JSArrayBufferView.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
#include <runtime/ObjectPrototype.h>
2727
#include <wtf/ArrayBufferView.h>
2828

29-
namespace JSC {
29+
namespace WebCore {
3030

31-
class JSArrayBufferView : public JSNonFinalObject {
31+
class JSArrayBufferView : public JSC::JSNonFinalObject {
3232
public:
3333
typedef JSNonFinalObject Base;
34-
static JSArrayBufferView* create(JSC::Structure* structure, JSGlobalObject* globalObject, PassRefPtr<ArrayBufferView> impl)
34+
static JSArrayBufferView* create(JSC::Structure* structure, JSC::JSGlobalObject* globalObject, PassRefPtr<ArrayBufferView> impl)
3535
{
3636
JSArrayBufferView* ptr = new (NotNull, JSC::allocateCell<JSArrayBufferView>(globalObject->globalData().heap)) JSArrayBufferView(structure, globalObject, impl);
3737
ptr->finishCreation(globalObject->globalData());
@@ -58,7 +58,7 @@ class JSArrayBufferView : public JSNonFinalObject {
5858
private:
5959
ArrayBufferView* m_impl;
6060
protected:
61-
JSArrayBufferView(JSC::Structure*, JSGlobalObject*, PassRefPtr<ArrayBufferView>);
61+
JSArrayBufferView(JSC::Structure*, JSC::JSGlobalObject*, PassRefPtr<ArrayBufferView>);
6262
void finishCreation(JSC::JSGlobalData&);
6363
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
6464
};
@@ -82,7 +82,7 @@ inline void* wrapperContext(DOMWrapperWorld* world, ArrayBufferView*)
8282
}
8383
*/
8484

85-
JSC::JSValue toJS(JSC::ExecState*, JSGlobalObject*, ArrayBufferView*);
85+
JSC::JSValue toJS(JSC::ExecState*, JSC::JSGlobalObject*, ArrayBufferView*);
8686
ArrayBufferView* toArrayBufferView(JSC::JSValue);
8787

8888
class JSArrayBufferViewPrototype : public JSC::JSNonFinalObject {

0 commit comments

Comments
 (0)