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

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

Issue 69543007: Have NodeTraversal::nextSkippingChildren() take a reference (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase on master Created 7 years, 1 month 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/HTMLFieldSetElement.cpp ('k') | Source/core/html/HTMLOptionElement.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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 384
385 // FIXME: Style gets recalculated which is suboptimal. 385 // FIXME: Style gets recalculated which is suboptimal.
386 reattachFallbackContent(); 386 reattachFallbackContent();
387 } 387 }
388 388
389 bool HTMLObjectElement::containsJavaApplet() const 389 bool HTMLObjectElement::containsJavaApplet() const
390 { 390 {
391 if (MIMETypeRegistry::isJavaAppletMIMEType(getAttribute(typeAttr))) 391 if (MIMETypeRegistry::isJavaAppletMIMEType(getAttribute(typeAttr)))
392 return true; 392 return true;
393 393
394 for (Element* child = ElementTraversal::firstWithin(this); child; child = El ementTraversal::nextSkippingChildren(child, this)) { 394 for (Element* child = ElementTraversal::firstWithin(this); child; child = El ementTraversal::nextSkippingChildren(*child, this)) {
395 if (child->hasTagName(paramTag) 395 if (child->hasTagName(paramTag)
396 && equalIgnoringCase(child->getNameAttribute(), "type") 396 && equalIgnoringCase(child->getNameAttribute(), "type")
397 && MIMETypeRegistry::isJavaAppletMIMEType(child->getAttribute(va lueAttr).string())) 397 && MIMETypeRegistry::isJavaAppletMIMEType(child->getAttribute(va lueAttr).string()))
398 return true; 398 return true;
399 if (child->hasTagName(objectTag) && toHTMLObjectElement(child)->contains JavaApplet()) 399 if (child->hasTagName(objectTag) && toHTMLObjectElement(child)->contains JavaApplet())
400 return true; 400 return true;
401 if (child->hasTagName(appletTag)) 401 if (child->hasTagName(appletTag))
402 return true; 402 return true;
403 } 403 }
404 404
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 { 443 {
444 return FormAssociatedElement::form(); 444 return FormAssociatedElement::form();
445 } 445 }
446 446
447 bool HTMLObjectElement::isInteractiveContent() const 447 bool HTMLObjectElement::isInteractiveContent() const
448 { 448 {
449 return fastHasAttribute(usemapAttr); 449 return fastHasAttribute(usemapAttr);
450 } 450 }
451 451
452 } 452 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFieldSetElement.cpp ('k') | Source/core/html/HTMLOptionElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698