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

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

Issue 540283003: bindings: Retires ScriptWrappable::init, etc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed a review comment. Created 6 years, 3 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 | Annotate | Revision Log
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
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)
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);
54 setObject(ctx->webContext()->createTexture()); 53 setObject(ctx->webContext()->createTexture());
55 } 54 }
56 55
57 WebGLTexture::~WebGLTexture() 56 WebGLTexture::~WebGLTexture()
58 { 57 {
59 // Always perform detach here to ensure that platform object 58 // Always perform detach here to ensure that platform object
60 // deletion happens with Oilpan enabled. It keeps the code regular 59 // deletion happens with Oilpan enabled. It keeps the code regular
61 // to do it with or without Oilpan enabled. 60 // to do it with or without Oilpan enabled.
62 // 61 //
63 // See comment in WebGLBuffer's destructor for additional 62 // See comment in WebGLBuffer's destructor for additional
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 return 0; 381 return 0;
383 int targetIndex = mapTargetToIndex(target); 382 int targetIndex = mapTargetToIndex(target);
384 if (targetIndex < 0 || targetIndex >= static_cast<int>(m_info.size())) 383 if (targetIndex < 0 || targetIndex >= static_cast<int>(m_info.size()))
385 return 0; 384 return 0;
386 if (level < 0 || level >= static_cast<GLint>(m_info[targetIndex].size())) 385 if (level < 0 || level >= static_cast<GLint>(m_info[targetIndex].size()))
387 return 0; 386 return 0;
388 return &(m_info[targetIndex][level]); 387 return &(m_info[targetIndex][level]);
389 } 388 }
390 389
391 } 390 }
OLDNEW
« no previous file with comments | « Source/core/html/canvas/WebGLShaderPrecisionFormat.cpp ('k') | Source/core/html/canvas/WebGLUniformLocation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698