diff options
| author | Steve Block <steveblock@google.com> | 2011-06-10 17:30:46 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-14 01:14:03 +0100 |
| commit | ee694a26d2441be3e10fa2d66232ec3d3a07f5c7 (patch) | |
| tree | ba29e0c15aa41115b7be053ae263ba4d4023b83b | |
| parent | 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 (diff) | |
| download | external_webkit-ee694a26d2441be3e10fa2d66232ec3d3a07f5c7.zip external_webkit-ee694a26d2441be3e10fa2d66232ec3d3a07f5c7.tar.gz external_webkit-ee694a26d2441be3e10fa2d66232ec3d3a07f5c7.tar.bz2 | |
Merge WebKit at branches/chromium/742 r88085: Implement new ChromeViewClient::webView()
This is only required on Chromoium
See http://trac.webkit.org/changeset/85823
Change-Id: I61069d27bfbdabb88474c759e2bb8723e5913783
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h index daaeb48..acb7792 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h +++ b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.h @@ -196,6 +196,8 @@ namespace android { virtual void exitFullscreenForNode(WebCore::Node*); #endif + virtual void* webView() const { return 0; } + private: android::WebFrame* m_webFrame; // The Geolocation permissions manager. |