src/gpu/effects/GrPorterDuffXferProcessor.cpp - Issue 1561683002: Start using <type_traits> and <utility> (C++11).

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: src/gpu/effects/GrPorterDuffXferProcessor.cpp

Issue 1561683002: Start using <type_traits> and <utility> (C++11). (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fix skstd::unique_ptr::compressed_pair. Created 4 years, 11 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:

Index: src/gpu/effects/GrPorterDuffXferProcessor.cpp

diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp

index 11af4b6aa02404f5518f8b32883db8346fbc9174..94d3dd67a93ae8df8da4e06b53d41286eddae558 100644

--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp

+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp

@@ -19,6 +19,7 @@

#include "glsl/GrGLSLProgramDataManager.h"

#include "glsl/GrGLSLUniformHandler.h"

#include "glsl/GrGLSLXferProcessor.h"

+#include <utility>

/**

* Wraps the shader outputs and HW blend state that comprise a Porter Duff blend mode with coverage.

@@ -71,7 +72,7 @@ public:

template<OutputType PrimaryOut, OutputType SecondaryOut,

GrBlendEquation BlendEquation, GrBlendCoeff SrcCoeff, GrBlendCoeff DstCoeff>

- struct get_properties : skstd::integral_constant<Properties, static_cast<Properties>(

+ struct get_properties : std::integral_constant<Properties, static_cast<Properties>(

(GR_BLEND_MODIFIES_DST(BlendEquation, SrcCoeff, DstCoeff) ?

kModifiesDst_Property : 0) |

« no previous file with comments | « src/core/SkFindAndPlaceGlyph.h ('k') | src/pdf/SkPDFMetadata.cpp » ('j') | no next file with comments »