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

Side by Side Diff: Source/bindings/v8/V8AbstractEventListener.cpp

Issue 158783002: Limit beforeunload returnValue propagation to event handlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Switch tests to use onbeforeunload event handlers instead. Created 6 years, 10 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/inspector-protocol/page/javascriptDialogEvents.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 else 142 else
143 setHiddenValue(v8Context->GetIsolate(), v8Context->Global(), eventSy mbol, savedEvent); 143 setHiddenValue(v8Context->GetIsolate(), v8Context->Global(), eventSy mbol, savedEvent);
144 tryCatch.Reset(); 144 tryCatch.Reset();
145 } 145 }
146 146
147 ASSERT(!handleOutOfMemory() || returnValue.IsEmpty()); 147 ASSERT(!handleOutOfMemory() || returnValue.IsEmpty());
148 148
149 if (returnValue.IsEmpty()) 149 if (returnValue.IsEmpty())
150 return; 150 return;
151 151
152 if (!returnValue->IsNull() && !returnValue->IsUndefined() && event->isBefore UnloadEvent()) { 152 if (m_isAttribute && !returnValue->IsNull() && !returnValue->IsUndefined() & & event->isBeforeUnloadEvent()) {
153 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, stringReturnVal ue, returnValue); 153 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, stringReturnVal ue, returnValue);
154 toBeforeUnloadEvent(event)->setReturnValue(stringReturnValue); 154 toBeforeUnloadEvent(event)->setReturnValue(stringReturnValue);
155 } 155 }
156 156
157 if (m_isAttribute && shouldPreventDefault(returnValue)) 157 if (m_isAttribute && shouldPreventDefault(returnValue))
158 event->preventDefault(); 158 event->preventDefault();
159 } 159 }
160 160
161 bool V8AbstractEventListener::shouldPreventDefault(v8::Local<v8::Value> returnVa lue) 161 bool V8AbstractEventListener::shouldPreventDefault(v8::Local<v8::Value> returnVa lue)
162 { 162 {
(...skipping 15 matching lines...) Expand all
178 return v8::Local<v8::Object>(); 178 return v8::Local<v8::Object>();
179 return v8::Local<v8::Object>::New(isolate, v8::Handle<v8::Object>::Cast(valu e)); 179 return v8::Local<v8::Object>::New(isolate, v8::Handle<v8::Object>::Cast(valu e));
180 } 180 }
181 181
182 void V8AbstractEventListener::setWeakCallback(const v8::WeakCallbackData<v8::Obj ect, V8AbstractEventListener> &data) 182 void V8AbstractEventListener::setWeakCallback(const v8::WeakCallbackData<v8::Obj ect, V8AbstractEventListener> &data)
183 { 183 {
184 data.GetParameter()->m_listener.clear(); 184 data.GetParameter()->m_listener.clear();
185 } 185 }
186 186
187 } // namespace WebCore 187 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/inspector-protocol/page/javascriptDialogEvents.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698