Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp - Issue 10444013: Merge 117191 - Assertion failure running Mozilla's WebGL performance regression tests

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/cg/GraphicsContext3DCG.cpp

Issue 10444013: Merge 117191 - Assertion failure running Mozilla's WebGL performance regression tests (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 7 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 | « Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp ('k') | Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp

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

--- Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (revision 118409)

+++ Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (working copy)

@@ -240,7 +240,13 @@

if (!pixelData)

return false;

const UInt8* rgba = CFDataGetBytePtr(pixelData.get());

- outputVector.resize(width * height * 4);

+ unsigned int packedSize;

+ // Output data is tightly packed (alignment == 1).

+ if (computeImageSizeInBytes(format, type, width, height, 1, &packedSize, 0) != GraphicsContext3D::NO_ERROR)

+ return false;

+ outputVector.resize(packedSize);

unsigned int srcUnpackAlignment = 0;

size_t bytesPerRow = CGImageGetBytesPerRow(cgImage);

unsigned int padding = bytesPerRow - bitsPerPixel / 8 * width;