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

Side by Side Diff: Source/bindings/v8/custom/V8HTMLFrameElementCustom.cpp

Issue 22887017: Revert "Throw an exception when denying access to 'Frame's 'location' setter." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/V8ThrowException.cpp ('k') | Source/core/dom/DOMException.h » ('j') | 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) 2007-2009 Google Inc. All rights reserved. 2 * Copyright (C) 2007-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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "V8HTMLFrameElement.h" 32 #include "V8HTMLFrameElement.h"
33 33
34 #include "HTMLNames.h" 34 #include "HTMLNames.h"
35 #include "bindings/v8/BindingSecurity.h" 35 #include "bindings/v8/BindingSecurity.h"
36 #include "bindings/v8/ExceptionState.h"
37 #include "bindings/v8/V8Binding.h" 36 #include "bindings/v8/V8Binding.h"
38 #include "core/html/HTMLFrameElement.h" 37 #include "core/html/HTMLFrameElement.h"
39 #include "core/html/parser/HTMLParserIdioms.h"
40 38
41 namespace WebCore { 39 namespace WebCore {
42 40
43 using namespace HTMLNames; 41 using namespace HTMLNames;
44 42
45 void V8HTMLFrameElement::locationAttrSetterCustom(v8::Local<v8::String> name, v8 ::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info) 43 void V8HTMLFrameElement::locationAttrSetterCustom(v8::Local<v8::String> name, v8 ::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
46 { 44 {
47 HTMLFrameElement* frame = V8HTMLFrameElement::toNative(info.Holder()); 45 HTMLFrameElement* frame = V8HTMLFrameElement::toNative(info.Holder());
48 String locationValue = toWebCoreStringWithNullCheck(value); 46 String locationValue = toWebCoreStringWithNullCheck(value);
49 47
50 ExceptionState es(info.GetIsolate()); 48 if (!BindingSecurity::allowSettingFrameSrcToJavascriptUrl(frame, locationVal ue))
51 if (protocolIsJavaScript(stripLeadingAndTrailingHTMLSpaces(locationValue)) & & !BindingSecurity::shouldAllowAccessToFrame(frame->contentFrame(), es)) {
52 es.throwIfNeeded();
53 return; 49 return;
54 }
55 50
56 frame->setLocation(locationValue); 51 frame->setLocation(locationValue);
57 } 52 }
58 53
59 } // namespace WebCore 54 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8ThrowException.cpp ('k') | Source/core/dom/DOMException.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698