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

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

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 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
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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 361
362 void HTMLObjectElement::renderFallbackContent() 362 void HTMLObjectElement::renderFallbackContent()
363 { 363 {
364 if (useFallbackContent()) 364 if (useFallbackContent())
365 return; 365 return;
366 366
367 if (!inDocument()) 367 if (!inDocument())
368 return; 368 return;
369 369
370 // Before we give up and use fallback content, check to see if this is a MIM E type issue. 370 // Before we give up and use fallback content, check to see if this is a MIM E type issue.
371 if (m_imageLoader && m_imageLoader->image() && m_imageLoader->image()->statu s() != Resource::LoadError) { 371 if (m_imageLoader && m_imageLoader->image() && m_imageLoader->image()->getSt atus() != Resource::LoadError) {
372 m_serviceType = m_imageLoader->image()->response().mimeType(); 372 m_serviceType = m_imageLoader->image()->response().mimeType();
373 if (!isImageType()) { 373 if (!isImageType()) {
374 // If we don't think we have an image type anymore, then clear the i mage from the loader. 374 // If we don't think we have an image type anymore, then clear the i mage from the loader.
375 m_imageLoader->setImage(0); 375 m_imageLoader->setImage(0);
376 reattachFallbackContent(); 376 reattachFallbackContent();
377 return; 377 return;
378 } 378 }
379 } 379 }
380 380
381 m_useFallbackContent = true; 381 m_useFallbackContent = true;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 { 443 {
444 return fastHasAttribute(usemapAttr); 444 return fastHasAttribute(usemapAttr);
445 } 445 }
446 446
447 bool HTMLObjectElement::useFallbackContent() const 447 bool HTMLObjectElement::useFallbackContent() const
448 { 448 {
449 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 449 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
450 } 450 }
451 451
452 } // namespace blink 452 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698