Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Unified Diff: Source/bindings/core/v8/custom/V8WindowCustom.cpp

Issue 683013002: Extract a DOMWindow interface from LocalDOMWindow and use it in the idl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: whee Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b0a945f5f24a56d81d984a29cc6ba46b2ab83294..9d8d538f8c9adbbc7912e3a2fc36818db3e1fca9 100644
--- a/Source/bindings/core/v8/custom/V8WindowCustom.cpp
+++ b/Source/bindings/core/v8/custom/V8WindowCustom.cpp
@@ -78,7 +78,7 @@ static void windowSetTimeoutImpl(const v8::FunctionCallbackInfo<v8::Value>& info
if (argumentCount < 1)
return;
- LocalDOMWindow* impl = V8Window::toImpl(info.Holder());
+ LocalDOMWindow* impl = toLocalDOMWindow(V8Window::toImpl(info.Holder()));
dcheng 2014/10/31 03:20:41 Things like this are not available cross-origin (a
if (!impl->frame() || !impl->document()) {
exceptionState.throwDOMException(InvalidAccessError, "No script context is available in which to execute the script.");
return;
@@ -149,7 +149,7 @@ static void windowSetTimeoutImpl(const v8::FunctionCallbackInfo<v8::Value>& info
void V8Window::eventAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info)
{
- LocalFrame* frame = V8Window::toImpl(info.Holder())->frame();
+ LocalFrame* frame = toLocalDOMWindow(V8Window::toImpl(info.Holder()))->frame();
ExceptionState exceptionState(ExceptionState::GetterContext, "event", "Window", info.Holder(), info.GetIsolate());
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), frame, exceptionState)) {
exceptionState.throwIfNeeded();
@@ -170,7 +170,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::toImpl(info.Holder())->frame();
+ LocalFrame* frame = toLocalDOMWindow(V8Window::toImpl(info.Holder()))->frame();
ExceptionState exceptionState(ExceptionState::SetterContext, "event", "Window", info.Holder(), info.GetIsolate());
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), frame, exceptionState)) {
exceptionState.throwIfNeeded();
@@ -188,7 +188,7 @@ void V8Window::eventAttributeSetterCustom(v8::Local<v8::Value> value, const v8::
void V8Window::frameElementAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info)
{
- LocalDOMWindow* impl = V8Window::toImpl(info.Holder());
+ LocalDOMWindow* impl = toLocalDOMWindow(V8Window::toImpl(info.Holder()));
ExceptionState exceptionState(ExceptionState::GetterContext, "frame", "Window", info.Holder(), info.GetIsolate());
if (!BindingSecurity::shouldAllowAccessToNode(info.GetIsolate(), impl->frameElement(), exceptionState)) {
v8SetReturnValueNull(info);
@@ -206,7 +206,7 @@ void V8Window::frameElementAttributeGetterCustom(const v8::PropertyCallbackInfo<
void V8Window::openerAttributeSetterCustom(v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
{
- LocalDOMWindow* impl = V8Window::toImpl(info.Holder());
+ LocalDOMWindow* impl = toLocalDOMWindow(V8Window::toImpl(info.Holder()));
ExceptionState exceptionState(ExceptionState::SetterContext, "opener", "Window", info.Holder(), info.GetIsolate());
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), impl->frame(), exceptionState)) {
exceptionState.throwIfNeeded();
@@ -243,7 +243,8 @@ 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::toImpl(info.Holder());
+ // FIXME: This is likely to be problematic for the use counters below.
dcheng 2014/10/31 03:20:41 I don't have a good solution for the use counters
haraken 2014/10/31 06:07:04 The same problem should be happening in auto-gener
dcheng 2014/10/31 06:31:01 Let me look into this. Hopefully we can just updat
+ DOMWindow* window = V8Window::toImpl(info.Holder());
LocalDOMWindow* source = callingDOMWindow(info.GetIsolate());
ASSERT(window);
@@ -355,7 +356,7 @@ static void setUpDialog(LocalDOMWindow* dialog, void* handler)
void V8Window::showModalDialogMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
{
- LocalDOMWindow* impl = V8Window::toImpl(info.Holder());
+ LocalDOMWindow* impl = toLocalDOMWindow(V8Window::toImpl(info.Holder()));
ExceptionState exceptionState(ExceptionState::ExecutionContext, "showModalDialog", "Window", info.Holder(), info.GetIsolate());
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), impl->frame(), exceptionState)) {
exceptionState.throwIfNeeded();
@@ -373,7 +374,7 @@ void V8Window::showModalDialogMethodCustom(const v8::FunctionCallbackInfo<v8::Va
void V8Window::openMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
{
- LocalDOMWindow* impl = V8Window::toImpl(info.Holder());
+ LocalDOMWindow* impl = toLocalDOMWindow(V8Window::toImpl(info.Holder()));
ExceptionState exceptionState(ExceptionState::ExecutionContext, "open", "Window", info.Holder(), info.GetIsolate());
if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), impl->frame(), exceptionState)) {
exceptionState.throwIfNeeded();
@@ -399,8 +400,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::toImpl(info.Holder());
+ LocalDOMWindow* window = toLocalDOMWindow(V8Window::toImpl(info.Holder()));
if (!window)
return;
@@ -462,7 +462,8 @@ bool V8Window::namedSecurityCheckCustom(v8::Local<v8::Object> host, v8::Local<v8
if (window.IsEmpty())
return false; // the frame is gone.
- LocalDOMWindow* targetWindow = V8Window::toImpl(window);
+ // FIXME: Do not commit. Uncertain if this is correct.
+ LocalDOMWindow* targetWindow = toLocalDOMWindow(V8Window::toImpl(window));
ASSERT(targetWindow);
@@ -505,7 +506,8 @@ bool V8Window::indexedSecurityCheckCustom(v8::Local<v8::Object> host, uint32_t i
if (window.IsEmpty())
return false;
- LocalDOMWindow* targetWindow = V8Window::toImpl(window);
+ // FIXME: Do not commit. Uncertain if this is correct.
+ LocalDOMWindow* targetWindow = toLocalDOMWindow(V8Window::toImpl(window));
ASSERT(targetWindow);

Powered by Google App Engine
This is Rietveld 408576698