sky/engine/core/loader/ImageLoader.cpp - Issue 709213002: Remove ContentData.

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: sky/engine/core/loader/ImageLoader.cpp

Issue 709213002: Remove ContentData. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sky/engine/core/loader/ImageLoader.cpp

diff --git a/sky/engine/core/loader/ImageLoader.cpp b/sky/engine/core/loader/ImageLoader.cpp

index e2e588e5831aff9b45db25dfdfc9537df704bc51..b29803a0eda0ceb8c8dbe39ee57415e0f2b50c46 100644

--- a/sky/engine/core/loader/ImageLoader.cpp

+++ b/sky/engine/core/loader/ImageLoader.cpp

@@ -364,9 +364,7 @@ RenderImageResource* ImageLoader::renderImageResource()

if (!renderer)

return 0;

- // We don't return style generated image because it doesn't belong to the ImageLoader.

- // See <https://bugs.webkit.org/show_bug.cgi?id=42840>

- if (renderer->isImage() && !static_cast<RenderImage*>(renderer)->isGeneratedContent())

+ if (renderer->isImage())

return toRenderImage(renderer)->imageResource();

return 0;