| 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 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "core/html/canvas/WebGLTexture.h" | 28 #include "core/html/canvas/WebGLTexture.h" |
| 29 | 29 |
| 30 #include "core/html/canvas/WebGLRenderingContextBase.h" | 30 #include "core/html/canvas/WebGLRenderingContextBase.h" |
| 31 | 31 |
| 32 namespace WebCore { | 32 namespace WebCore { |
| 33 | 33 |
| 34 PassRefPtr<WebGLTexture> WebGLTexture::create(WebGLRenderingContextBase* ctx) | 34 PassRefPtrWillBeRawPtr<WebGLTexture> WebGLTexture::create(WebGLRenderingContextB
ase* ctx) |
| 35 { | 35 { |
| 36 return adoptRef(new WebGLTexture(ctx)); | 36 return adoptRefWillBeNoop(new WebGLTexture(ctx)); |
| 37 } | 37 } |
| 38 | 38 |
| 39 WebGLTexture::WebGLTexture(WebGLRenderingContextBase* ctx) | 39 WebGLTexture::WebGLTexture(WebGLRenderingContextBase* ctx) |
| 40 : WebGLSharedObject(ctx) | 40 : WebGLSharedObject(ctx) |
| 41 , m_target(0) | 41 , m_target(0) |
| 42 , m_minFilter(GL_NEAREST_MIPMAP_LINEAR) | 42 , m_minFilter(GL_NEAREST_MIPMAP_LINEAR) |
| 43 , m_magFilter(GL_LINEAR) | 43 , m_magFilter(GL_LINEAR) |
| 44 , m_wrapS(GL_REPEAT) | 44 , m_wrapS(GL_REPEAT) |
| 45 , m_wrapT(GL_REPEAT) | 45 , m_wrapT(GL_REPEAT) |
| 46 , m_isNPOT(false) | 46 , m_isNPOT(false) |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 return 0; | 375 return 0; |
| 376 int targetIndex = mapTargetToIndex(target); | 376 int targetIndex = mapTargetToIndex(target); |
| 377 if (targetIndex < 0 || targetIndex >= static_cast<int>(m_info.size())) | 377 if (targetIndex < 0 || targetIndex >= static_cast<int>(m_info.size())) |
| 378 return 0; | 378 return 0; |
| 379 if (level < 0 || level >= static_cast<GLint>(m_info[targetIndex].size())) | 379 if (level < 0 || level >= static_cast<GLint>(m_info[targetIndex].size())) |
| 380 return 0; | 380 return 0; |
| 381 return &(m_info[targetIndex][level]); | 381 return &(m_info[targetIndex][level]); |
| 382 } | 382 } |
| 383 | 383 |
| 384 } | 384 } |
| OLD | NEW |