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

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

Issue 16336010: Revert 150924 "Node::lazyAttach shouldn't lie about being attached" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 6 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
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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 363
364 if (!inDocument()) 364 if (!inDocument())
365 return; 365 return;
366 366
367 // Before we give up and use fallback content, check to see if this is a MIM E type issue. 367 // Before we give up and use fallback content, check to see if this is a MIM E type issue.
368 if (m_imageLoader && m_imageLoader->image() && m_imageLoader->image()->statu s() != CachedResource::LoadError) { 368 if (m_imageLoader && m_imageLoader->image() && m_imageLoader->image()->statu s() != CachedResource::LoadError) {
369 m_serviceType = m_imageLoader->image()->response().mimeType(); 369 m_serviceType = m_imageLoader->image()->response().mimeType();
370 if (!isImageType()) { 370 if (!isImageType()) {
371 // If we don't think we have an image type anymore, then clear the i mage from the loader. 371 // If we don't think we have an image type anymore, then clear the i mage from the loader.
372 m_imageLoader->setImage(0); 372 m_imageLoader->setImage(0);
373 lazyReattach(); 373 reattach();
374 return; 374 return;
375 } 375 }
376 } 376 }
377 377
378 m_useFallbackContent = true; 378 m_useFallbackContent = true;
379 379
380 // FIXME: Style gets recalculated which is suboptimal. 380 // FIXME: Style gets recalculated which is suboptimal.
381 lazyReattach(); 381 detach();
382 attach();
382 } 383 }
383 384
384 // FIXME: This should be removed, all callers are almost certainly wrong. 385 // FIXME: This should be removed, all callers are almost certainly wrong.
385 static bool isRecognizedTagName(const QualifiedName& tagName) 386 static bool isRecognizedTagName(const QualifiedName& tagName)
386 { 387 {
387 DEFINE_STATIC_LOCAL(HashSet<AtomicStringImpl*>, tagList, ()); 388 DEFINE_STATIC_LOCAL(HashSet<AtomicStringImpl*>, tagList, ());
388 if (tagList.isEmpty()) { 389 if (tagList.isEmpty()) {
389 QualifiedName** tags = HTMLNames::getHTMLTags(); 390 QualifiedName** tags = HTMLNames::getHTMLTags();
390 for (size_t i = 0; i < HTMLNames::HTMLTagsCount; i++) { 391 for (size_t i = 0; i < HTMLNames::HTMLTagsCount; i++) {
391 if (*tags[i] == bgsoundTag 392 if (*tags[i] == bgsoundTag
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 encoding.appendData(name(), value); 494 encoding.appendData(name(), value);
494 return true; 495 return true;
495 } 496 }
496 497
497 HTMLFormElement* HTMLObjectElement::virtualForm() const 498 HTMLFormElement* HTMLObjectElement::virtualForm() const
498 { 499 {
499 return FormAssociatedElement::form(); 500 return FormAssociatedElement::form();
500 } 501 }
501 502
502 } 503 }
OLDNEW
« no previous file with comments | « trunk/Source/core/html/HTMLDialogElement.cpp ('k') | trunk/Source/core/html/HTMLPlugInImageElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698