From 6b70adc33054f8aee8c54d0f460458a9df11b8a5 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Thu, 18 Nov 2010 17:33:13 -0800 Subject: Merge WebKit at r72274: Initial merge by git. Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb --- WebKit/wince/ChangeLog | 6 ++++++ WebKit/wince/WebCoreSupport/ChromeClientWinCE.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'WebKit/wince') diff --git a/WebKit/wince/ChangeLog b/WebKit/wince/ChangeLog index 0cbd925..0b99bf7 100644 --- a/WebKit/wince/ChangeLog +++ b/WebKit/wince/ChangeLog @@ -1,3 +1,9 @@ +2010-11-13 Patrick Gansterer + + Unreviewed, build fix after r71541. + + * WebCoreSupport/ChromeClientWinCE.h: + 2010-11-08 Alexey Proskuryakov Reviewed by Darin Adler. diff --git a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h index 7219934..3069472 100644 --- a/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h +++ b/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h @@ -51,7 +51,7 @@ public: virtual void takeFocus(WebCore::FocusDirection); virtual void focusedNodeChanged(WebCore::Node*); - virtual void focusedFrameChanged(Frame*); + virtual void focusedFrameChanged(WebCore::Frame*); // The Frame pointer provides the ChromeClient with context about which // Frame wants to create the new Page. Also, the newly created window -- cgit v1.1