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

Unified Diff: cc/output/shader.cc

Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 | « cc/output/output_surface_client.h ('k') | cc/quads/content_draw_quad_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/shader.cc
diff --git a/cc/output/shader.cc b/cc/output/shader.cc
index 98bde8daf944ef426b408961a4db0e84783ea2cf..b2d76a7e02e770b3f1da95f2abd5873ef70a4092 100644
--- a/cc/output/shader.cc
+++ b/cc/output/shader.cc
@@ -709,7 +709,7 @@ std::string FragmentTexBlendMode::SetBlendModeFunctions(
return Blend(src, dst);
}
// clang-format off
- );
+ ); // NOLINT(whitespace/parens)
// clang-format on
return "precision mediump float;" + GetHelperFunctions() +
@@ -738,7 +738,7 @@ std::string FragmentTexBlendMode::GetHelperFunctions() const {
return result;
}
// clang-format off
- );
+ ); // NOLINT(whitespace/parens)
static const std::string kFunctionColorDodgeComponent = SHADER0(
// clang-format on
@@ -753,7 +753,7 @@ std::string FragmentTexBlendMode::GetHelperFunctions() const {
return d * srca + srcc * (1.0 - dsta) + dstc * (1.0 - srca);
}
// clang-format off
- );
+ ); // NOLINT(whitespace/parens)
static const std::string kFunctionColorBurnComponent = SHADER0(
// clang-format on
@@ -767,7 +767,7 @@ std::string FragmentTexBlendMode::GetHelperFunctions() const {
return srca * d + srcc * (1.0 - dsta) + dstc * (1.0 - srca);
}
// clang-format off
- );
+ ); // NOLINT(whitespace/parens)
static const std::string kFunctionSoftLightComponentPosDstAlpha = SHADER0(
// clang-format on
@@ -792,7 +792,7 @@ std::string FragmentTexBlendMode::GetHelperFunctions() const {
}
}
// clang-format off
- );
+ ); // NOLINT(whitespace/parens)
static const std::string kFunctionLum = SHADER0(
// clang-format on
@@ -818,7 +818,7 @@ std::string FragmentTexBlendMode::GetHelperFunctions() const {
return outColor;
}
// clang-format off
- );
+ ); // NOLINT(whitespace/parens)
static const std::string kFunctionSat = SHADER0(
// clang-format on
@@ -866,7 +866,7 @@ std::string FragmentTexBlendMode::GetHelperFunctions() const {
return hueLumColor;
}
// clang-format off
- );
+ ); // NOLINT(whitespace/parens)
// clang-format on
switch (blend_mode_) {
« no previous file with comments | « cc/output/output_surface_client.h ('k') | cc/quads/content_draw_quad_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698