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

Side by Side Diff: Source/core/html/canvas/WebGLTexture.cpp

Issue 223223003: Re-land "WebGL: Transfer ownership of WebGraphicsContext3D to DrawingBuffer" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix errata on comment Created 6 years, 8 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 /* 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
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)
47 , m_isCubeComplete(false) 47 , m_isCubeComplete(false)
48 , m_isComplete(false) 48 , m_isComplete(false)
49 , m_needToUseBlackTexture(false) 49 , m_needToUseBlackTexture(false)
50 , m_isFloatType(false) 50 , m_isFloatType(false)
51 , m_isHalfFloatType(false) 51 , m_isHalfFloatType(false)
52 { 52 {
53 ScriptWrappable::init(this); 53 ScriptWrappable::init(this);
54 setObject(ctx->webGraphicsContext3D()->createTexture()); 54 setObject(ctx->webContext()->createTexture());
55 } 55 }
56 56
57 WebGLTexture::~WebGLTexture() 57 WebGLTexture::~WebGLTexture()
58 { 58 {
59 deleteObject(0); 59 deleteObject(0);
60 } 60 }
61 61
62 void WebGLTexture::setTarget(GLenum target, GLint maxLevel) 62 void WebGLTexture::setTarget(GLenum target, GLint maxLevel)
63 { 63 {
64 if (!object()) 64 if (!object())
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLShader.cpp ('k') | Source/core/html/canvas/WebGLVertexArrayObjectOES.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698