Source/platform/graphics/filters/FEMerge.h - Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/platform/graphics/filters/FEMerge.h

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase build fix 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 unified diff | Download patch

« no previous file with comments | « Source/platform/graphics/filters/FELighting.h ('k') | Source/platform/graphics/filters/FEMorphology.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>	2 * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>

3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>	3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>

4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>	4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>

5 * Copyright (C) 2013 Google Inc. All rights reserved.	5 * Copyright (C) 2013 Google Inc. All rights reserved.

6 *	6 *

7 * This library is free software; you can redistribute it and/or	7 * This library is free software; you can redistribute it and/or

8 * modify it under the terms of the GNU Library General Public	8 * modify it under the terms of the GNU Library General Public

9 * License as published by the Free Software Foundation; either	9 * License as published by the Free Software Foundation; either

10 * version 2 of the License, or (at your option) any later version.	10 * version 2 of the License, or (at your option) any later version.

(...skipping 14 matching lines...) Expand all Loading...
25	25

26 #include "platform/graphics/filters/Filter.h"	26 #include "platform/graphics/filters/Filter.h"

27 #include "platform/graphics/filters/FilterEffect.h"	27 #include "platform/graphics/filters/FilterEffect.h"

28	28

29 namespace blink {	29 namespace blink {

30	30

31 class PLATFORM_EXPORT FEMerge : public FilterEffect {	31 class PLATFORM_EXPORT FEMerge : public FilterEffect {

32 public:	32 public:

33 static PassRefPtr<FEMerge> create(Filter*);	33 static PassRefPtr<FEMerge> create(Filter*);

34	34

35 virtual PassRefPtr<SkImageFilter> createImageFilter(SkiaImageFilterBuilder*) OVERRIDE;	35 virtual PassRefPtr<SkImageFilter> createImageFilter(SkiaImageFilterBuilder*) override;

36	36

37 virtual TextStream& externalRepresentation(TextStream&, int indention) const OVERRIDE;	37 virtual TextStream& externalRepresentation(TextStream&, int indention) const override;

38	38

39 private:	39 private:

40 FEMerge(Filter*);	40 FEMerge(Filter*);

41	41

42 virtual void applySoftware() OVERRIDE;	42 virtual void applySoftware() override;

43 };	43 };

44	44

45 } // namespace blink	45 } // namespace blink

46	46

47 #endif // FEMerge_h	47 #endif // FEMerge_h

OLD	NEW