<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162031] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162031">162031</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-01-14 18:03:49 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebGL] WebGLRenderingContext::validateCompressedTexDimensions improperly calculates values
https://bugs.webkit.org/show_bug.cgi?id=126926
Reviewed by Dean Jackson.
Test coverage in fast/canvas/webgl/webgl-compressed-texture-size-limit.html
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::compressedTexImage2D): Pass target to
validation function.
(WebCore::WebGLRenderingContext::validateCompressedTexDimensions): Revise
calculation to also confirm size is in bounds.
(WebCore::WebGLRenderingContext::validateCompressedTexSubDimensions): Pass
target to validation function.
* html/canvas/WebGLRenderingContext.h: Modify signature.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContexth">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162030 => 162031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-15 01:58:23 UTC (rev 162030)
+++ trunk/Source/WebCore/ChangeLog 2014-01-15 02:03:49 UTC (rev 162031)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-14 Brent Fulgham <bfulgham@apple.com>
+
+ [WebGL] WebGLRenderingContext::validateCompressedTexDimensions improperly calculates values
+ https://bugs.webkit.org/show_bug.cgi?id=126926
+
+ Reviewed by Dean Jackson.
+
+ Test coverage in fast/canvas/webgl/webgl-compressed-texture-size-limit.html
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::compressedTexImage2D): Pass target to
+ validation function.
+ (WebCore::WebGLRenderingContext::validateCompressedTexDimensions): Revise
+ calculation to also confirm size is in bounds.
+ (WebCore::WebGLRenderingContext::validateCompressedTexSubDimensions): Pass
+ target to validation function.
+ * html/canvas/WebGLRenderingContext.h: Modify signature.
+
</ins><span class="cx"> 2014-01-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> On iOS, we never want to make scrollbar layers
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (162030 => 162031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-01-15 01:58:23 UTC (rev 162030)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-01-15 02:03:49 UTC (rev 162031)
</span><span class="lines">@@ -1326,7 +1326,7 @@
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "compressedTexImage2D", "border not 0");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (!validateCompressedTexDimensions("compressedTexImage2D", level, width, height, internalformat))
</del><ins>+ if (!validateCompressedTexDimensions("compressedTexImage2D", target, level, width, height, internalformat))
</ins><span class="cx"> return;
</span><span class="cx"> if (!validateCompressedTexFuncData("compressedTexImage2D", width, height, internalformat, data))
</span><span class="cx"> return;
</span><span class="lines">@@ -5318,12 +5318,13 @@
</span><span class="cx">
</span><span class="cx"> unsigned int bytesRequired = 0;
</span><span class="cx">
</span><ins>+ const int kBlockWidth = 4;
+ const int kBlockHeight = 4;
+
</ins><span class="cx"> switch (format) {
</span><span class="cx"> case Extensions3D::COMPRESSED_RGB_S3TC_DXT1_EXT:
</span><span class="cx"> case Extensions3D::COMPRESSED_RGBA_S3TC_DXT1_EXT:
</span><span class="cx"> {
</span><del>- const int kBlockWidth = 4;
- const int kBlockHeight = 4;
</del><span class="cx"> const int kBlockSize = 8;
</span><span class="cx"> int numBlocksAcross = (width + kBlockWidth - 1) / kBlockWidth;
</span><span class="cx"> int numBlocksDown = (height + kBlockHeight - 1) / kBlockHeight;
</span><span class="lines">@@ -5334,8 +5335,6 @@
</span><span class="cx"> case Extensions3D::COMPRESSED_RGBA_S3TC_DXT3_EXT:
</span><span class="cx"> case Extensions3D::COMPRESSED_RGBA_S3TC_DXT5_EXT:
</span><span class="cx"> {
</span><del>- const int kBlockWidth = 4;
- const int kBlockHeight = 4;
</del><span class="cx"> const int kBlockSize = 16;
</span><span class="cx"> int numBlocksAcross = (width + kBlockWidth - 1) / kBlockWidth;
</span><span class="cx"> int numBlocksDown = (height + kBlockHeight - 1) / kBlockHeight;
</span><span class="lines">@@ -5345,13 +5344,13 @@
</span><span class="cx"> break;
</span><span class="cx"> case Extensions3D::COMPRESSED_ATC_RGB_AMD:
</span><span class="cx"> {
</span><del>- bytesRequired = floor(static_cast<double>((width + 3) / 4)) * floor(static_cast<double>((height + 3) / 4)) * 8;
</del><ins>+ bytesRequired = floor(static_cast<double>((width + kBlockWidth - 1) / 4)) * floor(static_cast<double>((height + 3) / 4)) * 8;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case Extensions3D::COMPRESSED_ATC_RGBA_EXPLICIT_ALPHA_AMD:
</span><span class="cx"> case Extensions3D::COMPRESSED_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
</span><span class="cx"> {
</span><del>- bytesRequired = floor(static_cast<double>((width + 3) / 4)) * floor(static_cast<double>((height + 3) / 4)) * 16;
</del><ins>+ bytesRequired = floor(static_cast<double>((width + kBlockWidth - 1) / 4)) * floor(static_cast<double>((height + 3) / 4)) * 16;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case Extensions3D::COMPRESSED_RGB_PVRTC_4BPPV1_IMG:
</span><span class="lines">@@ -5379,20 +5378,22 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLRenderingContext::validateCompressedTexDimensions(const char* functionName, GC3Dint level, GC3Dsizei width, GC3Dsizei height, GC3Denum format)
</del><ins>+bool WebGLRenderingContext::validateCompressedTexDimensions(const char* functionName, GC3Denum target, GC3Dint level, GC3Dsizei width, GC3Dsizei height, GC3Denum format)
</ins><span class="cx"> {
</span><span class="cx"> switch (format) {
</span><span class="cx"> case Extensions3D::COMPRESSED_RGB_S3TC_DXT1_EXT:
</span><span class="cx"> case Extensions3D::COMPRESSED_RGBA_S3TC_DXT1_EXT:
</span><span class="cx"> case Extensions3D::COMPRESSED_RGBA_S3TC_DXT3_EXT:
</span><span class="cx"> case Extensions3D::COMPRESSED_RGBA_S3TC_DXT5_EXT: {
</span><del>- const int kBlockWidth = 4;
- const int kBlockHeight = 4;
- bool widthValid = (level && width == 1) || (level && width == 2) || !(width % kBlockWidth);
- bool heightValid = (level && height == 1) || (level && height == 2) || !(height % kBlockHeight);
</del><ins>+ const GC3Dsizei kBlockWidth = 4;
+ const GC3Dsizei kBlockHeight = 4;
+ const GC3Dint maxTextureSize = target ? m_maxTextureSize : m_maxCubeMapTextureSize;
+ const GC3Dsizei maxCompressedDimension = maxTextureSize >> level;
+ bool widthValid = (level && width == 1) || (level && width == 2) || (!(width % kBlockWidth) && width <= maxCompressedDimension);
+ bool heightValid = (level && height == 1) || (level && height == 2) || (!(height % kBlockHeight) && height <= maxCompressedDimension);
</ins><span class="cx"> if (!widthValid || !heightValid) {
</span><del>- synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "width or height invalid for level");
- return false;
</del><ins>+ synthesizeGLError(GraphicsContext3D::INVALID_VALUE, functionName, "width or height invalid for level");
+ return false;
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -5425,7 +5426,7 @@
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "dimensions out of range");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- return validateCompressedTexDimensions(functionName, level, width, height, format);
</del><ins>+ return validateCompressedTexDimensions(functionName, target, level, width, height, format);
</ins><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h (162030 => 162031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2014-01-15 01:58:23 UTC (rev 162030)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2014-01-15 02:03:49 UTC (rev 162031)
</span><span class="lines">@@ -664,7 +664,7 @@
</span><span class="cx">
</span><span class="cx"> // Helper function to validate compressed texture dimensions are valid for
</span><span class="cx"> // the given format.
</span><del>- bool validateCompressedTexDimensions(const char* functionName, GC3Dint level, GC3Dsizei width, GC3Dsizei height, GC3Denum format);
</del><ins>+ bool validateCompressedTexDimensions(const char* functionName, GC3Denum target, GC3Dint level, GC3Dsizei width, GC3Dsizei height, GC3Denum format);
</ins><span class="cx">
</span><span class="cx"> // Helper function to validate compressed texture dimensions are valid for
</span><span class="cx"> // the given format.
</span></span></pre>
</div>
</div>
</body>
</html>