diff options
Diffstat (limited to 'WebKit/wx')
| -rw-r--r-- | WebKit/wx/ChangeLog | 34 | ||||
| -rw-r--r-- | WebKit/wx/WebKitSupport/ChromeClientWx.cpp | 4 | ||||
| -rw-r--r-- | WebKit/wx/WebKitSupport/ChromeClientWx.h | 5 | ||||
| -rw-r--r-- | WebKit/wx/WebView.cpp | 15 | ||||
| -rw-r--r-- | WebKit/wx/WebView.h | 2 |
5 files changed, 52 insertions, 8 deletions
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog index 123b839..e0f0cd1 100644 --- a/WebKit/wx/ChangeLog +++ b/WebKit/wx/ChangeLog @@ -1,3 +1,37 @@ +2010-11-08 Alexey Proskuryakov <ap@apple.com> + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=48685 + Notify UI process about focused frame + + Added an empty implementation of the new ChromeClient method. + + * WebKitSupport/ChromeClientWx.cpp: + (WebCore::ChromeClientWx::focusedFrameChanged): + * WebKitSupport/ChromeClientWx.h: + +2010-11-07 Adam Barth <abarth@webkit.org> + + Reviewed by Eric Seidel. + + Rename Cache to MemoryCache + https://bugs.webkit.org/show_bug.cgi?id=49159 + + * WebView.cpp: + (wxWebView::SetCachePolicy): + * WebView.h: + +2010-11-01 Brady Eidson <beidson@apple.com> + + Reviewed by Anders Carlsson. + + <rdar://problem/7660547> and https://bugs.webkit.org/show_bug.cgi?id=48699 + Context menu support for WebKit 2. + + * WebKitSupport/ChromeClientWx.h: + (WebCore::ChromeClientWx::showContextMenu): + 2010-10-29 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. 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*); diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp index 5980236..667aa88 100644 --- a/WebKit/wx/WebView.cpp +++ b/WebKit/wx/WebView.cpp @@ -24,13 +24,14 @@ */ #include "config.h" -#include "Cache.h" +#include "WebView.h" + #include "ContextMenu.h" -#include "ContextMenuItem.h" #include "ContextMenuController.h" +#include "ContextMenuItem.h" #include "Document.h" -#include "Element.h" #include "Editor.h" +#include "Element.h" #include "EmptyClients.h" #include "EventHandler.h" #include "FileChooser.h" @@ -41,7 +42,7 @@ #include "GraphicsContext.h" #include "HTMLFormElement.h" #include "Logging.h" -#include "markup.h" +#include "MemoryCache.h" #include "Page.h" #include "PlatformKeyboardEvent.h" #include "PlatformMouseEvent.h" @@ -56,6 +57,7 @@ #include "Settings.h" #include "SubstituteData.h" #include "Threading.h" +#include "markup.h" #if __WXMSW__ #include "WebCoreInstanceHandle.h" #endif @@ -87,7 +89,6 @@ #include "WebDOMNode.h" #include "WebFrame.h" -#include "WebView.h" #include "WebViewPrivate.h" #include <wx/defs.h> @@ -269,12 +270,12 @@ static wxWebViewCachePolicy gs_cachePolicy; /* static */ void wxWebView::SetCachePolicy(const wxWebViewCachePolicy& cachePolicy) { - WebCore::Cache* globalCache = WebCore::cache(); + WebCore::MemoryCache* globalCache = WebCore::cache(); globalCache->setCapacities(cachePolicy.GetMinDeadCapacity(), cachePolicy.GetMaxDeadCapacity(), cachePolicy.GetCapacity()); - // store a copy since there is no getter for Cache values + // store a copy since there is no getter for MemoryCache values gs_cachePolicy = cachePolicy; } diff --git a/WebKit/wx/WebView.h b/WebKit/wx/WebView.h index 3ddb45e..4a6b081 100644 --- a/WebKit/wx/WebView.h +++ b/WebKit/wx/WebView.h @@ -54,7 +54,7 @@ namespace WebCore { extern WXDLLIMPEXP_WEBKIT const wxChar* wxWebViewNameStr; #endif -static const int defaultCacheCapacity = 8192 * 1024; // mirrors Cache.cpp +static const int defaultCacheCapacity = 8192 * 1024; // mirrors MemoryCache.cpp class WXDLLIMPEXP_WEBKIT wxWebViewCachePolicy { |