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

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

Issue 23464095: WTF::notFound looks too much like a local variable. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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/HTMLMediaElement.cpp ('k') | Source/core/html/HTMLSelectElement.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, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 HTMLPlugInImageElement::collectStyleForPresentationAttribute(name, value , style); 89 HTMLPlugInImageElement::collectStyleForPresentationAttribute(name, value , style);
90 } 90 }
91 91
92 void HTMLObjectElement::parseAttribute(const QualifiedName& name, const AtomicSt ring& value) 92 void HTMLObjectElement::parseAttribute(const QualifiedName& name, const AtomicSt ring& value)
93 { 93 {
94 if (name == formAttr) 94 if (name == formAttr)
95 formAttributeChanged(); 95 formAttributeChanged();
96 else if (name == typeAttr) { 96 else if (name == typeAttr) {
97 m_serviceType = value.lower(); 97 m_serviceType = value.lower();
98 size_t pos = m_serviceType.find(";"); 98 size_t pos = m_serviceType.find(";");
99 if (pos != notFound) 99 if (pos != kNotFound)
100 m_serviceType = m_serviceType.left(pos); 100 m_serviceType = m_serviceType.left(pos);
101 if (renderer()) 101 if (renderer())
102 setNeedsWidgetUpdate(true); 102 setNeedsWidgetUpdate(true);
103 } else if (name == dataAttr) { 103 } else if (name == dataAttr) {
104 m_url = stripLeadingAndTrailingHTMLSpaces(value); 104 m_url = stripLeadingAndTrailingHTMLSpaces(value);
105 if (renderer()) { 105 if (renderer()) {
106 setNeedsWidgetUpdate(true); 106 setNeedsWidgetUpdate(true);
107 if (isImageType()) { 107 if (isImageType()) {
108 if (!m_imageLoader) 108 if (!m_imageLoader)
109 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); 109 m_imageLoader = adoptPtr(new HTMLImageLoader(this));
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 paramNames.append(p->name()); 159 paramNames.append(p->name());
160 paramValues.append(p->value()); 160 paramValues.append(p->value());
161 161
162 // FIXME: url adjustment does not belong in this function. 162 // FIXME: url adjustment does not belong in this function.
163 if (url.isEmpty() && urlParameter.isEmpty() && (equalIgnoringCase(name, "src") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "code") || equalIgnoringCase(name, "url"))) 163 if (url.isEmpty() && urlParameter.isEmpty() && (equalIgnoringCase(name, "src") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "code") || equalIgnoringCase(name, "url")))
164 urlParameter = stripLeadingAndTrailingHTMLSpaces(p->value()); 164 urlParameter = stripLeadingAndTrailingHTMLSpaces(p->value());
165 // FIXME: serviceType calculation does not belong in this function. 165 // FIXME: serviceType calculation does not belong in this function.
166 if (serviceType.isEmpty() && equalIgnoringCase(name, "type")) { 166 if (serviceType.isEmpty() && equalIgnoringCase(name, "type")) {
167 serviceType = p->value(); 167 serviceType = p->value();
168 size_t pos = serviceType.find(";"); 168 size_t pos = serviceType.find(";");
169 if (pos != notFound) 169 if (pos != kNotFound)
170 serviceType = serviceType.left(pos); 170 serviceType = serviceType.left(pos);
171 } 171 }
172 } 172 }
173 173
174 // When OBJECT is used for an applet via Sun's Java plugin, the CODEBASE att ribute in the tag 174 // When OBJECT is used for an applet via Sun's Java plugin, the CODEBASE att ribute in the tag
175 // points to the Java plugin itself (an ActiveX component) while the actual applet CODEBASE is 175 // points to the Java plugin itself (an ActiveX component) while the actual applet CODEBASE is
176 // in a PARAM tag. See <http://java.sun.com/products/plugin/1.2/docs/tags.ht ml>. This means 176 // in a PARAM tag. See <http://java.sun.com/products/plugin/1.2/docs/tags.ht ml>. This means
177 // we have to explicitly suppress the tag's CODEBASE attribute if there is n one in a PARAM, 177 // we have to explicitly suppress the tag's CODEBASE attribute if there is n one in a PARAM,
178 // else our Java plugin will misinterpret it. [4004531] 178 // else our Java plugin will misinterpret it. [4004531]
179 String codebase; 179 String codebase;
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 encoding.appendData(name(), value); 502 encoding.appendData(name(), value);
503 return true; 503 return true;
504 } 504 }
505 505
506 HTMLFormElement* HTMLObjectElement::virtualForm() const 506 HTMLFormElement* HTMLObjectElement::virtualForm() const
507 { 507 {
508 return FormAssociatedElement::form(); 508 return FormAssociatedElement::form();
509 } 509 }
510 510
511 } 511 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/HTMLSelectElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698