Merge 85823

Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * Copyright (C) 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 29 matching lines @@
 public:
     WebChromeClient(WebPage* page)
         : m_cachedMainFrameHasHorizontalScrollbar(false)
         , m_cachedMainFrameHasVerticalScrollbar(false)
         , m_page(page)
     {
     }
     
     WebPage* page() const { return m_page; }
 
+    virtual void* webView() const { return 0; }
+
 private:
     virtual void chromeDestroyed();
     
     virtual void setWindowRect(const WebCore::FloatRect&);
     virtual WebCore::FloatRect windowRect();
     
     virtual WebCore::FloatRect pageRect();
     
     virtual float scaleFactor();
     
@@ skipping 160 matching lines @@
     mutable RefPtr<WebFrame> m_cachedFrameSetLargestFrame;
     mutable bool m_cachedMainFrameHasHorizontalScrollbar;
     mutable bool m_cachedMainFrameHasVerticalScrollbar;
 
     WebPage* m_page;
 };
 
 } // namespace WebKit
 
 #endif // WebChromeClient_h