diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-10 15:31:59 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:35:59 -0800 |
| commit | 28040489d744e0c5d475a88663056c9040ed5320 (patch) | |
| tree | c463676791e4a63e452a95f0a12b2a8519730693 /WebKit/wx/WebKitSupport | |
| parent | eff9be92c41913c92fb1d3b7983c071f3e718678 (diff) | |
| download | external_webkit-28040489d744e0c5d475a88663056c9040ed5320.zip external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.gz external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.bz2 | |
Merge WebKit at r71558: Initial merge by git.
Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
Diffstat (limited to 'WebKit/wx/WebKitSupport')
| -rw-r--r-- | WebKit/wx/WebKitSupport/ChromeClientWx.cpp | 4 | ||||
| -rw-r--r-- | WebKit/wx/WebKitSupport/ChromeClientWx.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp index 97b98cf..65f0eea 100644 --- a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp +++ b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp @@ -137,6 +137,10 @@ void ChromeClientWx::focusedNodeChanged(Node*) { } +void ChromeClientWx::focusedFrameChanged(Frame*) +{ +} + Page* ChromeClientWx::createWindow(Frame*, const FrameLoadRequest& request, const WindowFeatures& features, const NavigationAction&) { Page* myPage = 0; diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.h b/WebKit/wx/WebKitSupport/ChromeClientWx.h index 755beb7..2ccad43 100644 --- a/WebKit/wx/WebKitSupport/ChromeClientWx.h +++ b/WebKit/wx/WebKitSupport/ChromeClientWx.h @@ -56,6 +56,7 @@ public: virtual void takeFocus(FocusDirection); virtual void focusedNodeChanged(Node*); + virtual void focusedFrameChanged(Frame*); virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&); virtual Page* createModalDialog(Frame*, const FrameLoadRequest&); @@ -129,6 +130,10 @@ public: virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*); #endif +#if ENABLE(CONTEXT_MENUS) + virtual void showContextMenu() { } +#endif + virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>); virtual void chooseIconForFiles(const Vector<String>&, FileChooser*); |