summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 23:56:33 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 23:56:33 +0000
commit7b1a3da22c0249e0dcca6eb51a0a5482c333c4ba (patch)
tree186d63aada0903cc68ea1f12ba4171b8aee67dbd /ui
parent628eee5a47d1ce2ae274e2b6f33b7846f78cbb62 (diff)
downloadchromium_src-7b1a3da22c0249e0dcca6eb51a0a5482c333c4ba.zip
chromium_src-7b1a3da22c0249e0dcca6eb51a0a5482c333c4ba.tar.gz
chromium_src-7b1a3da22c0249e0dcca6eb51a0a5482c333c4ba.tar.bz2
Fix clang compilation issues following r83248. This might be necessary to merge bug 77536 to avoid clang compilation errors.
TEST=linux_clang BUG=77536 Review URL: http://codereview.chromium.org/6903092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83258 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/gfx/gl/gl_surface.cc5
-rw-r--r--ui/gfx/gl/gl_surface.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ui/gfx/gl/gl_surface.cc b/ui/gfx/gl/gl_surface.cc
index b1dd505..de4b8a2 100644
--- a/ui/gfx/gl/gl_surface.cc
+++ b/ui/gfx/gl/gl_surface.cc
@@ -6,6 +6,11 @@
namespace gfx {
+bool GLSurface::Initialize()
+{
+ return true;
+}
+
unsigned int GLSurface::GetBackingFrameBufferObject() {
return 0;
}
diff --git a/ui/gfx/gl/gl_surface.h b/ui/gfx/gl/gl_surface.h
index dde0883..ca8afd1 100644
--- a/ui/gfx/gl/gl_surface.h
+++ b/ui/gfx/gl/gl_surface.h
@@ -23,7 +23,7 @@ class GLSurface {
// EGL surface associated to be recreated without destroying the associated
// context. The implementation of this function for other GLSurface derived
// classes is in a pending changelist.
- virtual bool Initialize() { return true; }
+ virtual bool Initialize();
// Destroys the surface.
virtual void Destroy() = 0;