third_party/WebKit/Source/core/page/PageSerializer.cpp - Issue 1369213002: Revert of Replace RawPtr with RefPtr on StylePendingImage

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/page/PageSerializer.cpp

Issue 1369213002: Revert of Replace RawPtr with RefPtr on StylePendingImage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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/Source/core/css/resolver/StyleResourceLoader.cpp ('k') | third_party/WebKit/Source/core/style/StylePendingImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/PageSerializer.cpp

diff --git a/third_party/WebKit/Source/core/page/PageSerializer.cpp b/third_party/WebKit/Source/core/page/PageSerializer.cpp

index 582f021b9f7fd4b1bcd582ba23ae12112feb9d1e..96d4a4220cefb9f71e00401f2d79b9e7dd80b2b3 100644

--- a/third_party/WebKit/Source/core/page/PageSerializer.cpp

+++ b/third_party/WebKit/Source/core/page/PageSerializer.cpp

@@ -530,9 +530,8 @@

{

if (cssValue->isImageValue()) {

CSSImageValue* imageValue = toCSSImageValue(cssValue);

- if (imageValue->isCachePending())

- return;

- StyleImage* styleImage = imageValue->cachedImage();

+ StyleImage* styleImage = imageValue->cachedOrPendingImage();

+ // Non cached-images are just place-holders and do not contain data.

if (!styleImage || !styleImage->isImageResource())

return;