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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLIFrameElement.h ('k') | Source/core/html/HTMLImageElement.h » ('j') | 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 } 117 }
118 m_name = value; 118 m_name = value;
119 } else if (name == sandboxAttr) { 119 } else if (name == sandboxAttr) {
120 m_sandbox->setValue(value); 120 m_sandbox->setValue(value);
121 UseCounter::count(document(), UseCounter::SandboxViaIFrame); 121 UseCounter::count(document(), UseCounter::SandboxViaIFrame);
122 } else { 122 } else {
123 HTMLFrameElementBase::parseAttribute(name, value); 123 HTMLFrameElementBase::parseAttribute(name, value);
124 } 124 }
125 } 125 }
126 126
127 bool HTMLIFrameElement::layoutObjectIsNeeded(const LayoutStyle& style) 127 bool HTMLIFrameElement::layoutObjectIsNeeded(const ComputedStyle& style)
128 { 128 {
129 return isURLAllowed() && HTMLElement::layoutObjectIsNeeded(style); 129 return isURLAllowed() && HTMLElement::layoutObjectIsNeeded(style);
130 } 130 }
131 131
132 LayoutObject* HTMLIFrameElement::createLayoutObject(const LayoutStyle&) 132 LayoutObject* HTMLIFrameElement::createLayoutObject(const ComputedStyle&)
133 { 133 {
134 return new LayoutIFrame(this); 134 return new LayoutIFrame(this);
135 } 135 }
136 136
137 Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode * insertionPoint) 137 Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode * insertionPoint)
138 { 138 {
139 if (insertionPoint->inDocument()) { 139 if (insertionPoint->inDocument()) {
140 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivi tyLoggerIfIsolatedWorld(); 140 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivi tyLoggerIfIsolatedWorld();
141 if (activityLogger) { 141 if (activityLogger) {
142 Vector<String> argv; 142 Vector<String> argv;
(...skipping 22 matching lines...) Expand all
165 165
166 void HTMLIFrameElement::valueChanged() 166 void HTMLIFrameElement::valueChanged()
167 { 167 {
168 String invalidTokens; 168 String invalidTokens;
169 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));
170 if (!invalidTokens.isNull()) 170 if (!invalidTokens.isNull())
171 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));
172 } 172 }
173 173
174 } 174 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLIFrameElement.h ('k') | Source/core/html/HTMLImageElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698