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

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

Issue 419203004: DevTools: wrapping arguments addConsoleMessage in ConsoleMessage (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@wrap-not-all-console-args
Patch Set: Created 6 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, 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 11 matching lines...) Expand all
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "core/html/HTMLIFrameElement.h" 26 #include "core/html/HTMLIFrameElement.h"
27 27
28 #include "bindings/core/v8/V8DOMActivityLogger.h" 28 #include "bindings/core/v8/V8DOMActivityLogger.h"
29 #include "core/CSSPropertyNames.h" 29 #include "core/CSSPropertyNames.h"
30 #include "core/HTMLNames.h" 30 #include "core/HTMLNames.h"
31 #include "core/html/HTMLDocument.h" 31 #include "core/html/HTMLDocument.h"
32 #include "core/inspector/ConsoleMessage.h"
32 #include "core/rendering/RenderIFrame.h" 33 #include "core/rendering/RenderIFrame.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 using namespace HTMLNames; 37 using namespace HTMLNames;
37 38
38 inline HTMLIFrameElement::HTMLIFrameElement(Document& document) 39 inline HTMLIFrameElement::HTMLIFrameElement(Document& document)
39 : HTMLFrameElementBase(iframeTag, document) 40 : HTMLFrameElementBase(iframeTag, document)
40 , m_didLoadNonEmptyDocument(false) 41 , m_didLoadNonEmptyDocument(false)
41 { 42 {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 if (inDocument() && document().isHTMLDocument() && !isInShadowTree()) { 93 if (inDocument() && document().isHTMLDocument() && !isInShadowTree()) {
93 HTMLDocument& document = toHTMLDocument(this->document()); 94 HTMLDocument& document = toHTMLDocument(this->document());
94 document.removeExtraNamedItem(m_name); 95 document.removeExtraNamedItem(m_name);
95 document.addExtraNamedItem(value); 96 document.addExtraNamedItem(value);
96 } 97 }
97 m_name = value; 98 m_name = value;
98 } else if (name == sandboxAttr) { 99 } else if (name == sandboxAttr) {
99 String invalidTokens; 100 String invalidTokens;
100 setSandboxFlags(value.isNull() ? SandboxNone : parseSandboxPolicy(value, invalidTokens)); 101 setSandboxFlags(value.isNull() ? SandboxNone : parseSandboxPolicy(value, invalidTokens));
101 if (!invalidTokens.isNull()) 102 if (!invalidTokens.isNull())
102 document().addConsoleMessage(OtherMessageSource, ErrorMessageLevel, "Error while parsing the 'sandbox' attribute: " + invalidTokens); 103 document().addConsoleMessage(ConsoleMessage::create(OtherMessageSour ce, ErrorMessageLevel, "Error while parsing the 'sandbox' attribute: " + invalid Tokens));
103 } else { 104 } else {
104 HTMLFrameElementBase::parseAttribute(name, value); 105 HTMLFrameElementBase::parseAttribute(name, value);
105 } 106 }
106 } 107 }
107 108
108 bool HTMLIFrameElement::rendererIsNeeded(const RenderStyle& style) 109 bool HTMLIFrameElement::rendererIsNeeded(const RenderStyle& style)
109 { 110 {
110 return isURLAllowed() && HTMLElement::rendererIsNeeded(style); 111 return isURLAllowed() && HTMLElement::rendererIsNeeded(style);
111 } 112 }
112 113
(...skipping 25 matching lines...) Expand all
138 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree()) 139 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree())
139 toHTMLDocument(document()).removeExtraNamedItem(m_name); 140 toHTMLDocument(document()).removeExtraNamedItem(m_name);
140 } 141 }
141 142
142 bool HTMLIFrameElement::isInteractiveContent() const 143 bool HTMLIFrameElement::isInteractiveContent() const
143 { 144 {
144 return true; 145 return true;
145 } 146 }
146 147
147 } 148 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698