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

Unified Diff: third_party/WebKit/Source/core/html/HTMLObjectElement.cpp

Issue 2927823002: Drop ImageLoader in plugins (Closed)
Patch Set: Drop ImageLoader in plugins Created 3 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
index 2f34c6721fbc50b2efbd784de3f2a755100e74ec..193156d560798657c1e88abbfd14826b05f8efad 100644
--- a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
@@ -113,9 +113,6 @@ void HTMLObjectElement::ParseAttribute(
url_ = StripLeadingAndTrailingHTMLSpaces(params.new_value);
if (GetLayoutObject() && IsImageType()) {
SetNeedsPluginUpdate(true);
- if (!image_loader_)
- image_loader_ = HTMLImageLoader::Create(this);
- image_loader_->UpdateFromElement(ImageLoader::kUpdateIgnorePreviousError);
} else {
ReloadPluginOnAttributeChange(name);
}
@@ -362,21 +359,6 @@ void HTMLObjectElement::RenderFallbackContent() {
if (!isConnected())
return;
- // Before we give up and use fallback content, check to see if this is a MIME
- // type issue.
- if (image_loader_ && image_loader_->GetImage() &&
- image_loader_->GetImage()->GetContentStatus() !=
- ResourceStatus::kLoadError) {
- service_type_ = image_loader_->GetImage()->GetResponse().MimeType();
- if (!IsImageType()) {
- // If we don't think we have an image type anymore, then clear the image
- // from the loader.
- image_loader_->ClearImage();
- ReattachFallbackContent();
- return;
- }
- }
-
use_fallback_content_ = true;
// TODO(schenney): crbug.com/572908 Style gets recalculated which is
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLEmbedElement.idl ('k') | third_party/WebKit/Source/core/html/HTMLObjectElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698