Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

Issue 1566283003: Upgrade blink side ReadPixels size validation to consider ES3 pack parameters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/webgl/WebGL2RenderingContextBase.h" 5 #include "modules/webgl/WebGL2RenderingContextBase.h"
6 6
7 #include "bindings/modules/v8/WebGLAny.h" 7 #include "bindings/modules/v8/WebGLAny.h"
8 #include "core/html/HTMLCanvasElement.h" 8 #include "core/html/HTMLCanvasElement.h"
9 #include "core/html/HTMLImageElement.h" 9 #include "core/html/HTMLImageElement.h"
10 #include "core/html/HTMLVideoElement.h" 10 #include "core/html/HTMLVideoElement.h"
(...skipping 3425 matching lines...) Expand 10 before | Expand all | Expand 10 after
3436 ASSERT(unit < m_samplerUnits.size()); 3436 ASSERT(unit < m_samplerUnits.size());
3437 3437
3438 WebGLSampler* sampler = m_samplerUnits[unit]; 3438 WebGLSampler* sampler = m_samplerUnits[unit];
3439 3439
3440 if (sampler) 3440 if (sampler)
3441 return sampler->getSamplerState(); 3441 return sampler->getSamplerState();
3442 3442
3443 return WebGLRenderingContextBase::getTextureUnitSamplerState(target, unit); 3443 return WebGLRenderingContextBase::getTextureUnitSamplerState(target, unit);
3444 } 3444 }
3445 3445
3446 WebGLImageConversion::PixelStoreParams WebGL2RenderingContextBase::getPackPixelS toreParams()
3447 {
3448 WebGLImageConversion::PixelStoreParams params;
3449 params.alignment = m_packAlignment;
3450 params.rowLength = m_packRowLength;
3451 params.skipPixels = m_packSkipPixels;
3452 params.skipRows = m_packSkipRows;
3453 return params;
3454 }
3455
3456 WebGLImageConversion::PixelStoreParams WebGL2RenderingContextBase::getUnpackPixe lStoreParams()
3457 {
3458 WebGLImageConversion::PixelStoreParams params;
3459 params.alignment = m_unpackAlignment;
3460 params.rowLength = m_unpackRowLength;
3461 params.imageHeight = m_unpackImageHeight;
3462 params.skipPixels = m_unpackSkipPixels;
3463 params.skipRows = m_unpackSkipRows;
3464 params.skipImages = m_unpackSkipImages;
3465 return params;
3466 }
3467
3446 } // namespace blink 3468 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698