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

Side by Side Diff: Source/core/platform/graphics/filters/custom/CustomFilterCompiledProgram.cpp

Issue 14398007: Remove USE(3D_GRAPHICS) as it is always turned on. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 7 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) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 11 matching lines...) Expand all
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30 #include "config.h" 30 #include "config.h"
31 31
32 #if USE(3D_GRAPHICS)
33 #include "core/platform/graphics/filters/custom/CustomFilterCompiledProgram.h" 32 #include "core/platform/graphics/filters/custom/CustomFilterCompiledProgram.h"
34 33
35 #include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h" 34 #include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h"
36 35
37 namespace WebCore { 36 namespace WebCore {
38 37
39 CustomFilterCompiledProgram::CustomFilterCompiledProgram(PassRefPtr<GraphicsCont ext3D> context, const String& validatedVertexShader, const String& validatedFrag mentShader, CustomFilterProgramType programType) 38 CustomFilterCompiledProgram::CustomFilterCompiledProgram(PassRefPtr<GraphicsCont ext3D> context, const String& validatedVertexShader, const String& validatedFrag mentShader, CustomFilterProgramType programType)
40 : m_context(context) 39 : m_context(context)
41 , m_program(0) 40 , m_program(0)
42 , m_positionAttribLocation(-1) 41 , m_positionAttribLocation(-1)
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 143
145 CustomFilterCompiledProgram::~CustomFilterCompiledProgram() 144 CustomFilterCompiledProgram::~CustomFilterCompiledProgram()
146 { 145 {
147 if (m_program) { 146 if (m_program) {
148 m_context->makeContextCurrent(); 147 m_context->makeContextCurrent();
149 m_context->deleteProgram(m_program); 148 m_context->deleteProgram(m_program);
150 } 149 }
151 } 150 }
152 151
153 } // namespace WebCore 152 } // namespace WebCore
154 #endif // USE(3D_GRAPHICS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698