diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 04:56:38 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 04:56:38 +0000 |
| commit | 6e90b6faddc7b8fbf92c2ba7515ed8bfb82fb733 (patch) | |
| tree | eed1dbc2febbf7131227742d0f8331851f66a024 /cc | |
| parent | ea319e72a75c595526d122b34f83d5ed4bb6ebaa (diff) | |
| download | chromium_src-6e90b6faddc7b8fbf92c2ba7515ed8bfb82fb733.zip chromium_src-6e90b6faddc7b8fbf92c2ba7515ed8bfb82fb733.tar.gz chromium_src-6e90b6faddc7b8fbf92c2ba7515ed8bfb82fb733.tar.bz2 | |
Temporarily add OVERRIDE to width()/height() in TestWebGraphicsContext3D
This is needed to land https://codereview.chromium.org/25450002 in blink. After
width()/height() are removed from WGC3D, TestWebGraphicsContext3D::width()
overrides FakeWebGraphicsContext3D::width() which is in chromium land, and the
clang plugin complains if it's not OVERRIDE then.
BUG=181120
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/25451002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/debug/test_web_graphics_context_3d.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/debug/test_web_graphics_context_3d.h b/cc/debug/test_web_graphics_context_3d.h index 5074d2f..91650ef 100644 --- a/cc/debug/test_web_graphics_context_3d.h +++ b/cc/debug/test_web_graphics_context_3d.h @@ -30,8 +30,8 @@ class CC_EXPORT TestWebGraphicsContext3D : public FakeWebGraphicsContext3D { virtual bool makeContextCurrent(); - virtual int width(); - virtual int height(); + virtual int width() OVERRIDE; + virtual int height() OVERRIDE; virtual void reshapeWithScaleFactor( int width, int height, float scale_factor); |