diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 17:22:28 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 17:22:28 +0000 |
commit | 0f1afed8d9f9f1849006fc6d93305d14986d16b6 (patch) | |
tree | 317787b597343760331431458fba0486bc49670f /app/gfx | |
parent | 9010941b17ea056d5dd8e28707262fa91d36b000 (diff) | |
download | chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.zip chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.tar.gz chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.tar.bz2 |
Keep deinlining stuff.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/5783004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gfx')
-rw-r--r-- | app/gfx/gl/gl_context_stub.cc | 39 | ||||
-rw-r--r-- | app/gfx/gl/gl_context_stub.h | 16 | ||||
-rw-r--r-- | app/gfx/gl/gl_implementation_linux.cc | 1 |
3 files changed, 48 insertions, 8 deletions
diff --git a/app/gfx/gl/gl_context_stub.cc b/app/gfx/gl/gl_context_stub.cc new file mode 100644 index 0000000..62825c7 --- /dev/null +++ b/app/gfx/gl/gl_context_stub.cc @@ -0,0 +1,39 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "app/gfx/gl/gl_context_stub.h" + +namespace gfx { + +StubGLContext::~StubGLContext() {} + +bool StubGLContext::MakeCurrent() { + return true; +} + +bool StubGLContext::IsCurrent() { + return true; +} + +bool StubGLContext::IsOffscreen() { + return false; +} + +bool StubGLContext::SwapBuffers() { + return true; +} + +gfx::Size StubGLContext::GetSize() { + return size_; +} + +void* StubGLContext::GetHandle() { + return NULL; +} + +std::string StubGLContext::GetExtensions() { + return std::string(); +} + +} // namespace gfx diff --git a/app/gfx/gl/gl_context_stub.h b/app/gfx/gl/gl_context_stub.h index 0037044..d4a1e18 100644 --- a/app/gfx/gl/gl_context_stub.h +++ b/app/gfx/gl/gl_context_stub.h @@ -15,16 +15,18 @@ namespace gfx { // A GLContext that does nothing for unit tests. class StubGLContext : public gfx::GLContext { public: + virtual ~StubGLContext(); + // Implement GLContext. virtual void Destroy() {} - virtual bool MakeCurrent() { return true; } - virtual bool IsCurrent() { return true; } - virtual bool IsOffscreen() { return false; } - virtual bool SwapBuffers() { return true; } - virtual gfx::Size GetSize() { return size_; } - virtual void* GetHandle() { return NULL; } + virtual bool MakeCurrent(); + virtual bool IsCurrent(); + virtual bool IsOffscreen(); + virtual bool SwapBuffers(); + virtual gfx::Size GetSize(); + virtual void* GetHandle(); virtual void SetSwapInterval(int interval) {} - virtual std::string GetExtensions() { return std::string(); } + virtual std::string GetExtensions(); void SetSize(const gfx::Size& size) { size_ = size; } diff --git a/app/gfx/gl/gl_implementation_linux.cc b/app/gfx/gl/gl_implementation_linux.cc index 74fd21e..8ac29a3 100644 --- a/app/gfx/gl/gl_implementation_linux.cc +++ b/app/gfx/gl/gl_implementation_linux.cc @@ -5,7 +5,6 @@ #include <vector> #include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context_stub.h" #include "app/gfx/gl/gl_implementation.h" #include "base/base_paths.h" #include "base/command_line.h" |