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

Unified Diff: Source/core/platform/graphics/filters/custom/CustomFilterGlobalContext.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
Index: Source/core/platform/graphics/filters/custom/CustomFilterGlobalContext.cpp
diff --git a/Source/core/platform/graphics/filters/custom/CustomFilterGlobalContext.cpp b/Source/core/platform/graphics/filters/custom/CustomFilterGlobalContext.cpp
index 07b0aa0cec4e70b1fc9ba758a0ad009be0f50aa5..8088f086ccb753b253ffc9880be52efa57c90de5 100644
--- a/Source/core/platform/graphics/filters/custom/CustomFilterGlobalContext.cpp
+++ b/Source/core/platform/graphics/filters/custom/CustomFilterGlobalContext.cpp
@@ -46,23 +46,23 @@ CustomFilterGlobalContext::~CustomFilterGlobalContext()
iter->value->detachFromGlobalContext();
}
-ANGLEWebKitBridge* CustomFilterGlobalContext::webglShaderValidator()
+ANGLEPlatformBridge* CustomFilterGlobalContext::webglShaderValidator()
{
if (!m_webglShaderValidator)
m_webglShaderValidator = createShaderValidator(SH_WEBGL_SPEC);
return m_webglShaderValidator.get();
}
-ANGLEWebKitBridge* CustomFilterGlobalContext::mixShaderValidator()
+ANGLEPlatformBridge* CustomFilterGlobalContext::mixShaderValidator()
{
if (!m_mixShaderValidator)
m_mixShaderValidator = createShaderValidator(SH_CSS_SHADERS_SPEC);
return m_mixShaderValidator.get();
}
-PassOwnPtr<ANGLEWebKitBridge> CustomFilterGlobalContext::createShaderValidator(ShShaderSpec shaderSpec)
+PassOwnPtr<ANGLEPlatformBridge> CustomFilterGlobalContext::createShaderValidator(ShShaderSpec shaderSpec)
{
- OwnPtr<ANGLEWebKitBridge> validator = adoptPtr(new ANGLEWebKitBridge(SH_ESSL_OUTPUT, shaderSpec));
+ OwnPtr<ANGLEPlatformBridge> validator = adoptPtr(new ANGLEPlatformBridge(SH_ESSL_OUTPUT, shaderSpec));
ShBuiltInResources resources;
ShInitBuiltInResources(&resources);
validator->setResources(resources);

Powered by Google App Engine
This is Rietveld 408576698