Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp - Issue 25825003: Move ANGLEWebKitBridge to platform/graphics/angle/ANGLEPlatformBridge.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp

Issue 25825003: Move ANGLEWebKitBridge to platform/graphics/angle/ANGLEPlatformBridge. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Fixed bad merge Created 7 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/core/platform/graphics/filters/custom/CustomFilterGlobalContext.cpp ('k') | Source/platform/blink_platform.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp

diff --git a/Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp b/Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp

index 51d034819fb4e83182936df6c1ab3c20a652d0c2..a880429c8d047e05dafb032a582f5792f586fac1 100644

--- a/Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp

+++ b/Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp

@@ -31,11 +31,11 @@

#include "core/platform/graphics/filters/custom/CustomFilterValidatedProgram.h"

-#include "platform/NotImplemented.h"

-#include "core/platform/graphics/ANGLEWebKitBridge.h"

#include "core/platform/graphics/filters/custom/CustomFilterConstants.h"

#include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h"

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

+#include "platform/NotImplemented.h"

+#include "platform/graphics/angle/ANGLEPlatformBridge.h"

#include "wtf/HashMap.h"

#include "wtf/text/StringBuilder.h"

#include "wtf/text/StringHash.h"

@@ -172,7 +172,7 @@ CustomFilterValidatedProgram::CustomFilterValidatedProgram(CustomFilterGlobalCon

// Shaders referenced from the CSS mix function use a different validator than regular WebGL shaders. See core/platform/graphics/filters/custom/CustomFilterGlobalContext.h for more details.

bool blendsElementTexture = (programInfo.programType() == PROGRAM_TYPE_BLENDS_ELEMENT_TEXTURE);

- ANGLEWebKitBridge* validator = blendsElementTexture ? m_globalContext->mixShaderValidator() : m_globalContext->webglShaderValidator();

+ ANGLEPlatformBridge* validator = blendsElementTexture ? m_globalContext->mixShaderValidator() : m_globalContext->webglShaderValidator();

String vertexShaderLog, fragmentShaderLog;

Vector<ANGLEShaderSymbol> symbols;

bool vertexShaderValid = validator->compileShaderSource(originalVertexShader.utf8().data(), SHADER_TYPE_VERTEX, m_validatedVertexShader, vertexShaderLog, symbols);

« no previous file with comments | « Source/core/platform/graphics/filters/custom/CustomFilterGlobalContext.cpp ('k') | Source/platform/blink_platform.gyp » ('j') | no next file with comments »