Source/core/platform/graphics/filters/custom/CustomFilterProgram.cpp - Issue 64643009: Remove duplicated headers from core/

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

Issue 64643009: Remove duplicated headers from core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 7 years 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

« no previous file with comments | « Source/core/platform/graphics/filters/custom/CustomFilterOperation.cpp ('k') | Source/core/platform/graphics/filters/custom/CustomFilterRenderer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 13 matching lines...) Expand all Loading...
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 #include "core/platform/graphics/filters/custom/CustomFilterProgram.h"	31 #include "core/platform/graphics/filters/custom/CustomFilterProgram.h"

32	32

33 #include "platform/graphics/filters/custom/CustomFilterProgramClient.h"	33 #include "platform/graphics/filters/custom/CustomFilterProgramClient.h"

34 #include "platform/graphics/filters/custom/CustomFilterProgramInfo.h"

35	34

36 namespace WebCore {	35 namespace WebCore {

37	36

38 CustomFilterProgram::CustomFilterProgram(CustomFilterProgramType programType, co nst CustomFilterProgramMixSettings& mixSettings, CustomFilterMeshType meshType)	37 CustomFilterProgram::CustomFilterProgram(CustomFilterProgramType programType, co nst CustomFilterProgramMixSettings& mixSettings, CustomFilterMeshType meshType)

39 : m_programType(programType)	38 : m_programType(programType)

40 , m_mixSettings(mixSettings)	39 , m_mixSettings(mixSettings)

41 , m_meshType(meshType)	40 , m_meshType(meshType)

42 {	41 {

43 // Keep the constructor protected to prevent creating this object directly.	42 // Keep the constructor protected to prevent creating this object directly.

44 }	43 }

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77 iter->key->notifyCustomFilterProgramLoaded(this);	76 iter->key->notifyCustomFilterProgramLoaded(this);

78 }	77 }

79	78

80 CustomFilterProgramInfo CustomFilterProgram::programInfo() const	79 CustomFilterProgramInfo CustomFilterProgram::programInfo() const

81 {	80 {

82 ASSERT(isLoaded());	81 ASSERT(isLoaded());

83 return CustomFilterProgramInfo(vertexShaderString(), fragmentShaderString(), m_programType, m_mixSettings, m_meshType);	82 return CustomFilterProgramInfo(vertexShaderString(), fragmentShaderString(), m_programType, m_mixSettings, m_meshType);

84 }	83 }

85	84

86 } // namespace WebCore	85 } // namespace WebCore

OLD	NEW