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

Side by Side Diff: sky/engine/core/html/canvas/WebGLProgram.cpp

Issue 706123005: Remove nop ScriptWrappable::init calls (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 25 matching lines...) Expand all
36 { 36 {
37 return adoptRef(new WebGLProgram(ctx)); 37 return adoptRef(new WebGLProgram(ctx));
38 } 38 }
39 39
40 WebGLProgram::WebGLProgram(WebGLRenderingContextBase* ctx) 40 WebGLProgram::WebGLProgram(WebGLRenderingContextBase* ctx)
41 : WebGLSharedObject(ctx) 41 : WebGLSharedObject(ctx)
42 , m_linkStatus(false) 42 , m_linkStatus(false)
43 , m_linkCount(0) 43 , m_linkCount(0)
44 , m_infoValid(true) 44 , m_infoValid(true)
45 { 45 {
46 ScriptWrappable::init(this);
47 setObject(ctx->webContext()->createProgram()); 46 setObject(ctx->webContext()->createProgram());
48 } 47 }
49 48
50 WebGLProgram::~WebGLProgram() 49 WebGLProgram::~WebGLProgram()
51 { 50 {
52 #if ENABLE(OILPAN) 51 #if ENABLE(OILPAN)
53 // These heap objects handle detachment on their own. Clear out 52 // These heap objects handle detachment on their own. Clear out
54 // the references to prevent deleteObjectImpl() from trying to do 53 // the references to prevent deleteObjectImpl() from trying to do
55 // same, as we cannot safely access other heap objects from this 54 // same, as we cannot safely access other heap objects from this
56 // destructor. 55 // destructor.
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 return; 196 return;
198 GLint linkStatus = 0; 197 GLint linkStatus = 0;
199 context->getProgramiv(object(), GL_LINK_STATUS, &linkStatus); 198 context->getProgramiv(object(), GL_LINK_STATUS, &linkStatus);
200 m_linkStatus = linkStatus; 199 m_linkStatus = linkStatus;
201 if (m_linkStatus) 200 if (m_linkStatus)
202 cacheActiveAttribLocations(context); 201 cacheActiveAttribLocations(context);
203 m_infoValid = true; 202 m_infoValid = true;
204 } 203 }
205 204
206 } 205 }
OLDNEW
« no previous file with comments | « sky/engine/core/html/canvas/WebGLLoseContext.cpp ('k') | sky/engine/core/html/canvas/WebGLRenderbuffer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698