third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp - Issue 1629403003: Merge DOMSettableTokensList into DOMTokensList

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

Issue 1629403003: Merge DOMSettableTokensList into DOMTokensList (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: removed non-oilpan inheritance Created 4 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

OLD	NEW
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, 2008, 2009 Apple Inc. All rights reserved.	6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.

7 * Copyright (C) 2009 Ericsson AB. All rights reserved.	7 * Copyright (C) 2009 Ericsson AB. All rights reserved.

8 *	8 *

9 * This library is free software; you can redistribute it and/or	9 * This library is free software; you can redistribute it and/or

10 * modify it under the terms of the GNU Library General Public	10 * modify it under the terms of the GNU Library General Public

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 , m_referrerPolicy(ReferrerPolicyDefault)	42 , m_referrerPolicy(ReferrerPolicyDefault)

43 {	43 {

44 }	44 }

45	45

46 DEFINE_NODE_FACTORY(HTMLIFrameElement)	46 DEFINE_NODE_FACTORY(HTMLIFrameElement)

47	47

48 DEFINE_TRACE(HTMLIFrameElement)	48 DEFINE_TRACE(HTMLIFrameElement)

49 {	49 {

50 visitor->trace(m_sandbox);	50 visitor->trace(m_sandbox);

51 HTMLFrameElementBase::trace(visitor);	51 HTMLFrameElementBase::trace(visitor);

52 DOMSettableTokenListObserver::trace(visitor);	52 DOMTokenListObserver::trace(visitor);

53 }	53 }

54	54

55 HTMLIFrameElement::~HTMLIFrameElement()	55 HTMLIFrameElement::~HTMLIFrameElement()

56 {	56 {

57 #if !ENABLE(OILPAN)	57 #if !ENABLE(OILPAN)

58 m_sandbox->setObserver(nullptr);	58 m_sandbox->setObserver(nullptr);

59 #endif	59 #endif

60 }	60 }

61	61

62 DOMSettableTokenList* HTMLIFrameElement::sandbox() const	62 DOMTokenList* HTMLIFrameElement::sandbox() const

63 {	63 {

64 return m_sandbox.get();	64 return m_sandbox.get();

65 }	65 }

66	66

67 bool HTMLIFrameElement::isPresentationAttribute(const QualifiedName& name) const	67 bool HTMLIFrameElement::isPresentationAttribute(const QualifiedName& name) const

68 {	68 {

69 if (name == widthAttr \|\| name == heightAttr \|\| name == alignAttr \|\| name == frameborderAttr)	69 if (name == widthAttr \|\| name == heightAttr \|\| name == alignAttr \|\| name == frameborderAttr)

70 return true;	70 return true;

71 return HTMLFrameElementBase::isPresentationAttribute(name);	71 return HTMLFrameElementBase::isPresentationAttribute(name);

72 }	72 }

(...skipping 79 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152 if (!invalidTokens.isNull())	152 if (!invalidTokens.isNull())

153 document().addConsoleMessage(ConsoleMessage::create(OtherMessageSource, ErrorMessageLevel, "Error while parsing the 'sandbox' attribute: " + invalidToke ns));	153 document().addConsoleMessage(ConsoleMessage::create(OtherMessageSource, ErrorMessageLevel, "Error while parsing the 'sandbox' attribute: " + invalidToke ns));

154 setSynchronizedLazyAttribute(sandboxAttr, m_sandbox->value());	154 setSynchronizedLazyAttribute(sandboxAttr, m_sandbox->value());

155 }	155 }

156	156

157 ReferrerPolicy HTMLIFrameElement::referrerPolicyAttribute()	157 ReferrerPolicy HTMLIFrameElement::referrerPolicyAttribute()

158 {	158 {

159 return m_referrerPolicy;	159 return m_referrerPolicy;

160 }	160 }

161 } // namespace blink	161 } // namespace blink

OLD	NEW