From 4c02d6a0244d7e6a7172e1f72aa514c7f68b1cea Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Wed, 12 May 2010 12:00:26 +0100
Subject: Merge Webkit at r58956: add new FrameLoaderClient methods. See
 http://trac.webkit.org/changeset/58686 and
 http://trac.webkit.org/changeset/58111

Change-Id: Iebc4ab59ac768d4dde2fe56f63657d98c4b9db3a
---
 WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h')

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
index fe58124..ddbe196 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
@@ -208,6 +208,9 @@ namespace android {
         CacheBuilder& getCacheBuilder() { return m_cacheBuilder; }
 
         void enableOnDemandPlugins() { m_onDemandPluginsEnabled = true; }
+
+        void dispatchDidChangeIcons();
+        void dispatchWillSendSubmitEvent(HTMLFormElement*) { }
     private:
         CacheBuilder        m_cacheBuilder;
         Frame*              m_frame;
-- 
cgit v1.1