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

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

Issue 2504573002: Don't call isURLAllowed() from layout. (Closed)
Patch Set: Fix bad formatting that caused clang-format-diff to get confused. Created 4 years, 1 month 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 23 matching lines...) Expand all
34 34
35 inline HTMLFrameElement::HTMLFrameElement(Document& document) 35 inline HTMLFrameElement::HTMLFrameElement(Document& document)
36 : HTMLFrameElementBase(frameTag, document), 36 : HTMLFrameElementBase(frameTag, document),
37 m_frameBorder(true), 37 m_frameBorder(true),
38 m_frameBorderSet(false) {} 38 m_frameBorderSet(false) {}
39 39
40 DEFINE_NODE_FACTORY(HTMLFrameElement) 40 DEFINE_NODE_FACTORY(HTMLFrameElement)
41 41
42 bool HTMLFrameElement::layoutObjectIsNeeded(const ComputedStyle&) { 42 bool HTMLFrameElement::layoutObjectIsNeeded(const ComputedStyle&) {
43 // For compatibility, frames render even when display: none is set. 43 // For compatibility, frames render even when display: none is set.
44 return isURLAllowed(); 44 return contentFrame();
45 } 45 }
46 46
47 LayoutObject* HTMLFrameElement::createLayoutObject(const ComputedStyle&) { 47 LayoutObject* HTMLFrameElement::createLayoutObject(const ComputedStyle&) {
48 return new LayoutFrame(this); 48 return new LayoutFrame(this);
49 } 49 }
50 50
51 bool HTMLFrameElement::noResize() const { 51 bool HTMLFrameElement::noResize() const {
52 return hasAttribute(noresizeAttr); 52 return hasAttribute(noresizeAttr);
53 } 53 }
54 54
(...skipping 16 matching lines...) Expand all
71 // FIXME: If we are already attached, this has no effect. 71 // FIXME: If we are already attached, this has no effect.
72 } else if (name == noresizeAttr) { 72 } else if (name == noresizeAttr) {
73 if (layoutObject()) 73 if (layoutObject())
74 layoutObject()->updateFromElement(); 74 layoutObject()->updateFromElement();
75 } else { 75 } else {
76 HTMLFrameElementBase::parseAttribute(name, oldValue, value); 76 HTMLFrameElementBase::parseAttribute(name, oldValue, value);
77 } 77 }
78 } 78 }
79 79
80 } // namespace blink 80 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698