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

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

Issue 1035533003: Oilpan: fix build++ after r192490. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: provide null trace() for non-oilpan Created 5 years, 9 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 | « Source/core/html/HTMLIFrameElement.h ('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) 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 , m_sandbox(DOMSettableTokenList::create(this)) 43 , m_sandbox(DOMSettableTokenList::create(this))
44 { 44 {
45 } 45 }
46 46
47 DEFINE_NODE_FACTORY(HTMLIFrameElement) 47 DEFINE_NODE_FACTORY(HTMLIFrameElement)
48 48
49 DEFINE_TRACE(HTMLIFrameElement) 49 DEFINE_TRACE(HTMLIFrameElement)
50 { 50 {
51 visitor->trace(m_sandbox); 51 visitor->trace(m_sandbox);
52 HTMLFrameElementBase::trace(visitor); 52 HTMLFrameElementBase::trace(visitor);
53 DOMSettableTokenListObserver::trace(visitor);
53 } 54 }
54 55
55 HTMLIFrameElement::~HTMLIFrameElement() 56 HTMLIFrameElement::~HTMLIFrameElement()
56 { 57 {
58 #if !ENABLE(OILPAN)
57 m_sandbox->setObserver(nullptr); 59 m_sandbox->setObserver(nullptr);
60 #endif
58 } 61 }
59 62
60 DOMSettableTokenList* HTMLIFrameElement::sandbox() const 63 DOMSettableTokenList* HTMLIFrameElement::sandbox() const
61 { 64 {
62 return m_sandbox.get(); 65 return m_sandbox.get();
63 } 66 }
64 67
65 bool HTMLIFrameElement::isPresentationAttribute(const QualifiedName& name) const 68 bool HTMLIFrameElement::isPresentationAttribute(const QualifiedName& name) const
66 { 69 {
67 if (name == widthAttr || name == heightAttr || name == alignAttr || name == frameborderAttr) 70 if (name == widthAttr || name == heightAttr || name == alignAttr || name == frameborderAttr)
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 165
163 void HTMLIFrameElement::valueChanged() 166 void HTMLIFrameElement::valueChanged()
164 { 167 {
165 String invalidTokens; 168 String invalidTokens;
166 setSandboxFlags(m_sandbox->value().isNull() ? SandboxNone : parseSandboxPoli cy(m_sandbox->tokens(), invalidTokens)); 169 setSandboxFlags(m_sandbox->value().isNull() ? SandboxNone : parseSandboxPoli cy(m_sandbox->tokens(), invalidTokens));
167 if (!invalidTokens.isNull()) 170 if (!invalidTokens.isNull())
168 document().addConsoleMessage(ConsoleMessage::create(OtherMessageSource, ErrorMessageLevel, "Error while parsing the 'sandbox' attribute: " + invalidToke ns)); 171 document().addConsoleMessage(ConsoleMessage::create(OtherMessageSource, ErrorMessageLevel, "Error while parsing the 'sandbox' attribute: " + invalidToke ns));
169 } 172 }
170 173
171 } 174 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLIFrameElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698