diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebCore/platform/graphics/GraphicsContext3D.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebCore/platform/graphics/GraphicsContext3D.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/GraphicsContext3D.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.cpp b/Source/WebCore/platform/graphics/GraphicsContext3D.cpp index bc899472c..5f6942bf5 100644 --- a/Source/WebCore/platform/graphics/GraphicsContext3D.cpp +++ b/Source/WebCore/platform/graphics/GraphicsContext3D.cpp @@ -116,9 +116,7 @@ bool GraphicsContext3D::computeFormatAndTypeParameters(GC3Denum format, *componentsPerPixel = 1; *bytesPerComponent = sizeof(GC3Dushort); break; -#if !PLATFORM(BLACKBERRY) case GraphicsContext3D::UNSIGNED_INT_24_8: -#endif case GraphicsContext3D::UNSIGNED_INT: *bytesPerComponent = sizeof(GC3Duint); break; @@ -149,7 +147,7 @@ GC3Denum GraphicsContext3D::computeImageSizeInBytes(GC3Denum format, GC3Denum ty } CheckedInt<uint32_t> checkedValue(bytesPerComponent * componentsPerPixel); checkedValue *= width; - if (!checkedValue.valid()) + if (!checkedValue.isValid()) return GraphicsContext3D::INVALID_VALUE; unsigned int validRowSize = checkedValue.value(); unsigned int padding = 0; @@ -161,7 +159,7 @@ GC3Denum GraphicsContext3D::computeImageSizeInBytes(GC3Denum format, GC3Denum ty // Last row needs no padding. checkedValue *= (height - 1); checkedValue += validRowSize; - if (!checkedValue.valid()) + if (!checkedValue.isValid()) return GraphicsContext3D::INVALID_VALUE; *imageSizeInBytes = checkedValue.value(); if (paddingInBytes) |