summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorsievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-01 19:53:50 +0000
committersievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-01 19:53:50 +0000
commit486767c7c0535e13d8084e6a713ec175224206e6 (patch)
treed991db2531ba6848de5f2a265006b01f5e112471 /content/browser
parentbb60e1e2b0c78621c3d018105c194c0810aaf1b7 (diff)
downloadchromium_src-486767c7c0535e13d8084e6a713ec175224206e6.zip
chromium_src-486767c7c0535e13d8084e6a713ec175224206e6.tar.gz
chromium_src-486767c7c0535e13d8084e6a713ec175224206e6.tar.bz2
Fix clang error with inlined function on Android.
BUG=136923 Review URL: https://chromiumcodereview.appspot.com/10821134 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/android/draw_delegate_impl.cc4
-rw-r--r--content/browser/android/draw_delegate_impl.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/content/browser/android/draw_delegate_impl.cc b/content/browser/android/draw_delegate_impl.cc
index 43fc1a0..d20afd4 100644
--- a/content/browser/android/draw_delegate_impl.cc
+++ b/content/browser/android/draw_delegate_impl.cc
@@ -29,6 +29,10 @@ void DrawDelegateImpl::SetUpdateCallback(
draw_callback_ = callback;
}
+void DrawDelegateImpl::SetBounds(const gfx::Size& size) {
+ size_ = size;
+}
+
void DrawDelegateImpl::OnSurfaceUpdated(
uint64 texture, RenderWidgetHostView* view,
const SurfacePresentedCallback& present_callback) {
diff --git a/content/browser/android/draw_delegate_impl.h b/content/browser/android/draw_delegate_impl.h
index c66fb56..80c39c9 100644
--- a/content/browser/android/draw_delegate_impl.h
+++ b/content/browser/android/draw_delegate_impl.h
@@ -21,7 +21,7 @@ class DrawDelegateImpl : public DrawDelegate {
// DrawDelegate implementation.
virtual void SetUpdateCallback(
const SurfaceUpdatedCallback& callback) OVERRIDE;
- virtual void SetBounds(const gfx::Size& size) OVERRIDE { size_ = size; }
+ virtual void SetBounds(const gfx::Size& size) OVERRIDE;
void SetDrawSurface(gfx::GLSurfaceHandle handle) { handle_ = handle; }
void OnSurfaceUpdated(uint64 texture, RenderWidgetHostView* view,