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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLFrameElement.cpp

Issue 2183423002: Only do security checks on javascript: URLs for frames for loading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2009 Apple Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 26 matching lines...) Expand all
37 , m_frameBorder(true) 37 , m_frameBorder(true)
38 , m_frameBorderSet(false) 38 , m_frameBorderSet(false)
39 { 39 {
40 } 40 }
41 41
42 DEFINE_NODE_FACTORY(HTMLFrameElement) 42 DEFINE_NODE_FACTORY(HTMLFrameElement)
43 43
44 bool HTMLFrameElement::layoutObjectIsNeeded(const ComputedStyle&) 44 bool HTMLFrameElement::layoutObjectIsNeeded(const ComputedStyle&)
45 { 45 {
46 // For compatibility, frames render even when display: none is set. 46 // For compatibility, frames render even when display: none is set.
47 return isURLAllowed(); 47 return isURLAllowed(WillNotLoadURL);
48 } 48 }
49 49
50 LayoutObject* HTMLFrameElement::createLayoutObject(const ComputedStyle&) 50 LayoutObject* HTMLFrameElement::createLayoutObject(const ComputedStyle&)
51 { 51 {
52 return new LayoutFrame(this); 52 return new LayoutFrame(this);
53 } 53 }
54 54
55 bool HTMLFrameElement::noResize() const 55 bool HTMLFrameElement::noResize() const
56 { 56 {
57 return hasAttribute(noresizeAttr); 57 return hasAttribute(noresizeAttr);
(...skipping 17 matching lines...) Expand all
75 // FIXME: If we are already attached, this has no effect. 75 // FIXME: If we are already attached, this has no effect.
76 } else if (name == noresizeAttr) { 76 } else if (name == noresizeAttr) {
77 if (layoutObject()) 77 if (layoutObject())
78 layoutObject()->updateFromElement(); 78 layoutObject()->updateFromElement();
79 } else { 79 } else {
80 HTMLFrameElementBase::parseAttribute(name, oldValue, value); 80 HTMLFrameElementBase::parseAttribute(name, oldValue, value);
81 } 81 }
82 } 82 }
83 83
84 } // namespace blink 84 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698