Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifndef WebGLTexture_h | 26 #ifndef WebGLTexture_h |
| 27 #define WebGLTexture_h | 27 #define WebGLTexture_h |
| 28 | 28 |
| 29 #include "modules/webgl/WebGLSharedPlatform3DObject.h" | 29 #include "modules/webgl/WebGLSharedPlatform3DObject.h" |
| 30 #include "public/platform/WebMediaPlayer.h" | |
| 30 | 31 |
| 31 namespace blink { | 32 namespace blink { |
| 32 | 33 |
| 33 class WebGLTexture final : public WebGLSharedPlatform3DObject { | 34 class WebGLTexture final : public WebGLSharedPlatform3DObject { |
| 34 DEFINE_WRAPPERTYPEINFO(); | 35 DEFINE_WRAPPERTYPEINFO(); |
| 35 | 36 |
| 36 public: | 37 public: |
| 37 ~WebGLTexture() override; | 38 ~WebGLTexture() override; |
| 38 | 39 |
| 39 static WebGLTexture* create(WebGLRenderingContextBase*); | 40 static WebGLTexture* create(WebGLRenderingContextBase*); |
| 40 | 41 |
| 41 void setTarget(GLenum); | 42 void setTarget(GLenum); |
| 42 | 43 |
| 43 GLenum getTarget() const { return m_target; } | 44 GLenum getTarget() const { return m_target; } |
| 44 | 45 |
| 45 bool hasEverBeenBound() const { return object() && m_target; } | 46 bool hasEverBeenBound() const { return object() && m_target; } |
| 46 | 47 |
| 47 static GLint computeLevelCount(GLsizei width, GLsizei height, GLsizei depth); | 48 static GLint computeLevelCount(GLsizei width, GLsizei height, GLsizei depth); |
| 48 | 49 |
| 50 void videoUpdateLastUploaded(WebMediaPlayer*); | |
|
Ken Russell (switch to Gerrit)
2017/03/20 19:14:14
I think these would read better by naming this:
u
| |
| 51 unsigned videoLastUploadedWidth() const { return m_videoLastUploadedWidth; } | |
| 52 unsigned videoLastUploadedHeight() const { return m_videoLastUploadedHeight; } | |
| 53 double videoLastUploadedTimestamp() const { | |
| 54 return m_videoLastUploadedTimestamp; | |
| 55 } | |
| 56 | |
| 49 private: | 57 private: |
| 50 explicit WebGLTexture(WebGLRenderingContextBase*); | 58 explicit WebGLTexture(WebGLRenderingContextBase*); |
| 51 | 59 |
| 52 void deleteObjectImpl(gpu::gles2::GLES2Interface*) override; | 60 void deleteObjectImpl(gpu::gles2::GLES2Interface*) override; |
| 53 | 61 |
| 54 bool isTexture() const override { return true; } | 62 bool isTexture() const override { return true; } |
| 55 | 63 |
| 56 int mapTargetToIndex(GLenum) const; | 64 int mapTargetToIndex(GLenum) const; |
| 57 | 65 |
| 58 GLenum m_target; | 66 GLenum m_target; |
| 67 | |
| 68 unsigned m_videoLastUploadedWidth = 0; | |
| 69 unsigned m_videoLastUploadedHeight = 0; | |
| 70 double m_videoLastUploadedTimestamp = 0.0; | |
| 59 }; | 71 }; |
| 60 | 72 |
| 61 } // namespace blink | 73 } // namespace blink |
| 62 | 74 |
| 63 #endif // WebGLTexture_h | 75 #endif // WebGLTexture_h |
| OLD | NEW |