| Index: webkit/glue/webview_impl.h
|
| ===================================================================
|
| --- webkit/glue/webview_impl.h (revision 21785)
|
| +++ webkit/glue/webview_impl.h (working copy)
|
| @@ -131,6 +131,10 @@
|
| virtual void SetIsTransparent(bool is_transparent);
|
| virtual bool GetIsTransparent() const;
|
|
|
| + virtual void MediaPlayerActionAt(int x,
|
| + int y,
|
| + const MediaPlayerAction& action);
|
| +
|
| // WebViewImpl
|
|
|
| const WebKit::WebPoint& last_mouse_down_point() const {
|
|
|
| Property changes on: webkit\glue\webview_impl.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/webview_impl.h:r3734-4217,4606-5108,5177-5263
|
| Merged /trunk/src/webkit/glue/webview_impl.h:r21466
|
|
|
|
|