Source/WebCore/platform/graphics/BitmapImage.h - Issue 7696019: Merge 93441 - REGRESSION(r91628): 3 canvas tests crash on Chromium Linux and one test fail on Chr...

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: Source/WebCore/platform/graphics/BitmapImage.h

Issue 7696019: Merge 93441 - REGRESSION(r91628): 3 canvas tests crash on Chromium Linux and one test fail on Chr... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 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

Index: Source/WebCore/platform/graphics/BitmapImage.h

===================================================================

--- Source/WebCore/platform/graphics/BitmapImage.h (revision 93492)

+++ Source/WebCore/platform/graphics/BitmapImage.h (working copy)

@@ -159,10 +159,10 @@

virtual NativeImagePtr nativeImageForCurrentFrame() { return frameAtIndex(currentFrame()); }

bool frameHasAlphaAtIndex(size_t);

- bool currentFrameHasAlpha() { return frameHasAlphaAtIndex(currentFrame()); }

+ virtual bool currentFrameHasAlpha() { return frameHasAlphaAtIndex(currentFrame()); }

#if !ASSERT_DISABLED

- bool notSolidColor()

+ virtual bool notSolidColor()

{

return size().width() != 1 || size().height() != 1 || frameCount() > 1;

}

« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/platform/graphics/Image.h » ('j') | no next file with comments »