third_party/WebKit/Source/core/fetch/ImageResource.cpp - Issue 2253853002: Remove SharedBuffer::unlock() and keep Resource's SharedBuffer always locked

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/fetch/ImageResource.cpp

Issue 2253853002: Remove SharedBuffer::unlock() and keep Resource's SharedBuffer always locked (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 4 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/fetch/CSSStyleSheetResource.cpp ('k') | third_party/WebKit/Source/core/fetch/MemoryCache.cpp » ('j') | third_party/WebKit/Source/core/fetch/MemoryCache.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/ImageResource.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.cpp b/third_party/WebKit/Source/core/fetch/ImageResource.cpp

index c2ae4de0dcbc4abf3d499fc4c26480ec2e38f351..194c8e3bf43ee68a14f6706c9c6c5ea104c157c5 100644

--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp

+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp

@@ -275,8 +275,6 @@ bool ImageResource::willPaintBrokenImage() const

blink::Image* ImageResource::getImage()

{

- ASSERT(!isPurgeable());

if (errorOccurred()) {

// Returning the 1x broken image is non-ideal, but we cannot reliably access the appropriate

// deviceScaleFactor from here. It is critical that callers use ImageResource::brokenImage()

@@ -308,8 +306,6 @@ bool ImageResource::imageHasRelativeSize() const

LayoutSize ImageResource::imageSize(RespectImageOrientationEnum shouldRespectImageOrientation, float multiplier, SizeType sizeType)

{

- ASSERT(!isPurgeable());

if (!m_image)

return LayoutSize();