Index: Source/bindings/core/v8/custom/V8WindowCustom.cpp |
diff --git a/Source/bindings/core/v8/custom/V8WindowCustom.cpp b/Source/bindings/core/v8/custom/V8WindowCustom.cpp |
index a1b92f224754722963d739922bc533813edf61ea..ce3efbae9efd06c00f759b1ff94c38be21109148 100644 |
--- a/Source/bindings/core/v8/custom/V8WindowCustom.cpp |
+++ b/Source/bindings/core/v8/custom/V8WindowCustom.cpp |
@@ -77,7 +77,7 @@ static void windowSetTimeoutImpl(const v8::FunctionCallbackInfo<v8::Value>& info |
if (argumentCount < 1) |
return; |
- LocalDOMWindow* impl = V8Window::toNative(info.Holder()); |
+ LocalDOMWindow* impl = V8Window::toImpl(info.Holder()); |
if (!impl->frame() || !impl->document()) { |
exceptionState.throwDOMException(InvalidAccessError, "No script context is available in which to execute the script."); |
return; |
@@ -150,7 +150,7 @@ static void windowSetTimeoutImpl(const v8::FunctionCallbackInfo<v8::Value>& info |
void V8Window::eventAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info) |
{ |
- LocalFrame* frame = V8Window::toNative(info.Holder())->frame(); |
+ LocalFrame* frame = V8Window::toImpl(info.Holder())->frame(); |
ExceptionState exceptionState(ExceptionState::GetterContext, "event", "Window", info.Holder(), info.GetIsolate()); |
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), frame, exceptionState)) { |
exceptionState.throwIfNeeded(); |
@@ -171,7 +171,7 @@ void V8Window::eventAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Val |
void V8Window::eventAttributeSetterCustom(v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info) |
{ |
- LocalFrame* frame = V8Window::toNative(info.Holder())->frame(); |
+ LocalFrame* frame = V8Window::toImpl(info.Holder())->frame(); |
ExceptionState exceptionState(ExceptionState::SetterContext, "event", "Window", info.Holder(), info.GetIsolate()); |
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), frame, exceptionState)) { |
exceptionState.throwIfNeeded(); |
@@ -189,7 +189,7 @@ void V8Window::eventAttributeSetterCustom(v8::Local<v8::Value> value, const v8:: |
void V8Window::frameElementAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info) |
{ |
- LocalDOMWindow* impl = V8Window::toNative(info.Holder()); |
+ LocalDOMWindow* impl = V8Window::toImpl(info.Holder()); |
ExceptionState exceptionState(ExceptionState::GetterContext, "frame", "Window", info.Holder(), info.GetIsolate()); |
if (!BindingSecurity::shouldAllowAccessToNode(info.GetIsolate(), impl->frameElement(), exceptionState)) { |
v8SetReturnValueNull(info); |
@@ -207,7 +207,7 @@ void V8Window::frameElementAttributeGetterCustom(const v8::PropertyCallbackInfo< |
void V8Window::openerAttributeSetterCustom(v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info) |
{ |
- LocalDOMWindow* impl = V8Window::toNative(info.Holder()); |
+ LocalDOMWindow* impl = V8Window::toImpl(info.Holder()); |
ExceptionState exceptionState(ExceptionState::SetterContext, "opener", "Window", info.Holder(), info.GetIsolate()); |
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), impl->frame(), exceptionState)) { |
exceptionState.throwIfNeeded(); |
@@ -244,7 +244,7 @@ void V8Window::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::Value> |
{ |
// None of these need to be RefPtr because info and context are guaranteed |
// to hold on to them. |
- LocalDOMWindow* window = V8Window::toNative(info.Holder()); |
+ LocalDOMWindow* window = V8Window::toImpl(info.Holder()); |
LocalDOMWindow* source = callingDOMWindow(info.GetIsolate()); |
ExceptionState exceptionState(ExceptionState::ExecutionContext, "postMessage", "Window", info.Holder(), info.GetIsolate()); |
@@ -352,7 +352,7 @@ static void setUpDialog(LocalDOMWindow* dialog, void* handler) |
void V8Window::showModalDialogMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info) |
{ |
- LocalDOMWindow* impl = V8Window::toNative(info.Holder()); |
+ LocalDOMWindow* impl = V8Window::toImpl(info.Holder()); |
ExceptionState exceptionState(ExceptionState::ExecutionContext, "showModalDialog", "Window", info.Holder(), info.GetIsolate()); |
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), impl->frame(), exceptionState)) { |
exceptionState.throwIfNeeded(); |
@@ -370,7 +370,7 @@ void V8Window::showModalDialogMethodCustom(const v8::FunctionCallbackInfo<v8::Va |
void V8Window::openMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info) |
{ |
- LocalDOMWindow* impl = V8Window::toNative(info.Holder()); |
+ LocalDOMWindow* impl = V8Window::toImpl(info.Holder()); |
ExceptionState exceptionState(ExceptionState::ExecutionContext, "open", "Window", info.Holder(), info.GetIsolate()); |
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), impl->frame(), exceptionState)) { |
exceptionState.throwIfNeeded(); |
@@ -397,7 +397,7 @@ void V8Window::openMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info) |
void V8Window::namedPropertyGetterCustom(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info) |
{ |
- LocalDOMWindow* window = V8Window::toNative(info.Holder()); |
+ LocalDOMWindow* window = V8Window::toImpl(info.Holder()); |
if (!window) |
return; |
@@ -459,7 +459,7 @@ bool V8Window::namedSecurityCheckCustom(v8::Local<v8::Object> host, v8::Local<v8 |
if (window.IsEmpty()) |
return false; // the frame is gone. |
- LocalDOMWindow* targetWindow = V8Window::toNative(window); |
+ LocalDOMWindow* targetWindow = V8Window::toImpl(window); |
ASSERT(targetWindow); |
@@ -502,7 +502,7 @@ bool V8Window::indexedSecurityCheckCustom(v8::Local<v8::Object> host, uint32_t i |
if (window.IsEmpty()) |
return false; |
- LocalDOMWindow* targetWindow = V8Window::toNative(window); |
+ LocalDOMWindow* targetWindow = V8Window::toImpl(window); |
ASSERT(targetWindow); |