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

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

Issue 365653002: Oilpan: move 2D Canvas and WebGL objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Complete VectorTraits<> specialization for VertexAttribState Created 6 years, 5 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 13 matching lines...) Expand all
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)
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->webContext()->createTexture()); 54 setObject(ctx->webContext()->createTexture());
55 } 55 }
56 56
57 WebGLTexture::~WebGLTexture() 57 WebGLTexture::~WebGLTexture()
58 { 58 {
59 #if !ENABLE(OILPAN)
haraken 2014/07/02 07:47:39 I wonder why you remove only this deleteObject().
sof 2014/07/02 11:43:53 Re-instated; we have to reliably let go of the und
59 deleteObject(0); 60 deleteObject(0);
61 #endif
60 } 62 }
61 63
62 void WebGLTexture::setTarget(GLenum target, GLint maxLevel) 64 void WebGLTexture::setTarget(GLenum target, GLint maxLevel)
63 { 65 {
64 if (!object()) 66 if (!object())
65 return; 67 return;
66 // Target is finalized the first time bindTexture() is called. 68 // Target is finalized the first time bindTexture() is called.
67 if (m_target) 69 if (m_target)
68 return; 70 return;
69 switch (target) { 71 switch (target) {
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 return 0; 377 return 0;
376 int targetIndex = mapTargetToIndex(target); 378 int targetIndex = mapTargetToIndex(target);
377 if (targetIndex < 0 || targetIndex >= static_cast<int>(m_info.size())) 379 if (targetIndex < 0 || targetIndex >= static_cast<int>(m_info.size()))
378 return 0; 380 return 0;
379 if (level < 0 || level >= static_cast<GLint>(m_info[targetIndex].size())) 381 if (level < 0 || level >= static_cast<GLint>(m_info[targetIndex].size()))
380 return 0; 382 return 0;
381 return &(m_info[targetIndex][level]); 383 return &(m_info[targetIndex][level]);
382 } 384 }
383 385
384 } 386 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698