From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 21 May 2010 16:53:46 +0100
Subject: Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
---
 WebKit/chromium/src/WebMediaPlayerClientImpl.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'WebKit/chromium/src/WebMediaPlayerClientImpl.h')

diff --git a/WebKit/chromium/src/WebMediaPlayerClientImpl.h b/WebKit/chromium/src/WebMediaPlayerClientImpl.h
index 4adbed2..57c93b7 100644
--- a/WebKit/chromium/src/WebMediaPlayerClientImpl.h
+++ b/WebKit/chromium/src/WebMediaPlayerClientImpl.h
@@ -61,6 +61,7 @@ public:
     virtual void rateChanged();
     virtual void sizeChanged();
     virtual void sawUnsupportedTracks();
+    virtual float volume() const;
 
     // MediaPlayerPrivateInterface methods:
     virtual void load(const WebCore::String& url);
-- 
cgit v1.1