From 28040489d744e0c5d475a88663056c9040ed5320 Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Wed, 10 Nov 2010 15:31:59 -0800 Subject: Merge WebKit at r71558: Initial merge by git. Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c --- WebKit/wince/ChangeLog | 27 ++++++++++++++++++++++ WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp | 4 ++++ WebKit/wince/WebCoreSupport/ChromeClientWinCE.h | 5 ++++ .../WebCoreSupport/FrameLoaderClientWinCE.cpp | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) (limited to 'WebKit/wince') diff --git a/WebKit/wince/ChangeLog b/WebKit/wince/ChangeLog index bbf5d59..0cbd925 100644 --- a/WebKit/wince/ChangeLog +++ b/WebKit/wince/ChangeLog @@ -1,3 +1,30 @@ +2010-11-08 Alexey Proskuryakov + + 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. + + * WebCoreSupport/ChromeClientWinCE.cpp: + (WebKit::ChromeClientWinCE::focusedFrameChanged): + * WebCoreSupport/ChromeClientWinCE.h: + +2010-11-02 Patrick Gansterer + + Unreviewed, build fix after r71041. + + * WebCoreSupport/ChromeClientWinCE.h: + (WebKit::ChromeClientWinCE::showContextMenu): + +2010-10-30 Patrick Gansterer + + Unreviewed, build fix after r70574. + + * WebCoreSupport/FrameLoaderClientWinCE.cpp: + (WebKit::FrameLoaderClientWinCE::transferLoadingResourceFromPage): + 2010-10-29 Alexey Proskuryakov Reviewed by Darin Adler. diff --git a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp index c99635a..e19d6ad 100644 --- a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp +++ b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp @@ -174,6 +174,10 @@ void ChromeClientWinCE::focusedNodeChanged(Node*) notImplemented(); } +void ChromeClientWinCE::focusedFrameChanged(Frame*) +{ +} + bool ChromeClientWinCE::canRunBeforeUnloadConfirmPanel() { return true; diff --git a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h index 3818ce0..7219934 100644 --- a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h +++ b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h @@ -51,6 +51,7 @@ public: virtual void takeFocus(WebCore::FocusDirection); virtual void focusedNodeChanged(WebCore::Node*); + virtual void focusedFrameChanged(Frame*); // The Frame pointer provides the ChromeClient with context about which // Frame wants to create the new Page. Also, the newly created window @@ -125,6 +126,10 @@ public: virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) = 0; #endif +#if ENABLE(CONTEXT_MENUS) + virtual void showContextMenu() { } +#endif + #if ENABLE(NOTIFICATIONS) virtual WebCore::NotificationPresenter* notificationPresenter() const = 0; #endif diff --git a/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp b/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp index 0b95213..f3643b2 100644 --- a/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp +++ b/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp @@ -165,7 +165,7 @@ void FrameLoaderClientWinCE::didTransferChildFrameToNewDocument(Page*) { } -void FrameLoaderClientWinCE::transferLoadingResourceFromPage(unsigned long, DocumentLoader*, const ResourceRequest&, Page*) +void FrameLoaderClientWinCE::transferLoadingResourceFromPage(unsigned long, DocumentLoader*, const WebCore::ResourceRequest&, Page*) { } -- cgit v1.1