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

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

Issue 2864253003: Split ImageLoader::SetImage() and set flags consistently in tests (Closed)
Patch Set: Update comment Created 3 years, 7 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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 392
393 // Before we give up and use fallback content, check to see if this is a MIME 393 // Before we give up and use fallback content, check to see if this is a MIME
394 // type issue. 394 // type issue.
395 if (image_loader_ && image_loader_->GetImage() && 395 if (image_loader_ && image_loader_->GetImage() &&
396 image_loader_->GetImage()->GetContentStatus() != 396 image_loader_->GetImage()->GetContentStatus() !=
397 ResourceStatus::kLoadError) { 397 ResourceStatus::kLoadError) {
398 service_type_ = image_loader_->GetImage()->GetResponse().MimeType(); 398 service_type_ = image_loader_->GetImage()->GetResponse().MimeType();
399 if (!IsImageType()) { 399 if (!IsImageType()) {
400 // If we don't think we have an image type anymore, then clear the image 400 // If we don't think we have an image type anymore, then clear the image
401 // from the loader. 401 // from the loader.
402 image_loader_->SetImage(0); 402 image_loader_->ClearImage();
403 ReattachFallbackContent(); 403 ReattachFallbackContent();
404 return; 404 return;
405 } 405 }
406 } 406 }
407 407
408 use_fallback_content_ = true; 408 use_fallback_content_ = true;
409 409
410 // TODO(schenney): crbug.com/572908 Style gets recalculated which is 410 // TODO(schenney): crbug.com/572908 Style gets recalculated which is
411 // suboptimal. 411 // suboptimal.
412 ReattachFallbackContent(); 412 ReattachFallbackContent();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 465
466 bool HTMLObjectElement::WillUseFallbackContentAtLayout() const { 466 bool HTMLObjectElement::WillUseFallbackContentAtLayout() const {
467 return !HasValidClassId() && HasFallbackContent(); 467 return !HasValidClassId() && HasFallbackContent();
468 } 468 }
469 469
470 void HTMLObjectElement::AssociateWith(HTMLFormElement* form) { 470 void HTMLObjectElement::AssociateWith(HTMLFormElement* form) {
471 AssociateByParser(form); 471 AssociateByParser(form);
472 }; 472 };
473 473
474 } // namespace blink 474 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLImageElement.h ('k') | third_party/WebKit/Source/core/loader/ImageLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698