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

Side by Side Diff: Source/platform/DragImageTest.cpp

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 | « no previous file | Source/platform/JSONValues.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 explicit TestImage(const IntSize& size) 61 explicit TestImage(const IntSize& size)
62 : Image(0) 62 : Image(0)
63 , m_size(size) 63 , m_size(size)
64 { 64 {
65 SkBitmap bitmap; 65 SkBitmap bitmap;
66 bitmap.allocN32Pixels(size.width(), size.height()); 66 bitmap.allocN32Pixels(size.width(), size.height());
67 m_nativeImage = NativeImageSkia::create(bitmap); 67 m_nativeImage = NativeImageSkia::create(bitmap);
68 } 68 }
69 69
70 virtual IntSize size() const OVERRIDE 70 virtual IntSize size() const override
71 { 71 {
72 return m_size; 72 return m_size;
73 } 73 }
74 74
75 virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() OVERRIDE 75 virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() override
76 { 76 {
77 if (m_size.isZero()) 77 if (m_size.isZero())
78 return nullptr; 78 return nullptr;
79 79
80 return m_nativeImage; 80 return m_nativeImage;
81 } 81 }
82 82
83 // Stub implementations of pure virtual Image functions. 83 // Stub implementations of pure virtual Image functions.
84 virtual void destroyDecodedData(bool) OVERRIDE 84 virtual void destroyDecodedData(bool) override
85 { 85 {
86 } 86 }
87 87
88 virtual bool currentFrameKnownToBeOpaque() OVERRIDE 88 virtual bool currentFrameKnownToBeOpaque() override
89 { 89 {
90 return false; 90 return false;
91 } 91 }
92 92
93 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, Comp ositeOperator, blink::WebBlendMode) OVERRIDE 93 virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, Comp ositeOperator, blink::WebBlendMode) override
94 { 94 {
95 } 95 }
96 96
97 private: 97 private:
98 98
99 IntSize m_size; 99 IntSize m_size;
100 100
101 RefPtr<NativeImageSkia> m_nativeImage; 101 RefPtr<NativeImageSkia> m_nativeImage;
102 }; 102 };
103 103
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 OwnPtr<DragImage> testImage = 160 OwnPtr<DragImage> testImage =
161 DragImage::create(url, testLabel, fontDescription, deviceScaleFactor); 161 DragImage::create(url, testLabel, fontDescription, deviceScaleFactor);
162 OwnPtr<DragImage> expectedImage = 162 OwnPtr<DragImage> expectedImage =
163 DragImage::create(url, expectedLabel, fontDescription, deviceScaleFactor ); 163 DragImage::create(url, expectedLabel, fontDescription, deviceScaleFactor );
164 164
165 EXPECT_EQ(testImage->size().width(), expectedImage->size().width()); 165 EXPECT_EQ(testImage->size().width(), expectedImage->size().width());
166 } 166 }
167 167
168 } // anonymous namespace 168 } // anonymous namespace
OLDNEW
« no previous file with comments | « no previous file | Source/platform/JSONValues.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698