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

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

Issue 2642383003: Replace Resource::Status with ResourceStatus (Closed)
Patch Set: Rebase. Created 3 years, 10 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
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 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights
6 * reserved. 6 * reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 void HTMLObjectElement::renderFallbackContent() { 380 void HTMLObjectElement::renderFallbackContent() {
381 if (useFallbackContent()) 381 if (useFallbackContent())
382 return; 382 return;
383 383
384 if (!isConnected()) 384 if (!isConnected())
385 return; 385 return;
386 386
387 // Before we give up and use fallback content, check to see if this is a MIME 387 // Before we give up and use fallback content, check to see if this is a MIME
388 // type issue. 388 // type issue.
389 if (m_imageLoader && m_imageLoader->image() && 389 if (m_imageLoader && m_imageLoader->image() &&
390 m_imageLoader->image()->getStatus() != Resource::LoadError) { 390 m_imageLoader->image()->getStatus() != ResourceStatus::LoadError) {
391 m_serviceType = m_imageLoader->image()->response().mimeType(); 391 m_serviceType = m_imageLoader->image()->response().mimeType();
392 if (!isImageType()) { 392 if (!isImageType()) {
393 // If we don't think we have an image type anymore, then clear the image 393 // If we don't think we have an image type anymore, then clear the image
394 // from the loader. 394 // from the loader.
395 m_imageLoader->setImage(0); 395 m_imageLoader->setImage(0);
396 reattachFallbackContent(); 396 reattachFallbackContent();
397 return; 397 return;
398 } 398 }
399 } 399 }
400 400
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 458
459 bool HTMLObjectElement::willUseFallbackContentAtLayout() const { 459 bool HTMLObjectElement::willUseFallbackContentAtLayout() const {
460 return !hasValidClassId() && hasFallbackContent(); 460 return !hasValidClassId() && hasFallbackContent();
461 } 461 }
462 462
463 void HTMLObjectElement::associateWith(HTMLFormElement* form) { 463 void HTMLObjectElement::associateWith(HTMLFormElement* form) {
464 associateByParser(form); 464 associateByParser(form);
465 }; 465 };
466 466
467 } // namespace blink 467 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/cssom/CSSStyleImageValue.h ('k') | third_party/WebKit/Source/core/html/ImageDocument.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698