Index: Source/bindings/core/v8/custom/V8WebGLRenderingContextCustom.cpp |
diff --git a/Source/bindings/core/v8/custom/V8WebGLRenderingContextCustom.cpp b/Source/bindings/core/v8/custom/V8WebGLRenderingContextCustom.cpp |
index f716a7f2bc5eb0d1ee08f0a9020783789bb1eb22..9c758a3166e63c685a34bf2d3dd8ae884b4cb14a 100644 |
--- a/Source/bindings/core/v8/custom/V8WebGLRenderingContextCustom.cpp |
+++ b/Source/bindings/core/v8/custom/V8WebGLRenderingContextCustom.cpp |
@@ -291,7 +291,7 @@ static void getObjectParameter(const v8::FunctionCallbackInfo<v8::Value>& info, |
return; |
} |
- WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* context = V8WebGLRenderingContext::toImpl(info.Holder()); |
unsigned target; |
unsigned pname; |
{ |
@@ -324,7 +324,7 @@ static void getObjectParameter(const v8::FunctionCallbackInfo<v8::Value>& info, |
static WebGLUniformLocation* toWebGLUniformLocation(v8::Handle<v8::Value> value, v8::Isolate* isolate) |
{ |
- return V8WebGLUniformLocation::toNativeWithTypeCheck(isolate, value); |
+ return V8WebGLUniformLocation::toImplWithTypeCheck(isolate, value); |
} |
void V8WebGLRenderingContext::getBufferParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info) |
@@ -336,7 +336,7 @@ void V8WebGLRenderingContext::getBufferParameterMethodCustom(const v8::FunctionC |
void V8WebGLRenderingContext::getExtensionMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info) |
{ |
ExceptionState exceptionState(ExceptionState::ExecutionContext, "getExtension", "WebGLRenderingContext", info.Holder(), info.GetIsolate()); |
- WebGLRenderingContext* impl = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* impl = V8WebGLRenderingContext::toImpl(info.Holder()); |
if (info.Length() < 1) { |
exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(1, info.Length())); |
exceptionState.throwIfNeeded(); |
@@ -356,7 +356,7 @@ void V8WebGLRenderingContext::getFramebufferAttachmentParameterMethodCustom(cons |
return; |
} |
- WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* context = V8WebGLRenderingContext::toImpl(info.Holder()); |
unsigned target; |
unsigned attachment; |
unsigned pname; |
@@ -380,7 +380,7 @@ void V8WebGLRenderingContext::getParameterMethodCustom(const v8::FunctionCallbac |
return; |
} |
- WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* context = V8WebGLRenderingContext::toImpl(info.Holder()); |
unsigned pname; |
{ |
v8::TryCatch block; |
@@ -400,7 +400,7 @@ void V8WebGLRenderingContext::getProgramParameterMethodCustom(const v8::Function |
return; |
} |
- WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* context = V8WebGLRenderingContext::toImpl(info.Holder()); |
WebGLProgram* program; |
unsigned pname; |
{ |
@@ -411,7 +411,7 @@ void V8WebGLRenderingContext::getProgramParameterMethodCustom(const v8::Function |
exceptionState.throwIfNeeded(); |
return; |
} |
- TONATIVE_VOID_INTERNAL(program, V8WebGLProgram::toNativeWithTypeCheck(info.GetIsolate(), info[0])); |
+ TONATIVE_VOID_INTERNAL(program, V8WebGLProgram::toImplWithTypeCheck(info.GetIsolate(), info[0])); |
TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(pname, toUInt32(info[1], exceptionState), exceptionState); |
} |
WebGLGetInfo args = context->getProgramParameter(program, pname); |
@@ -433,7 +433,7 @@ void V8WebGLRenderingContext::getShaderParameterMethodCustom(const v8::FunctionC |
return; |
} |
- WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* context = V8WebGLRenderingContext::toImpl(info.Holder()); |
WebGLShader* shader; |
unsigned pname; |
{ |
@@ -444,7 +444,7 @@ void V8WebGLRenderingContext::getShaderParameterMethodCustom(const v8::FunctionC |
exceptionState.throwIfNeeded(); |
return; |
} |
- TONATIVE_VOID_INTERNAL(shader, V8WebGLShader::toNativeWithTypeCheck(info.GetIsolate(), info[0])); |
+ TONATIVE_VOID_INTERNAL(shader, V8WebGLShader::toImplWithTypeCheck(info.GetIsolate(), info[0])); |
TONATIVE_VOID_EXCEPTIONSTATE_INTERNAL(pname, toUInt32(info[1], exceptionState), exceptionState); |
} |
WebGLGetInfo args = context->getShaderParameter(shader, pname); |
@@ -466,7 +466,7 @@ void V8WebGLRenderingContext::getUniformMethodCustom(const v8::FunctionCallbackI |
return; |
} |
- WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* context = V8WebGLRenderingContext::toImpl(info.Holder()); |
WebGLProgram* program; |
WebGLUniformLocation* location; |
{ |
@@ -476,12 +476,12 @@ void V8WebGLRenderingContext::getUniformMethodCustom(const v8::FunctionCallbackI |
V8ThrowException::throwTypeError(ExceptionMessages::failedToExecute("getUniform", "WebGLRenderingContext", "parameter 1 is not of type 'WebGLProgram'."), info.GetIsolate()); |
return; |
} |
- TONATIVE_VOID_INTERNAL(program, V8WebGLProgram::toNativeWithTypeCheck(info.GetIsolate(), info[0])); |
+ TONATIVE_VOID_INTERNAL(program, V8WebGLProgram::toImplWithTypeCheck(info.GetIsolate(), info[0])); |
if (info.Length() > 1 && !isUndefinedOrNull(info[1]) && !V8WebGLUniformLocation::hasInstance(info[1], info.GetIsolate())) { |
V8ThrowException::throwTypeError(ExceptionMessages::failedToExecute("getUniform", "WebGLRenderingContext", "parameter 2 is not of type 'WebGLUniformLocation'."), info.GetIsolate()); |
return; |
} |
- TONATIVE_VOID_INTERNAL(location, V8WebGLUniformLocation::toNativeWithTypeCheck(info.GetIsolate(), info[1])); |
+ TONATIVE_VOID_INTERNAL(location, V8WebGLUniformLocation::toImplWithTypeCheck(info.GetIsolate(), info[1])); |
} |
WebGLGetInfo args = context->getUniform(program, location); |
v8SetReturnValue(info, toV8Object(args, info.Holder(), info.GetIsolate())); |
@@ -555,11 +555,11 @@ static void vertexAttribAndUniformHelperf(const v8::FunctionCallbackInfo<v8::Val |
location = toWebGLUniformLocation(info[uniformLocationArgumentIndex], info.GetIsolate()); |
} |
- WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* context = V8WebGLRenderingContext::toImpl(info.Holder()); |
const int indexArrayArgument = 1; |
if (V8Float32Array::hasInstance(info[indexArrayArgument], info.GetIsolate())) { |
- Float32Array* array = V8Float32Array::toNative(info[indexArrayArgument]->ToObject()); |
+ Float32Array* array = V8Float32Array::toImpl(info[indexArrayArgument]->ToObject()); |
ASSERT(array); |
switch (functionToCall) { |
case kUniform1v: context->uniform1fv(location, array); break; |
@@ -624,7 +624,7 @@ static void uniformHelperi(const v8::FunctionCallbackInfo<v8::Value>& info, Func |
} |
const int uniformLocationArgumentIndex = 0; |
- WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* context = V8WebGLRenderingContext::toImpl(info.Holder()); |
if (info.Length() > 0 && !isUndefinedOrNull(info[uniformLocationArgumentIndex]) && !V8WebGLUniformLocation::hasInstance(info[uniformLocationArgumentIndex], info.GetIsolate())) { |
exceptionState.throwTypeError(ExceptionMessages::argumentNullOrIncorrectType(uniformLocationArgumentIndex + 1, "WebGLUniformLocation")); |
exceptionState.throwIfNeeded(); |
@@ -634,7 +634,7 @@ static void uniformHelperi(const v8::FunctionCallbackInfo<v8::Value>& info, Func |
const int indexArrayArgumentIndex = 1; |
if (V8Int32Array::hasInstance(info[indexArrayArgumentIndex], info.GetIsolate())) { |
- Int32Array* array = V8Int32Array::toNative(info[indexArrayArgumentIndex]->ToObject()); |
+ Int32Array* array = V8Int32Array::toImpl(info[indexArrayArgumentIndex]->ToObject()); |
ASSERT(array); |
switch (functionToCall) { |
case kUniform1v: context->uniform1iv(location, array); break; |
@@ -737,7 +737,7 @@ static void uniformMatrixHelper(const v8::FunctionCallbackInfo<v8::Value>& info, |
return; |
} |
- WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(info.Holder()); |
+ WebGLRenderingContext* context = V8WebGLRenderingContext::toImpl(info.Holder()); |
const int uniformLocationArgumentIndex = 0; |
if (info.Length() > 0 && !isUndefinedOrNull(info[uniformLocationArgumentIndex]) && !V8WebGLUniformLocation::hasInstance(info[uniformLocationArgumentIndex], info.GetIsolate())) { |
@@ -750,7 +750,7 @@ static void uniformMatrixHelper(const v8::FunctionCallbackInfo<v8::Value>& info, |
bool transpose = info[1]->BooleanValue(); |
const int arrayArgumentIndex = 2; |
if (V8Float32Array::hasInstance(info[arrayArgumentIndex], info.GetIsolate())) { |
- Float32Array* array = V8Float32Array::toNative(info[arrayArgumentIndex]->ToObject()); |
+ Float32Array* array = V8Float32Array::toImpl(info[arrayArgumentIndex]->ToObject()); |
ASSERT(array); |
switch (matrixSize) { |
case 2: context->uniformMatrix2fv(location, transpose, array); break; |