Merge 85823

Source/WebKit/mac/WebCoreSupport/WebChromeClient.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 17 matching lines @@
  */
 
 #import <WebCore/ChromeClient.h>
 #import <WebCore/FocusDirection.h>
 #import <wtf/Forward.h>
 
 @class WebView;
 
 class WebChromeClient : public WebCore::ChromeClient {
 public:
-    WebChromeClient(WebView *webView);
-    WebView *webView() const { return m_webView; }
+    WebChromeClient(WebView*);
+    virtual void* webView() const { return static_cast<void*>(m_webView); }
     
     virtual void chromeDestroyed();
     
     virtual void setWindowRect(const WebCore::FloatRect&);
     virtual WebCore::FloatRect windowRect();
 
     virtual WebCore::FloatRect pageRect();
 
     virtual float scaleFactor();
 
@@ skipping 128 matching lines @@
     virtual bool selectItemAlignmentFollowsMenuWritingDirection();
     virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
     virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
 
 #if ENABLE(CONTEXT_MENUS)
     virtual void showContextMenu();
 #endif
 private:
     WebView *m_webView;
 };