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

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

Issue 189923002: Use new Traversal<HTML*Element> API in HTML code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/html/HTMLDetailsElement.cpp » ('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 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 paramNames.append("baseURL"); 160 paramNames.append("baseURL");
161 KURL baseURL = document().baseURL(); 161 KURL baseURL = document().baseURL();
162 paramValues.append(baseURL.string()); 162 paramValues.append(baseURL.string());
163 163
164 const AtomicString& mayScript = getAttribute(mayscriptAttr); 164 const AtomicString& mayScript = getAttribute(mayscriptAttr);
165 if (!mayScript.isNull()) { 165 if (!mayScript.isNull()) {
166 paramNames.append("mayScript"); 166 paramNames.append("mayScript");
167 paramValues.append(mayScript.string()); 167 paramValues.append(mayScript.string());
168 } 168 }
169 169
170 for (Element* child = ElementTraversal::firstWithin(*this); child; child = E lementTraversal::nextSibling(*child)) { 170 for (HTMLParamElement* param = Traversal<HTMLParamElement>::firstChild(*this ); param; param = Traversal<HTMLParamElement>::nextSibling(*param)) {
171 if (!child->hasTagName(paramTag))
172 continue;
173
174 HTMLParamElement* param = toHTMLParamElement(child);
175 if (param->name().isEmpty()) 171 if (param->name().isEmpty())
176 continue; 172 continue;
177 173
178 paramNames.append(param->name()); 174 paramNames.append(param->name());
179 paramValues.append(param->value()); 175 paramValues.append(param->value());
180 } 176 }
181 177
182 RefPtr<Widget> widget; 178 RefPtr<Widget> widget;
183 if (frame->loader().allowPlugins(AboutToInstantiatePlugin)) 179 if (frame->loader().allowPlugins(AboutToInstantiatePlugin))
184 widget = frame->loader().client()->createJavaAppletWidget(this, baseURL, paramNames, paramValues); 180 widget = frame->loader().client()->createJavaAppletWidget(this, baseURL, paramNames, paramValues);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 214
219 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) 215 if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
220 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) { 216 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) {
221 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy); 217 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy);
222 return false; 218 return false;
223 } 219 }
224 return true; 220 return true;
225 } 221 }
226 222
227 } 223 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLDetailsElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698