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

Side by Side Diff: Source/platform/graphics/CrossfadeGeneratedImage.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 23 matching lines...) Expand all
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class PLATFORM_EXPORT CrossfadeGeneratedImage : public GeneratedImage { 37 class PLATFORM_EXPORT CrossfadeGeneratedImage : public GeneratedImage {
38 public: 38 public:
39 static PassRefPtr<CrossfadeGeneratedImage> create(Image* fromImage, Image* t oImage, float percentage, IntSize crossfadeSize, const IntSize& size) 39 static PassRefPtr<CrossfadeGeneratedImage> create(Image* fromImage, Image* t oImage, float percentage, IntSize crossfadeSize, const IntSize& size)
40 { 40 {
41 return adoptRef(new CrossfadeGeneratedImage(fromImage, toImage, percenta ge, crossfadeSize, size)); 41 return adoptRef(new CrossfadeGeneratedImage(fromImage, toImage, percenta ge, crossfadeSize, size));
42 } 42 }
43 43
44 virtual void setContainerSize(const IntSize&) OVERRIDE { } 44 virtual void setContainerSize(const IntSize&) override { }
45 virtual bool usesContainerSize() const OVERRIDE { return false; } 45 virtual bool usesContainerSize() const override { return false; }
46 virtual bool hasRelativeWidth() const OVERRIDE { return false; } 46 virtual bool hasRelativeWidth() const override { return false; }
47 virtual bool hasRelativeHeight() const OVERRIDE { return false; } 47 virtual bool hasRelativeHeight() const override { return false; }
48 48
49 virtual IntSize size() const OVERRIDE { return m_crossfadeSize; } 49 virtual IntSize size() const override { return m_crossfadeSize; }
50 50
51 protected: 51 protected:
52 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, 52 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&,
53 CompositeOperator, WebBlendMode) OVERRIDE; 53 CompositeOperator, WebBlendMode) override;
54 virtual void drawPattern(GraphicsContext*, const FloatRect&, 54 virtual void drawPattern(GraphicsContext*, const FloatRect&,
55 const FloatSize&, const FloatPoint&, CompositeOperator, 55 const FloatSize&, const FloatPoint&, CompositeOperator,
56 const FloatRect&, WebBlendMode, const IntSize& repeatSpacing) OVERRIDE; 56 const FloatRect&, WebBlendMode, const IntSize& repeatSpacing) override;
57 57
58 CrossfadeGeneratedImage(Image* fromImage, Image* toImage, float percentage, IntSize crossfadeSize, const IntSize&); 58 CrossfadeGeneratedImage(Image* fromImage, Image* toImage, float percentage, IntSize crossfadeSize, const IntSize&);
59 59
60 private: 60 private:
61 void drawCrossfade(GraphicsContext*); 61 void drawCrossfade(GraphicsContext*);
62 62
63 Image* m_fromImage; 63 Image* m_fromImage;
64 Image* m_toImage; 64 Image* m_toImage;
65 65
66 float m_percentage; 66 float m_percentage;
67 IntSize m_crossfadeSize; 67 IntSize m_crossfadeSize;
68 }; 68 };
69 69
70 } // namespace blink 70 } // namespace blink
71 71
72 #endif 72 #endif
OLDNEW
« no previous file with comments | « Source/platform/graphics/ContentLayerDelegate.h ('k') | Source/platform/graphics/DecodingImageGenerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698