Support 2D texture sub-source uploads from HTMLImageElement.

third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/webgl/WebGL2RenderingContextBase.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/dom/DOMException.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
@@ skipping 1086 matching lines @@
     return;
   }
   renderbufferStorageImpl(target, samples, internalformat, width, height,
                           functionName);
   applyStencilTest();
 }
 
 void WebGL2RenderingContextBase::resetUnpackParameters() {
   WebGLRenderingContextBase::resetUnpackParameters();
 
-  if (!m_unpackRowLength)
+  if (m_unpackRowLength)
     contextGL()->PixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-  if (!m_unpackImageHeight)
+  if (m_unpackImageHeight)
     contextGL()->PixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0);
-  if (!m_unpackSkipPixels)
+  if (m_unpackSkipPixels)
     contextGL()->PixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-  if (!m_unpackSkipRows)
+  if (m_unpackSkipRows)
     contextGL()->PixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-  if (!m_unpackSkipImages)
+  if (m_unpackSkipImages)
     contextGL()->PixelStorei(GL_UNPACK_SKIP_IMAGES, 0);
 }
 
 void WebGL2RenderingContextBase::restoreUnpackParameters() {
   WebGLRenderingContextBase::restoreUnpackParameters();
 
-  if (!m_unpackRowLength)
+  if (m_unpackRowLength)
     contextGL()->PixelStorei(GL_UNPACK_ROW_LENGTH, m_unpackRowLength);
-  if (!m_unpackImageHeight)
+  if (m_unpackImageHeight)
     contextGL()->PixelStorei(GL_UNPACK_IMAGE_HEIGHT, m_unpackImageHeight);
-  if (!m_unpackSkipPixels)
+  if (m_unpackSkipPixels)
     contextGL()->PixelStorei(GL_UNPACK_SKIP_PIXELS, m_unpackSkipPixels);
-  if (!m_unpackSkipRows)
+  if (m_unpackSkipRows)
     contextGL()->PixelStorei(GL_UNPACK_SKIP_ROWS, m_unpackSkipRows);
-  if (!m_unpackSkipImages)
+  if (m_unpackSkipImages)
     contextGL()->PixelStorei(GL_UNPACK_SKIP_IMAGES, m_unpackSkipImages);
 }
 
 /* Texture objects */
 bool WebGL2RenderingContextBase::validateTexStorage(
     const char* functionName,
     GLenum target,
     GLsizei levels,
     GLenum internalformat,
     GLsizei width,
@@ skipping 157 matching lines @@
 void WebGL2RenderingContextBase::texImage2D(GLenum target,
                                             GLint level,
                                             GLint internalformat,
                                             GLsizei width,
                                             GLsizei height,
                                             GLint border,
                                             GLenum format,
                                             GLenum type,
                                             HTMLImageElement* image,
                                             ExceptionState& exceptionState) {
-  // TODO(zmo): To be implemented.
+  IntRect sourceImageRect;
+  if (image) {
+    sourceImageRect.setLocation(IntPoint(m_unpackSkipPixels, m_unpackSkipRows));
+    sourceImageRect.setSize(IntSize(width, height));
+  }
+
+  texImageHelperHTMLImageElement(TexImage2D, target, level, internalformat,
+                                 format, type, 0, 0, 0, image, sourceImageRect,
+                                 exceptionState);
 }
 
 void WebGL2RenderingContextBase::texImage2D(GLenum target,
                                             GLint level,
                                             GLint internalformat,
                                             GLsizei width,
                                             GLsizei height,
                                             GLint border,
                                             GLenum format,
                                             GLenum type,
@@ skipping 125 matching lines @@
 void WebGL2RenderingContextBase::texSubImage2D(GLenum target,
                                                GLint level,
                                                GLint xoffset,
                                                GLint yoffset,
                                                GLsizei width,
                                                GLsizei height,
                                                GLenum format,
                                                GLenum type,
                                                HTMLImageElement* image,
                                                ExceptionState& exceptionState) {
-  // TODO(zmo): To be implemente.
+  IntRect sourceImageRect;
+  if (image) {
+    sourceImageRect.setLocation(IntPoint(m_unpackSkipPixels, m_unpackSkipRows));
+    sourceImageRect.setSize(IntSize(width, height));
+  }
+
+  texImageHelperHTMLImageElement(TexSubImage2D, target, level, 0, format, type,
+                                 xoffset, yoffset, 0, image, sourceImageRect,
+                                 exceptionState);
 }
 
 void WebGL2RenderingContextBase::texSubImage2D(GLenum target,
                                                GLint level,
                                                GLint xoffset,
                                                GLint yoffset,
                                                GLsizei width,
                                                GLsizei height,
                                                GLenum format,
                                                GLenum type,
@@ skipping 386 matching lines @@
                                                GLint level,
                                                GLint xoffset,
                                                GLint yoffset,
                                                GLint zoffset,
                                                GLenum format,
                                                GLenum type,
                                                HTMLImageElement* image,
                                                ExceptionState& exceptionState) {
   texImageHelperHTMLImageElement(TexSubImage3D, target, level, 0, format, type,
                                  xoffset, yoffset, zoffset, image,
-                                 exceptionState);
+                                 sentinelEmptyRect(), exceptionState);
 }
 
 void WebGL2RenderingContextBase::texSubImage3D(GLenum target,
                                                GLint level,
                                                GLint xoffset,
                                                GLint yoffset,
                                                GLint zoffset,
                                                GLenum format,
                                                GLenum type,
                                                HTMLCanvasElement* canvas,
@@ skipping 2937 matching lines @@
 
 void WebGL2RenderingContextBase::
     DrawingBufferClientRestorePixelUnpackBufferBinding() {
   if (!contextGL())
     return;
   contextGL()->BindBuffer(GL_PIXEL_UNPACK_BUFFER,
                           objectOrZero(m_boundPixelUnpackBuffer.get()));
 }
 
 }  // namespace blink