third_party/WebKit/Source/core/html/HTMLImageElement.cpp - Issue 2364073002: Reland of HTMLImageElement: do not use fallback content for ImageDocument

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2364073002: Reland of HTMLImageElement: do not use fallback content for ImageDocument (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 3 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

« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/images/png-partial-load-as-document-expected.txt ('k') | third_party/WebKit/Source/core/loader/ImageLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLImageElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp

index 757fddb552d961d1f901387ef0d909c8f8dd3796..04344634724ef3ca6679324c4da7800f0535c088 100644

--- a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp

@@ -733,6 +733,7 @@

bool imageHasLoaded = imageLoader().image() && !imageLoader().image()->isLoading() && !imageLoader().image()->errorOccurred();

bool imageStillLoading = !imageHasLoaded && imageLoader().hasPendingActivity() && !imageLoader().hasPendingError() && !imageSourceURL().isEmpty();

bool imageHasImage = imageLoader().image() && imageLoader().image()->hasImage();

+ bool imageIsDocument = imageLoader().isLoadingImageDocument() && imageLoader().image() && !imageLoader().image()->errorOccurred();

// Icky special case for deferred images:

// A deferred image is not loading, does have pending activity, does not

@@ -746,7 +747,7 @@

// Instead of dealing with that, there's a separate check that the

// ImageResource has non-null image data associated with it, which isn't

// folded into imageHasLoaded above.

- if ((imageHasLoaded && imageHasImage) || imageStillLoading)

+ if ((imageHasLoaded && imageHasImage) || imageStillLoading || imageIsDocument)

ensurePrimaryContent();

else

ensureFallbackContent();