| Index: webkit/glue/chrome_client_impl.h
|
| ===================================================================
|
| --- webkit/glue/chrome_client_impl.h (revision 21653)
|
| +++ webkit/glue/chrome_client_impl.h (working copy)
|
| @@ -117,7 +117,8 @@
|
| virtual void mouseDidMoveOverElement(const WebCore::HitTestResult& result,
|
| unsigned modifierFlags);
|
|
|
| - virtual void setToolTip(const WebCore::String& tooltip_text);
|
| + virtual void setToolTip(const WebCore::String& tooltip_text,
|
| + WebCore::TextDirection dir);
|
|
|
| virtual void print(WebCore::Frame*);
|
|
|
|
|
| Property changes on: webkit\glue\chrome_client_impl.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/chrome_client_impl.h:r3734-4217,4606-5108,5177-5263
|
| Merged /trunk/src/webkit/glue/chrome_client_impl.h:r21266
|
|
|
|
|