Merge 85823

Source/WebCore/loader/EmptyClients.h

 /*
  * Copyright (C) 2006 Eric Seidel (eric@webkit.org)
  * Copyright (C) 2008, 2009, 2010, 2011 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.
@@ skipping 71 matching lines @@
 
 private:
     RefPtr<EmptyPopupMenu> m_popup;
 };
 
 class EmptyChromeClient : public ChromeClient {
 public:
     virtual ~EmptyChromeClient() { }
     virtual void chromeDestroyed() { }
 
+    virtual void* webView() const { return 0; }
     virtual void setWindowRect(const FloatRect&) { }
     virtual FloatRect windowRect() { return FloatRect(); }
 
     virtual FloatRect pageRect() { return FloatRect(); }
 
     virtual float scaleFactor() { return 1.f; }
 
     virtual void focus() { }
     virtual void unfocus() { }
 
@@ skipping 504 matching lines @@
     virtual void setController(DeviceOrientationController*) { }
     virtual void startUpdating() { }
     virtual void stopUpdating() { }
     virtual DeviceOrientation* lastOrientation() const { return 0; }
     virtual void deviceOrientationControllerDestroyed() { }
 };
 
 }
 
 #endif // EmptyClients_h