| Index: Source/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp
|
| diff --git a/Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp b/Source/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp
|
| similarity index 98%
|
| rename from Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp
|
| rename to Source/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp
|
| index c7fbfe7c346f3cab22e49815c09440061b507258..63e384383be80e8541611155a126ce7e32294f9e 100644
|
| --- a/Source/core/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp
|
| +++ b/Source/platform/graphics/filters/custom/CustomFilterValidatedProgram.cpp
|
| @@ -28,16 +28,16 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "core/platform/graphics/filters/custom/CustomFilterValidatedProgram.h"
|
| +#include "platform/graphics/filters/custom/CustomFilterValidatedProgram.h"
|
|
|
| -#include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h"
|
| #include "platform/NotImplemented.h"
|
| #include "platform/graphics/angle/ANGLEPlatformBridge.h"
|
| #include "platform/graphics/filters/custom/CustomFilterConstants.h"
|
| +#include "platform/graphics/filters/custom/CustomFilterGlobalContext.h"
|
| #include "wtf/HashMap.h"
|
| +#include "wtf/Vector.h"
|
| #include "wtf/text/StringBuilder.h"
|
| #include "wtf/text/StringHash.h"
|
| -#include "wtf/Vector.h"
|
|
|
| namespace WebCore {
|
|
|
| @@ -465,25 +465,26 @@ String CustomFilterValidatedProgram::blendFunctionString(blink::WebBlendMode ble
|
| if (cMax > cMin) {
|
| cMid = (((cMid - cMin) * s) / (cMax - cMin));
|
| cMax = s;
|
| - } else
|
| + } else {
|
| cMid = cMax = 0.0;
|
| + }
|
| cMin = 0.0;
|
| }
|
| mediump vec3 css_SetSat(mediump vec3 C, mediump float s)
|
| {
|
| if (C.r <= C.g) {
|
| - if (C.g <= C.b)
|
| + if (C.g <= C.b) {
|
| css_SetSatHelper(C.r, C.g, C.b, s);
|
| - else {
|
| + } else {
|
| if (C.r <= C.b)
|
| css_SetSatHelper(C.r, C.b, C.g, s);
|
| else
|
| css_SetSatHelper(C.b, C.r, C.g, s);
|
| }
|
| } else {
|
| - if (C.r <= C.b)
|
| + if (C.r <= C.b) {
|
| css_SetSatHelper(C.g, C.r, C.b, s);
|
| - else {
|
| + } else {
|
| if (C.g <= C.b)
|
| css_SetSatHelper(C.g, C.b, C.r, s);
|
| else
|
|
|